Changeset 10585

Timestamp:

02/07/10 06:14:07 (7 months ago)

Author:

adamk

Message:

Tidying up

Files:

• trunk/Padre/lib/Padre/SlaveDriver.pm (modified) (10 diffs)

trunk/Padre/lib/Padre/SlaveDriver.pm

@@ -38 +38 @@
 use warnings;
 
-our $VERSION = '0.54';
+our $VERSION = '0.56';
 
 # According to Wx docs,
@@ -54 +54 @@
 # running a task.
 our $TASK_START_EVENT : shared;
+
+=pod
 
 =head3 C<new>
@@ -70 +72 @@
                 @_ = ();
                 $SlaveDriver = bless {
-                        cmd_queue  => Thread::Queue->new(),
-                        tid_queue  => Thread::Queue->new(),
-                        task_queue => Thread::Queue->new(),
+                        cmd_queue  => Thread::Queue->new,
+                        tid_queue  => Thread::Queue->new,
+                        task_queue => Thread::Queue->new,
                 } => $class;
-                $SlaveDriver->_init_events();
+                $SlaveDriver->_init_events;
                 $SlaveDriver->{master} = threads->create(
                         \&_slave_driver_loop,
@@ -84 +86 @@
 
         END {
-                $SlaveDriver->cleanup(), undef $SlaveDriver if defined $SlaveDriver;
+                if ( defined $SlaveDriver ) {
+                        $SlaveDriver->cleanup;
+                        undef $SlaveDriver;
+                }
         }
 }
@@ -90 +95 @@
 # done late so that the full Wx has been loaded for sure
 sub _init_events {
-        $TASK_DONE_EVENT = Wx::NewEventType() if not defined $TASK_DONE_EVENT;
+        $TASK_DONE_EVENT  = Wx::NewEventType() if not defined $TASK_DONE_EVENT;
         $TASK_START_EVENT = Wx::NewEventType() if not defined $TASK_START_EVENT;
 }
+
+=pod
 
 =head2 Object methods
@@ -107 +114 @@
         my $task_manager = shift;
         require Storable;
-        $self->{cmd_queue}->enqueue(Storable::freeze([$task_manager->task_queue]));
-        my $tid = $self->{tid_queue}->dequeue();
-        return threads->object($tid);
-}
-
+        $self->{cmd_queue}->enqueue(
+                Storable::freeze( [ $task_manager->task_queue ] )
+        );
+        return threads->object(
+                $self->{tid_queue}->dequeue
+        );
+}
+
+=pod
 
 =head3 task_queue
@@ -125 +136 @@
 
 sub task_queue {
-        my $self = shift;
-        return $self->{task_queue};
-}
+        $_[0]->{task_queue};
+}
+
+=pod
 
 =head3 cleanup
@@ -150 +162 @@
 
 sub DESTROY {
-        my $self = shift;
-        $self->cleanup();
+        $_[0]->cleanup;
 }
 
@@ -157 +168 @@
 # Worker thread main loop
 sub _worker_loop {
-        my ( $queue ) = @_; @_ = (); # hack to avoid "Scalars leaked"
+        my ( $queue ) = @_;
+        @_ = (); # hack to avoid "Scalars leaked"
+
         require Storable;
         require Padre::TaskManager;
@@ -195 +208 @@
 }
 
-
 sub _slave_driver_loop {
-        my ( $inqueue, $outqueue ) = @_; @_ = (); # hack to avoid "Scalars leaked"
+        my ( $inqueue, $outqueue ) = @_;
+        @_ = (); # hack to avoid "Scalars leaked"
 
         while ( my $args = $inqueue->dequeue ) { # args is frozen [$main, $queue]
                 last if $args eq 'STOP';
-                
                 my $task_queue = Padre::SlaveDriver->new->task_queue;
                 my $worker_thread = threads->create(\&_worker_loop, $task_queue);
-                my $tid = $worker_thread->tid();
+                my $tid = $worker_thread->tid;
                 $outqueue->enqueue($tid);
         }