Changeset 11063

Timestamp:

03/11/10 03:05:36 (2 years ago)

Author:

rehsack

Message:

Update thread-finish code to wait real for 2 minutes and don't guess
how long a sleep(2) really takes.

File:

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

trunk/Padre/lib/Padre/TaskManager.pm

@@ -76 +76 @@
 use threads::shared;
 use Thread::Queue 2.11;
+use Time::HiRes qw(gettimeofday tv_interval);
 
 require Padre;
@@ -426 +427 @@
     $self->task_queue->insert( 0, ("STOP") x scalar(@workers) );
 
-    my $loopcount;
+    my $waitstart = [gettimeofday()];
 
     # Changing the selection seems to solve the endless-loop problem
@@ -434 +435 @@
             $_->join;
         }
-        last    if $loopcount > 125; # Wait no more than two minutes
-                                     # Pass time slices to the threads for finishing
-        sleep 1 if ++$loopcount > 5;
+
+        # Wait no more than two minutes
+        last    if( tv_interval($waitstart) >= (2*60) );
+
+        # Pass time slices to the threads for finishing
+        threads->yield();
     }