Changeset 24679

Timestamp:

2011-09-28T13:15:12+13:00 (13 years ago)

Author:

jmt12

Message:

Added code to determine the open file handles and persist them through the daemon fork (previously hardcoded - which failed to work when parallel importing) and extended debug information with timing and thread identifiers

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/GDBMServer.pl (modified) (7 diffs)

gs2-extensions/parallel-building/trunk/src/bin/script/GDBMServer.pl

@@ -168 +168 @@
   #       after your desired function call (like start() below) and the
   #       difference in hc_fd gives your new file descriptors in use! [jmt12]
-#  my $openmax = POSIX::sysconf( &POSIX::_SC_OPEN_MAX );
-#  $openmax = ( ! defined( $openmax ) || $openmax < 0 ) ? ( shift || 64 ) : $openmax;
-#  my $hc_fd = 2;
-#  foreach ( 3 .. $openmax )
-#  {
-#    $hc_fd = $_ if POSIX::close( $_ );
-#  }
-#  print "[debug] After start fd count = " . $hc_fd . "\n";
-#  exit(0);
+  #my $openmax = POSIX::sysconf( &POSIX::_SC_OPEN_MAX );
+  #$openmax = ( ! defined( $openmax ) || $openmax < 0 ) ? ( shift || 64 ) : $openmax;
+  #my $hc_fd = 2;
+  #foreach ( 3 .. $openmax )
+  #{
+  #  $hc_fd = $_ if POSIX::close( $_ );
+  #}
+  #print "[debug] After start fd count = " . $hc_fd . "\n";
+  #exit(0);
 
   # @note As mentioned above, I couldn't get the file handles produced by open2
@@ -225 +225 @@
   #       these are fd 3, 4, 5, and 6.
   $gdbm = start \@cmd, \$gdbm_writer, \$gdbm_reader;
+  # - start opens four handles!
 
   # Daemonize
@@ -230 +231 @@
   if (!$no_daemon)
   {
+    # Determine the anonymous array of file descriptors *not* to close
+    my $dont_close_fd = [];
+    # Building upon the "POSIX::Close()" test above, we need to explicitly
+    # determine the new file descriptors opened by the start command.
+    my $openmax = POSIX::sysconf( &POSIX::_SC_OPEN_MAX );
+    $openmax = ( ! defined( $openmax ) || $openmax < 0 ) ? ( shift || 64 ) : $openmax;
+    # - then figure out the file descriptors currently open. We do this
+    #   by attempting to 'copy' each file descriptor.
+    for (my $fd = 3; $fd <= $openmax; $fd++)
+    {
+      #rint "Checking file descriptor: $fd -> ";
+      my $tmpfh;
+      if (open $tmpfh, ">&$fd")
+      {
+        #rint "writable!\n";
+        push(@{$dont_close_fd}, $fd);
+        close($tmpfh);
+      }
+      elsif (open $tmpfh, "<&$fd")
+      {
+        #rint "readable!\n";
+        push(@{$dont_close_fd}, $fd);
+        close($tmpfh);
+      }
+      #else
+      #{
+      #  print "not open\n";
+      #}
+    }
+    print " * When forking don't close these filehandles: [" . join(",", @{$dont_close_fd}) . "]\n";
+
     print " * Spawning Daemon...\n" unless (!$debug);
     my $daemon_out_path = &util::filename_cat($ENV{'GEXTPARALLELBUILDING'},'logs', 'gdbmserver-' . $infodb_file . '.out');
@@ -238 +270 @@
   # @note as mentioned above, start creates four file descriptors that we need
   #       to keep open even through the separation of the daemon process.
-                                 dont_close_fd => [3,4,5,6]
+                                 dont_close_fd => $dont_close_fd,
                                } );
   }
@@ -330 +362 @@
 {
   my $data = shift @_;
+  my $ip = shift @_;
+  my $tid = shift @_;
   my $value = "#ERROR#";
   # Synchronized debug log writing
@@ -336 +370 @@
     lock($debug_log);
     $|++;
-    print " << " . $data . "\n";
+    print "[" . time() . "|" . $tid . "|RECV] " . $data . "\n";
     $|--;
   }
@@ -437 +471 @@
     lock($debug_log);
     $|++;
-    print " >> " . $value . "\n\n";
+    print "[" . time() . "|" . $tid . "|SEND] " . $value . "\n\n";
     $|--;
   }