Changeset 5819

Timestamp:

07/04/09 06:46:54 (3 years ago)

Author:

submersible_toaster

Message:

more reliable shutdown of service. there is still a race here i think

Location:

branches/Padre-Taskmanager/lib/Padre

Files:

• Service.pm (modified) (5 diffs)
• Wx/Main.pm (modified) (2 diffs)

branches/Padre-Taskmanager/lib/Padre/Service.pm

@@ -75 +75 @@
 my $running = 0;
 sub running { $running };
+
+sub stop { $running = 0 };
+sub start{ $running = 1 }; #??
 
 sub run {
@@ -110 +113 @@
             Padre::Util::debug( "Caught command signal '$command'" );
             if ( $command eq 'HANGUP' ) {
-                $self->hangup;
-                $running = 0;
+                $self->hangup( \$running );
             } elsif ( $command eq 'TERMINATE' ) {
-                $self->terminate;
-                $running = 0;
+                $self->terminate( \$running );
             } elsif ( $command eq 'PING' ) {
                 $self->post_event( $event, "ALIVE" );
@@ -139 +140 @@
 
 
-sub start {
-    
-}
-
 =head2 hangup
 
@@ -151 +148 @@
 
 sub hangup {
-    my ($self) = @_;
-
+    my ($self,$running) = @_;
+    $self->transport->shutdown;
+    $$running = 0;
 }
 
@@ -164 +162 @@
 
 sub terminate {
-    my ($self) = @_;
-
+    my ($self,$running) = @_;
+    $self->transport->shutdown;
+    $$running = 0;
 }
 

branches/Padre-Taskmanager/lib/Padre/Wx/Main.pm

@@ -2133 +2133 @@
 
 
-    Padre::Util::debug("Tell TaskManager to cleanup");
-    # Stop all Task Manager's worker threads
-    $self->ide->task_manager->cleanup;
-    
     # Immediately hide the window so that the user
     # perceives the application as closing faster.
@@ -2181 +2177 @@
     $ide->save_config;
     $event->Skip;
+
+    Padre::Util::debug("Tell TaskManager to cleanup");
+    # Stop all Task Manager's worker threads
+    $self->ide->task_manager->cleanup;
 
     Padre::Util::debug("Closing Padre");