[padb] r349 committed - Add a new type of callback for the mode to use, handler_all is...

[padb at googlecode.com]

Revision: 349
Author: apittman
Date: Mon Dec  7 04:41:09 2009
Log: Add a new type of callback for the mode to use, handler_all is
intended to replace handler and is called once for each target
process.  It differs from handler in that it takes the same
options as the handler_all command.  In time I'd like to drop
handler for simplicity.

http://code.google.com/p/padb/source/detail?r=349

Modified:
  /trunk/src/padb

=======================================
--- /trunk/src/padb	Mon Dec  7 04:30:03 2009
+++ /trunk/src/padb	Mon Dec  7 04:41:09 2009
@@ -8791,18 +8791,20 @@
      # or any other rank on this node, we'll have to see if that causes
      # problems or if it's best to clear the target_key_pair() and output()
      # data for this node/rank.
+
+    # Bit of a hack here until I can fix it properly, pass on the
+    # output format so that the stack trace code knows when to do
+    # clever things in tree mode.
+    my $cargs = $cmd->{cargs};
+    if ( defined $cmd->{out_format} ) {
+        $cargs->{out_format} = $cmd->{out_format};
+    } else {
+        $cargs->{out_format} = 'raw';
+    }
+
      if ( defined $allfns{ $cmd->{mode} }{handler_all} ) {
          eval {

-            # Bit of a hack here until I can fix it properly, pass on the
-            # output format so that the stack trace code knows when to do
-            # clever things in tree mode.
-            my $cargs = $cmd->{cargs};
-            if ( defined $cmd->{out_format} ) {
-                $cargs->{out_format} = $cmd->{out_format};
-            } else {
-                $cargs->{out_format} = 'raw';
-            }
              $netdata->{target_response} =
                $allfns{ $cmd->{mode} }{handler_all}( $cargs, $pid_list );
              1;
@@ -8821,9 +8823,19 @@
              my $vp  = $proc->{vp};
              my $pid = $proc->{pid};
              eval {
-                my $res =
-                  $allfns{ $cmd->{mode} }{handler}( $cmd->{cargs}, $vp,  
$pid );
-                $gres{$vp} = $res if ( defined $res );
+
+                # The only difference here is the type of the first option,
+                # all functions should be converted to a single format here
+                if ( defined $allfns{ $cmd->{mode} }{handler_one} ) {
+                    my $res =
+                      $allfns{ $cmd->{mode} }{handler_one}( $cargs, $proc  
);
+                    $gres{$vp} = $res if ( defined $res );
+                } else {
+                    my $res =
+                      $allfns{ $cmd->{mode} }{handler}( $cmd->{cargs}, $vp,
+                        $pid );
+                    $gres{$vp} = $res if ( defined $res );
+                }
                  1;
              } or do {
                  my $error = $@;