Changeset 10599

Timestamp:

02/07/10 10:12:19 (7 months ago)

Author:

azawawi

Message:

Perl tidy

Location:

trunk/Padre

Files:

• lib/Padre/SlaveDriver.pm (modified) (6 diffs)
• lib/Padre/Task.pm (modified) (4 diffs)
• lib/Padre/TaskManager.pm (modified) (6 diffs)
• lib/Padre/Wx/Dialog/PluginManager.pm (modified) (1 diff)
• t/86-service.t (modified) (1 diff)

trunk/Padre/lib/Padre/SlaveDriver.pm

@@ -67 +67 @@
 SCOPE: {
         my $SlaveDriver;
+
         sub new {
                 my $class = shift;
                 return $SlaveDriver if defined $SlaveDriver;
-                @_ = ();
+                @_           = ();
                 $SlaveDriver = bless {
                         cmd_queue  => Thread::Queue->new,
@@ -111 +112 @@
 
 sub spawn {
-        my $self = shift;
+        my $self         = shift;
         my $task_manager = shift;
         require Storable;
-        $self->{cmd_queue}->enqueue(
-                Storable::freeze( [ $task_manager->task_queue ] )
-        );
-        return threads->object(
-                $self->{tid_queue}->dequeue
-        );
+        $self->{cmd_queue}->enqueue( Storable::freeze( [ $task_manager->task_queue ] ) );
+        return threads->object( $self->{tid_queue}->dequeue );
 }
 
@@ -150 +147 @@
 sub cleanup {
         my $self = shift;
-        if (defined $self->{master} and defined $self->{cmd_queue}) {
+        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) {
+                if ( $self->{master}->is_joinable ) {
                         $self->{master}->join;
                 }
         }
+
         # TaskManager does handle thread *killing*
 }
@@ -168 +166 @@
 # Worker thread main loop
 sub _worker_loop {
-        my ( $queue ) = @_;
+        my ($queue) = @_;
         @_ = (); # hack to avoid "Scalars leaked"
 
@@ -175 +173 @@
 
         # Set the thread-specific main-window pointer
-        my $main = Padre->ide->wx; 
+        my $main = Padre->ide->wx;
 
         #warn threads->tid() . " -- Hi, I'm a thread.";
@@ -214 +212 @@
         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 $task_queue    = Padre::SlaveDriver->new->task_queue;
+                my $worker_thread = threads->create( \&_worker_loop, $task_queue );
+                my $tid           = $worker_thread->tid;
                 $outqueue->enqueue($tid);
         }

trunk/Padre/lib/Padre/Task.pm

@@ -153 +153 @@
         return $self;
 }
+
 =head2 schedule
 
@@ -165 +166 @@
 SCOPE: {
         my $event_hooks_initialized = 0;
+
         sub schedule {
                 my $self = shift;
-                if (not $event_hooks_initialized) {
+                if ( not $event_hooks_initialized ) {
                         $event_hooks_initialized = 1;
                         my $main = Padre->ide->wx;
@@ -428 +430 @@
         @_ = (); # hack to avoid "Scalars leaked"
         my $main = $wx->main;
-        my $out = $main->output();
+        my $out  = $main->output();
         $main->show_output(1);
         $out->style_neutral();
@@ -440 +442 @@
         @_ = (); # hack to avoid "Scalars leaked"
         my $main = $wx->main;
-        my $out = $main->output();
+        my $out  = $main->output();
         $main->show_output(1);
         $out->style_bad();

trunk/Padre/lib/Padre/TaskManager.pm

@@ -118 +118 @@
                 reap_interval  => 15000,
                 @_,
-                workers       => [],
-                # grab a copy of the task_queue that's now handled by the slave driver
+                workers => [],
+
+                # grab a copy of the task_queue that's now handled by the slave driver
                 task_queue    => Padre::SlaveDriver->new()->task_queue,
                 running_tasks => {},
@@ -132 +133 @@
         _init_events($main);
 
-        # To be removed: Old task queue instantiation => Padre::SlaveDriver
+        # To be removed: Old task queue instantiation => Padre::SlaveDriver
         #$self->{task_queue} = Thread::Queue->new;
 
@@ -240 +241 @@
                 $self->task_queue->enqueue($string);
                 $self->task_queue->enqueue("STOP");
-                require Padre::SlaveDriver;
-                no warnings 'once';
-                if (not defined $Padre::SlaveDriver::TASK_DONE_EVENT) {
-                  Padre::SlaveDriver->_init_events();
-                }
+                require Padre::SlaveDriver;
+                no warnings 'once';
+                if ( not defined $Padre::SlaveDriver::TASK_DONE_EVENT ) {
+                        Padre::SlaveDriver->_init_events();
+                }
                 Padre::SlaveDriver::_worker_loop( $self->task_queue );
         }
@@ -293 +294 @@
 
 
-        # To be removed: Old worker thread cration. => Padre::SlaveDriver
-#       @_ = (); # avoid "Scalars leaked"
-#       my $worker = threads->create(
-#               { 'exit' => 'thread_only' }, \&worker_loop,
-#               $main, $self->task_queue
-#       );
+        # To be removed: Old worker thread cration. => Padre::SlaveDriver
+        #       @_ = (); # avoid "Scalars leaked"
+        #       my $worker = threads->create(
+        #               { 'exit' => 'thread_only' }, \&worker_loop,
+        #               $main, $self->task_queue
+        #       );
         my $worker = Padre::SlaveDriver->new->spawn($self);
         die if not ref $worker;
@@ -421 +422 @@
         }
 
-        # cleanup master thread, too
-        Padre::SlaveDriver->new->cleanup();
+        # cleanup master thread, too
+        Padre::SlaveDriver->new->cleanup();
 
         # didn't work the nice way?
@@ -554 +555 @@
 sub on_task_start_event {
         my ( $wx, $event ) = @_; @_ = (); # hack to avoid "Scalars leaked"
-                                            # TO DO/FIXME:
-                                            # This should somehow get at the specific TaskManager object
-                                            # instead of going through the Padre globals!
-        my $main = $wx->main;
+                                          # TO DO/FIXME:
+                                          # This should somehow get at the specific TaskManager object
+                                          # instead of going through the Padre globals!
+        my $main              = $wx->main;
         my $manager           = Padre->ide->task_manager;
         my $tid_and_task_type = $event->GetData();

trunk/Padre/lib/Padre/Wx/Dialog/PluginManager.pm

@@ -350 +350 @@
         my $message = $self->{plugin}->errstr;
         my $title   = Wx::gettext('Error');
-        
+
         # @INC gets printed out between () remove that for now
         $message =~ s/\(\@INC.*\)//;
-        
+
         Wx::MessageBox( $message, $title, Wx::wxOK | Wx::wxCENTER, $self );
 }

trunk/Padre/t/86-service.t

@@ -15 +15 @@
 use t::lib::Padre;
 use Padre::Service;
+
 # Create the object so that Padre->ide works
 my $app = Padre->new;