Changeset 11022

Timestamp:

03/08/10 22:42:09 (2 years ago)

Author:

adamk

Message:

Speculative fix to the threading vs SQLite bug

File:

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

trunk/Padre/lib/Padre/SlaveDriver.pm

@@ -78 +78 @@
         } => $class;
         $SlaveDriver->_init_events;
+
+        # There is no database/locking protection
+        # here, so this must happen before we make
+        # a long-term connection to the database.
         $SlaveDriver->{master} = threads->create(
             \&_slave_driver_loop,
@@ -83 +87 @@
             $SlaveDriver->{tid_queue}
         );
+
         return $SlaveDriver;
     }
@@ -213 +218 @@
         last if $args eq 'STOP';
         my $task_queue    = Padre::SlaveDriver->new->task_queue;
+
+        # Apply the database anti-lock, so there are no active DBI connection
+        # handles at the time we spawn the thread.
+        # If Padre::DB is not loaded at all, the following returns false and
+        # we never make the calls to the non-existant class.
+        my $locked = Padre::DB->can('connected') && Padre::DB->connected;
+        if ( $locked ) {
+            Padre::DB->commit;
+        }
+
+        # Do the actual thread spawn
         my $worker_thread = threads->create( \&_worker_loop, $task_queue );
-        my $tid           = $worker_thread->tid;
-        $outqueue->enqueue($tid);
+
+        # Release the anti-lock on the database
+        if ( $locked ) {
+            Padre::DB->begin;
+        }
+
+        # Continue onwards with thready stuff
+        $outqueue->enqueue($worker_thread->tid);
     }
     return 1;