Changeset 10566 for trunk/Padre/lib/Padre/SlaveDriver.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/SlaveDriver.pm (modified) (8 diffs)

trunk/Padre/lib/Padre/SlaveDriver.pm

@@ -47 +47 @@
 use Thread::Queue 2.11;
 
+# This event is triggered by the worker thread main loop after
+# finishing a task.
+our $TASK_DONE_EVENT : shared;
+BEGIN { $TASK_DONE_EVENT = Wx::NewEventType; }
+
+# This event is triggered by the worker thread main loop before
+# running a task.
+our $TASK_START_EVENT : shared;
+BEGIN { $TASK_START_EVENT = Wx::NewEventType; }
+
 =head3 C<new>
 
@@ -55 +65 @@
 =cut
 
-{
+SCOPE: {
     my $SlaveDriver;
     sub new {
         my $class = shift;
         return $SlaveDriver if defined $SlaveDriver;
-        $SlaveDriver = bless {} => $class;
         @_ = ();
-        $SlaveDriver->{cmd_queue}  = Thread::Queue->new();
-        $SlaveDriver->{tid_queue}  = Thread::Queue->new();
+        $SlaveDriver = bless {
+            cmd_queue  => Thread::Queue->new(),
+            tid_queue  => Thread::Queue->new(),
+            task_queue => Thread::Queue->new(),
+        } => $class;
         $SlaveDriver->{master} = threads->create(
             \&_slave_driver_loop,
@@ -73 +85 @@
 
     END {
-        if (defined $SlaveDriver and defined $SlaveDriver->{master} and defined $SlaveDriver->{cmd_queue}) {
-            $SlaveDriver->{cmd_queue}->enqueue('STOP');
-            $SlaveDriver->{master}->join();
-        }
-    }
-
+        $SlaveDriver->cleanup(), undef $SlaveDriver if defined $SlaveDriver;
+    }
 }
 
@@ -95 +103 @@
     my $task_manager = shift;
     require Storable;
-    $self->{cmd_queue}->enqueue(Storable::freeze([$main, $task_manager->task_queue]));
+    $self->{cmd_queue}->enqueue(Storable::freeze([$task_manager->task_queue]));
     my $tid = $self->{tid_queue}->dequeue();
     return threads->object($tid);
+}
+
+
+=head3 task_queue
+
+Returns the task queue (C<Thread::Queue> object) for use by the
+L<Padre::TaskManager> for passing processing tasks to the worker
+threads.
+
+This queue is instantiated by the slave driver because it needs to be available
+early for passing to the master thread.
+
+=cut
+
+sub task_queue {
+    my $self = shift;
+    return $self->{task_queue};
+}
+
+=head3 cleanup
+
+Reaps the master thread. Will be called by the TaskManager on shutdown and
+on global destruction.
+
+=cut
+
+sub cleanup {
+    my $self = shift;
+    if (defined $self->{master} and defined $self->{cmd_queue}) {
+        $self->{cmd_queue}->enqueue('STOP');
+        require Time::HiRes;
+        Time::HiRes::usleep(5000); # 5 milli-sec
+        if ($self->{master}->is_joinable) {
+            $self->{master}->join;
+        }
+    }
+    # TaskManager does handle thread *killing*
+}
+
+sub DESTROY {
+    my $self = shift;
+    $self->cleanup();
 }
 
@@ -103 +153 @@
 # Worker thread main loop
 sub _worker_loop {
-    my ( $main, $queue ) = @_; @_ = (); # hack to avoid "Scalars leaked"
+    my ( $queue ) = @_; @_ = (); # hack to avoid "Scalars leaked"
     require Storable;
     require Padre::TaskManager;
 
     # Set the thread-specific main-window pointer
+    my $main = Wx::wxTheApp->GetTopWindow();
     $Padre::TaskManager::_main = $main;
 
@@ -123 +174 @@
 
         my $thread_start_event =
-            Wx::PlThreadEvent->new( -1, $Padre::TaskManager::TASK_START_EVENT, $task->{__thread_id} . ";" . ref($task) );
+            Wx::PlThreadEvent->new( -1, $TASK_START_EVENT, $task->{__thread_id} . ";" . ref($task) );
         Wx::PostEvent( $main, $thread_start_event );
 
@@ -133 +184 @@
         $task->serialize( \$frozen_task );
 
-        my $thread_done_event = Wx::PlThreadEvent->new( -1, $Padre::TaskManager::TASK_DONE_EVENT, $frozen_task );
+        my $thread_done_event = Wx::PlThreadEvent->new( -1, $TASK_DONE_EVENT, $frozen_task );
         Wx::PostEvent( $main, $thread_done_event );
 
@@ -150 +201 @@
         last if $args eq 'STOP';
         
-        my $worker_thread = threads->create(\&_worker_loop, @{Storable::thaw($args)});
+        my $task_queue = Padre::SlaveDriver->new->task_queue;
+        my $worker_thread = threads->create(\&_worker_loop, $task_queue);
         my $tid = $worker_thread->tid();
         $outqueue->enqueue($tid);