[padb-devel] [padb] r154 committed - Get rid of jobconfig in the signon request, it only contained...

[codesite-noreply at google.com]

Revision: 154
Author: apittman
Date: Tue Aug 25 05:58:39 2009
Log: Get rid of jobconfig in the signon request, it only contained
the jobid and optionally the orte info so just move these into
the config and global namespace respectively.

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

Modified:
  /trunk/src/padb

=======================================
--- /trunk/src/padb	Tue Aug 25 05:48:55 2009
+++ /trunk/src/padb	Tue Aug 25 05:58:39 2009
@@ -3311,14 +3311,13 @@
      # Also send over some of the per-run (as opposed to per-mode)
      # configuration  options.
      # XXX: Need to send over scripts and other stuff here as well.
-    $req->{jobconfig}{jobid} = $comm_data->{jobid};
-    $req->{jobconfig}{rmgr}  = $conf{rmgr};

      if ( $conf{rmgr} eq "orte" ) {
-        $req->{jobconfig}{orte_data} = $open_jobs{ $comm_data->{jobid}  
}{ranks};
+        $req->{orte_data} = $open_jobs{ $comm_data->{jobid} }{ranks};
      }

      $req->{cinner} = \%cinner;
+    $req->{cinner}{jobid} = $comm_data->{jobid};

      return $req;
  }
@@ -6755,13 +6754,13 @@
  sub inner_find_pids {
      my ( $netdata, $cmd ) = @_;

-    if ( $cmd->{jobconfig}{rmgr} eq "orte" ) {
-        $confInner{orte_data} = $cmd->{jobconfig}{orte_data};
+    if ( $confInner{rmgr} eq "orte" ) {
+        $confInner{orte_data} = $cmd->{orte_data};
      }

      # Query the resource manager to find the pids,
      # they'll be added to the "all_pids" array.
-    $rmgr{ $cmd->{jobconfig}{rmgr} }{find_pids}( $cmd->{jobconfig}{jobid}  
);
+    $rmgr{ $confInner{rmgr} }{find_pids}( $confInner{jobid} );

      convert_pids_to_child_pids();