Changeset 10566 for trunk/Padre/lib/Padre/TaskManager.pm

Timestamp:

02/07/10 03:24:00 (2 years ago)

Author:

tsee

Message:

got experimental slave driving to work

File:

• trunk/Padre/lib/Padre/TaskManager.pm (modified) (7 diffs)

trunk/Padre/lib/Padre/TaskManager.pm

@@ -93 +93 @@
 };
 
-# This event is triggered by the worker thread main loop after
-# finishing a task.
-our $TASK_DONE_EVENT : shared = Wx::NewEventType;
-
-# This event is triggered by the worker thread main loop before
-# running a task.
-our $TASK_START_EVENT : shared = Wx::NewEventType;
-
 # This event is triggered by a worker thread DURING ->run to incrementally
 # communicate to the main thread over the life of a service.
-our $SERVICE_POLL_EVENT : shared = Wx::NewEventType;
+our $SERVICE_POLL_EVENT : shared;
+BEGIN { $SERVICE_POLL_EVENT = Wx::NewEventType; }
 
 # remember whether the event handlers were initialized...
@@ -129 +122 @@
         @_,
         workers       => [],
-        task_queue    => undef,
+                # grab a copy of the task_queue that's now handled by the slave driver
+        task_queue    => Padre::SlaveDriver->new()->task_queue,
         running_tasks => {},
     }, $class;
@@ -141 +135 @@
     _init_events($main);
 
-    $self->{task_queue} = Thread::Queue->new;
+        # To be removed: Old task queue instantiation => Padre::SlaveDriver
+    #$self->{task_queue} = Thread::Queue->new;
 
     # Set up a regular action for reaping dead workers
@@ -174 +169 @@
         Wx::Event::EVT_COMMAND(
             $main, -1,
-            $TASK_DONE_EVENT,
+            $Padre::SlaveDriver::TASK_DONE_EVENT,
             \&on_task_done_event,
         );
         Wx::Event::EVT_COMMAND(
             $main, -1,
-            $TASK_START_EVENT,
+            $Padre::SlaveDriver::TASK_START_EVENT,
             \&on_task_start_event,
         );
@@ -294 +289 @@
     return unless $self->use_threads;
 
-    @_ = (); # avoid "Scalars leaked"
+
+        # To be removed: Old worker thread cration. => Padre::SlaveDriver
+#   @_ = (); # avoid "Scalars leaked"
 #   my $worker = threads->create(
 #       { 'exit' => 'thread_only' }, \&worker_loop,
@@ -413 +410 @@
     my @workers = $self->workers;
     $self->task_queue->insert( 0, ("STOP") x scalar(@workers) );
-    while ( threads->list(threads::running) >= 1 ) {
+    while ( threads->list(threads::running) >= 2 ) {
         $_->join for threads->list(threads::joinable);
     }
@@ -420 +417 @@
         $thread->join;
     }
+
+        # cleanup master thread, too
+        Padre::SlaveDriver->new->cleanup();
 
     # didn't work the nice way?