Changeset 24681

Timestamp:

2011-09-28T13:18:27+13:00 (13 years ago)

Author:

jmt12

Message:

Made it so listeners are only removed when the object is deallocated (to ensure it sticks around for the entire import and build process assuming you have some top level script start the server/add the first listener). Extended get_infodb_file_path to do exactly that.

File:

• gs2-extensions/parallel-building/trunk/src/perllib/dbutil/gdbmserver.pm (modified) (12 diffs)

gs2-extensions/parallel-building/trunk/src/perllib/dbutil/gdbmserver.pm

@@ -42 +42 @@
 my $debug = 0;
 
-my %server_lockfile_paths;
+# We have a global reference to all of the GDBM Server lockfiles that this
+# instance has created (as we'll be responsible for closing them)
+my %created_server_lockfile_paths;
+# Keep track of the lockfiles for server we have added ourselves as listeners
+# to.
+my %listener_server_lockfile_paths;
+# We also have a global of all of the listeners we have assigned as we'll
+# be responsible for removing them.
+my %registered_listeners;
+
 sub _spawnClient
 {
@@ -95 +104 @@
     }
     # record this for later
-    $server_lockfile_paths{$server_lockfile_path} = $infodb_file_path;
+    $created_server_lockfile_paths{$server_lockfile_path} = 1;
   }
   flock(TMPFH, LOCK_UN);
   close($tmp_lockfile_path);
   unlink($tmp_lockfile_path);
+  # record this for later
+  $listener_server_lockfile_paths{$server_lockfile_path} = $infodb_file_path;
   return GDBMClient->new($server_lockfile_path);
 }
@@ -107 +118 @@
   # we ask the server to shutdown, but only the 'creator' thread will actually
   # be able to, and only once all listeners have deregistered.
-  foreach my $server_lockfile_path (keys (%server_lockfile_paths))
-  {
-    my $infodb_file_path = $server_lockfile_paths{$server_lockfile_path};
+  foreach my $server_lockfile_path (keys (%listener_server_lockfile_paths))
+  {
+    my $infodb_file_path = $listener_server_lockfile_paths{$server_lockfile_path};
     my $gdbm_client_handle = GDBMClient->new($server_lockfile_path);
-    print "* Stopping GDBMServer for: " . $infodb_file_path . "\n";
+    # Deregister all of our registered listeners
+    foreach my $listener_suffix (keys(%registered_listeners))
+    {
+      $gdbm_client_handle->removeListener($listener_suffix);
+    }
+    # ask the servers we created to shut down (all other threads will have
+    # this request ignored)
+    if (defined $created_server_lockfile_paths{$infodb_file_path})
+    {
+      print "* Attempting to stop GDBMServer for: " . $infodb_file_path . "\n";
+    }
     $gdbm_client_handle->query('!stop:' . $$);
   }
-  # we should now wait until all of the server_lockfiles have actually been
+  # we should now wait until all of our server_lockfiles have actually been
   # removed (otherwise people could mistakenly run import/build again
   # immediately and things *might* go pearshaped).
-  foreach my $server_lockfile_path (keys (%server_lockfile_paths))
+  foreach my $server_lockfile_path (keys (%created_server_lockfile_paths))
   {
     # While the file exists, we should wait
@@ -147 +168 @@
   # Register this client on the server if necessary
   $gdbm_client_handle->addListener('w');
+  $registered_listeners{'w'} = 1;
   # and pass the handle to client around
   return $gdbm_client_handle;
@@ -156 +178 @@
 {
   my $gdbm_client_handle = shift(@_);
-  # we deregister as a listener
-  $gdbm_client_handle->removeListener('w');
 }
 # /** close_infodb_write_handle($infodb_handle) **/
@@ -169 +189 @@
   my $collection_name = shift(@_);
   my $infodb_directory_path = shift(@_);
+  my $create_server = shift(@_);
 
   my $infodb_file_extension = ".gdb";
   my $infodb_file_name = &util::get_dirsep_tail($collection_name) . $infodb_file_extension;
-  return &util::filename_cat($infodb_directory_path, $infodb_file_name);
+  my $infodb_file_path = &util::filename_cat($infodb_directory_path, $infodb_file_name);
+
+  # Special Case for GDBMServer
+  if (defined $create_server && $create_server == 1)
+  {
+    my $gdbm_client_handle = &_spawnClient($infodb_file_path);
+    # Register this client on the server if necessary
+    $gdbm_client_handle->addListener('i');
+    $registered_listeners{'i'} = 1;
+  }
+
+  # Resuming our regular programming
+  return $infodb_file_path;
 }
 
@@ -181 +214 @@
   my $gdbm_client_handle = &_spawnClient($infodb_file_path);
   $gdbm_client_handle->addListener('r');
+  $registered_listeners{'r'} = 1;
   # retrieves all the keys in the form:
   # [key1]\n[key2]\n[key3]\n...[keyn]
@@ -196 +230 @@
     }
   }
-  # remove our listener
-  $gdbm_client_handle->removeListener('r');
 }
 
@@ -208 +240 @@
   # register ourself as listener
   $gdbm_client_handle->addListener('k');
+  $registered_listeners{'k'} = 1;
   # retrieves all the keys in the form:
   # [key1]\n[key2]\n[key3]\n...[keyn]
@@ -219 +252 @@
     }
   }
-  # remove our listener
-  $gdbm_client_handle->removeListener('k');
 }
 
@@ -270 +301 @@
   my $gdbm_client_handle = &_spawnClient($infodb_file_path);
   $gdbm_client_handle->addListener('s');
+  $registered_listeners{'s'} = 1;
   # Protect metadata values that go inside quotes for gdbmset
   foreach my $k (keys %$infodb_map)
@@ -297 +329 @@
   # Send command to server
   $gdbm_client_handle->query($gdbm_command);
-  # remove our listener
-  $gdbm_client_handle->removeListener('s');
 }