Changeset 24429 for gs2-extensions/tdb-edit/trunk/src/perllib/dbutil/tdb.pm

Timestamp:

2011-08-19T13:07:27+12:00 (13 years ago)

Author:

jmt12

Message:

Added code to support persistence of TDB connections in a pool, and some debug comments

File:

• gs2-extensions/tdb-edit/trunk/src/perllib/dbutil/tdb.pm (modified) (5 diffs)

gs2-extensions/tdb-edit/trunk/src/perllib/dbutil/tdb.pm

@@ -32 +32 @@
 
 # Libraries/Modules
+use Cwd;
 use dbutil::gdbmtxtgz;
 
@@ -38 +39 @@
 # -----------------------------------------------------------------------------
 
+our %handle_pool;
+
+END {
+  # Close any handles left open in the pool
+  foreach my $pool_key (keys %handle_pool)
+  {
+    my $infodb_file_handle = $handle_pool{$pool_key};
+    close_infodb_write_handle($infodb_file_handle, 1);
+  }
+}
+
 # /**
 #  */
@@ -44 +56 @@
   my $program = shift(@_);
   my $program_exe = &util::filename_cat($program . &util::get_os_exe());
-  if (!-x $program_exe)
-  {
-    die('Fatal Error! File doesn\'t exist or isn\'t executable: ' . $program_exe);
-  }
+  #if (!-x $program_exe)
+  #{
+  #  die('Fatal Error! File doesn\'t exist or isn\'t executable: ' . $program_exe);
+  #}
   return $program_exe;
 }
 # /** get_tdb_executable() **/
 
+
+
 # /**
 #  */
@@ -61 +75 @@
   my $txt2tdb_exe = &dbutil::tdb::get_tdb_executable('txt2tdb');
 
+  my $pool_key = $infodb_file_path;
+  #my $cmd = "taskset -c 5 \"$txt2tdb_exe\"";
   my $cmd = "\"$txt2tdb_exe\"";
   if ((defined $opt_append) && ($opt_append eq "append"))
   {
     $cmd .= " -append";
+    $pool_key .= '-append';
   }
   $cmd .= " \"$infodb_file_path\"";
+  #$cmd .= " -debug"; # Uncomment to enable debug timing
 
   # we're going to pipe the key value pairs, in the appropriate format, from
   # within the buildproc, so we create a piped handle here
   my $infodb_file_handle = undef;
-  if(!open($infodb_file_handle, "| $cmd"))
-  {
-    print STDERR "Error: Failed to open pipe to $cmd\n";
-    print STDERR "       $!\n";
-    return undef;
-  }
-
-  binmode($infodb_file_handle,":utf8");
-
+  if (defined $handle_pool{$pool_key})
+  {
+    $infodb_file_handle = $handle_pool{$pool_key};
+  }
+  else
+  {
+    print STDERR "tdb::open_infodb_write_handle()\n";
+    if(!open($infodb_file_handle, "| $cmd"))
+    {
+      print STDERR "Error: Failed to open pipe to $cmd\n";
+      print STDERR "       $!\n";
+      return undef;
+    }
+    binmode($infodb_file_handle,":utf8");
+    $handle_pool{$pool_key} = $infodb_file_handle;
+  }
   return $infodb_file_handle;
 }
@@ -89 +114 @@
 {
   my $infodb_handle = shift(@_);
-  close($infodb_handle);
+  my ($empty_pool) = @_;
+  if (defined $empty_pool && $empty_pool == 1)
+  {
+    print STDERR "tdb::close_infodb_write_handle()\n";
+    close($infodb_handle);
+  }
 }
 # /** close_infodb_write_handle() **/