[padb-devel] [padb commit] r101 - Combine the target_output and target_responce in the

[codesite-noreply at google.com]

Author: apittman
Date: Wed Jul 15 10:20:25 2009
New Revision: 101

Modified:
    branches/full-duplex/src/padb

Log:
Combine the target_output and target_responce in the
reply_from_child() funtion making sure we pass all responces
back up the tree to where they belong.


Modified: branches/full-duplex/src/padb
==============================================================================
--- branches/full-duplex/src/padb	(original)
+++ branches/full-duplex/src/padb	Wed Jul 15 10:20:25 2009
@@ -4760,6 +4760,7 @@
          gdb_detach($gdb);
          gdb_quit($gdb);
      }
+    return;
  }

  # Ideally handle all this at a higher level...
@@ -5660,6 +5661,7 @@
      if ( $confInner{mode} eq "proc-summary" ) {
          return $proc_info;
      }
+    return;
  }

  sub show_proc {
@@ -5839,6 +5841,7 @@
              }
          }
      }
+    return;
  }

  sub kill_proc {
@@ -5938,6 +5941,7 @@
      }

      unlink($file);
+    return;
  }

  sub set_debug {
@@ -6421,6 +6425,7 @@
      run_command( undef,
          "$confInner{edb} --stats-raw --parallel --key=$key  
$confInner{edbopt}"
      );
+    return;
  }

  sub default_handler_all {
@@ -6471,17 +6476,30 @@
          }
      }

+    # Combine the target process responces.
+    if ( exists $r->{target_output} ) {
+        foreach my $tp ( keys( %{ $r->{target_output} } ) ) {
+            $handle->{all_replys}->{target_output}{$tp} =
+              $r->{target_output}{$tp};
+        }
+    }
+
+    if ( exists $handle->{target_responce} ) {
+        foreach my $tp ( keys( %{ $handle->{target_responce} } ) ) {
+            $handle->{all_replys}->{target_responce}{$tp} =
+              $handle->{target_responce}{$tp};
+        }
+    }
+
      # Save any output we've got from this node.
      foreach my $key ( keys(%inner_output) ) {
-        $r->{target_output}{$key} = $inner_output{$key};
+        $handle->{all_replys}->{target_output}{$key} = $inner_output{$key};
      }

      %inner_output = ();

-    # If this is the last reply from a child then report upstream.
-    # print Dumper $handle;
+    # If this isn't the last child to signon don't reply up-stream yet.
      if ( $handle->{child_replys} != $handle->{children} ) {
-        my $missing = $handle->{children} - $handle->{child_replys};
          return;
      }