チェンジセット 524

コミット日時:

2008/05/27 17:00:32 (6 ヶ月前)

コミッタ:

yossy

ログメッセージ:

Thread(soumen): イベント周りのテスト+実装

ファイル:

• as3/Thread/branches/soumen/src/org/libspark/thread/Thread.as (更新) (10 diffs)
• as3/Thread/branches/soumen/tests/org/libspark/thread/EventTest.as (追加)
• as3/Thread/branches/soumen/tests/org/libspark/thread/ThreadAllTests.as (更新) (1 diff)

as3/Thread/branches/soumen/src/org/libspark/thread/Thread.as

@@ -1 +1 @@
-package org.libspark.thread
-{
+        import flash.events.Event;
-        import flash.events.IEventDispatcher;
-        import flash.utils.Dictionary;
@@ -199 +200 @@
-                public static function event(dispatcher:IEventDispatcher, type:String, func:Function, useCapture:Boolean = false, priority:int = 0, useWeakReference:Boolean = false):void
-                {
-
+getCurrentThread().addEventHandler(dispatcher, type, func, useCapture, priority, useWeakReference);
-                }
-                
@@ -239 +240 @@
-                        _joinMonitor = null;
-                        _sleepMonitor = null;
+                        _eventMonitor = null;
+                        _event = null;
-                        _errorHandlers = null;
-                        _error = null;
-                        _errorThread = null;
+                        _eventHandlers = null;
-                }
-                
@@ -255 +259 @@
-                private var _joinMonitor:IMonitor;
-                private var _sleepMonitor:IMonitor;
+                private var _eventMonitor:IMonitor;
+                private var _event:Event;
-                private var _errorHandlers:Dictionary;
-                private var _error:Object;
-                private var _errorThread:Thread;
+                private var _eventHandlers:Array;
-                
-                public function get id():uint
@@ -461 +468 @@
-                        
-                        return null;
+                }
+                
+                private function getEventMonitor():IMonitor
+                {
+                        return _eventMonitor || (_eventMonitor = new Monitor());
+                }
+                
+                private function getEventHandlers():Array
+                {
+                        return _eventHandlers || (_eventHandlers = []);
+                }
+                
+                private function addEventHandler(dispatcher:IEventDispatcher, type:String, func:Function, useCapture:Boolean, priority:int, useWeakReference:Boolean):void
+                {
+                        // イベントハンドラを作成してリストに追加
+                        getEventHandlers().push(new EventHandler(dispatcher, type, eventHandler, func, useCapture, priority, useWeakReference));
+                }
+                
+                private function resetEventHandlers():void
+                {
+                        // イベントハンドラリストがなければ何もしない
+                        if (_eventHandlers == null) {
+                                return;
+                        }
+                        
+                        // 全てのイベントハンドラの登録を解除
+                        for each (var handler:EventHandler in _eventHandlers) {
+                                handler.unregister();
+                        }
+                        
+                        // 配列を初期化
+                        _eventHandlers.length = 0;
+                }
+                
+                private function eventHandler(e:Event, handler:EventHandler):void
+                {
+                        // 既にイベントが起こっていれば何もしない
+                        if (_event != null) {
+                                return;
+                        }
+                        
+                        // イベントを保存
+                        _event = e.clone();
+                        
+                        // 該当するイベントハンドラを次の実行関数に設定
+                        _runHandler = handler.func;
+                        
+                        // イベントハンドラをリセット
+                        resetEventHandlers();
+                        
+                        // スレッドを起こす
+                        _eventMonitor.notifyAll();
-                }
-                
@@ -565 +624 @@
-                        // タイムアウトハンドラをリセット
-                        _timeoutHandler = null;
+                        // イベントハンドラをリセット
+                        resetEventHandlers();
-                        // エラーハンドラをリセット
-                        resetErrorHandlers();
@@ -582 +643 @@
-                                try {
-                                        // 実行関数を呼び出す
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                                catch (e:Object) {
@@ -616 +689 @@
-                        }
-                        
+                        // イベントハンドラが設定された場合
+                        if (_eventHandlers != null && _eventHandlers.length > 0) {
+                                // 全てのイベントハンドラを登録
+                                for each (var eventHandler:EventHandler in _eventHandlers) {
+                                        eventHandler.register();
+                                }
+                                // イベントを待機する
+                                try {
+                                        _currentThread = this;
+                                        getEventMonitor().wait();
+                                }
+                                finally {
+                                        _currentThread = null;
+                                }
+                        }
+                        
-                        if (_runHandler != null) {
-                                // 次に実行する実行関数が設定されている場合実行を継続
@@ -1049 +1138 @@
-        }
-}
+
+import flash.events.Event;
+import flash.events.IEventDispatcher;
-
-class ErrorHandler
@@ -1061 +1153 @@
-        public var reset:Boolean;
-}
+
+class EventHandler
+{
+        public function EventHandler(dispatcher:IEventDispatcher, type:String, listener:Function, func:Function, useCapture:Boolean, priority:int, useWeakReference:Boolean)
+        {
+                this.dispatcher = dispatcher;
+                this.type = type;
+                this.listener = listener;
+                this.func = func;
+                this.useCapture = useCapture;
+                this.priority = priority;
+                this.useWeakReference = useWeakReference;
+        }
+        
+        public var dispatcher:IEventDispatcher;
+        public var type:String;
+        public var listener:Function;
+        public var func:Function;
+        public var useCapture:Boolean;
+        public var priority:int;
+        public var useWeakReference:Boolean;
+        
+        public function register():void
+        {
+                dispatcher.addEventListener(type, handler, useCapture, priority, useWeakReference);
+        }
+        
+        public function unregister():void
+        {
+                dispatcher.removeEventListener(type, handler, useCapture);
+        }
+        
+        private function handler(e:Event):void
+        {
+                listener(e, this);
+        }
+}

as3/Thread/branches/soumen/tests/org/libspark/thread/ThreadAllTests.as

@@ -11 +11 @@
-                        MonitorTest,
-                        AuxiliaryTest,
-
+
+
-                ];
-        }