[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-259-gf322ce7

[mysql vizuser]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  f322ce7966f429aab1d54c258aa3a37d8c58629c (commit)
       via  dad27b3e8cbf007505332798b9ff43fba44071ac (commit)
       via  a09bfea83f36ac04e3706cef1777746f8a4e97ed (commit)
      from  6a688097dfbf3d1af2a50b605ed7aee97a6fa363 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/f322ce7966f429aab1d54c258aa3a37d8c58629c

commit f322ce7966f429aab1d54c258aa3a37d8c58629c
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Fri Jun 7 01:22:02 2013 -0500

    Bug-fix: Fix slurm node list creation.
    
    Fixes tt#1871.

diff --git a/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c b/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c
index 48c9cc7..61f1536 100644
--- a/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c
+++ b/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c
@@ -79,18 +79,9 @@ static HYD_status group_to_nodes(char *str)
 
             HYDU_free_strlist(node_str);
 
-            status = HYDU_alloc_node(&node);
-            HYDU_ERR_POP(status, "unable to allocate note\n");
-
-            node->hostname = HYDU_strdup(tmp);
-            node->core_count = tasks_per_node[k++];
-
-            if (global_node_list == NULL)
-                global_node_list = node;
-            else {
-                for (tnode = global_node_list; tnode->next; tnode = tnode->next);
-                tnode->next = node;
-            }
+            status =
+                HYDU_add_to_node_list(HYDU_strdup(tmp), tasks_per_node[k++], &global_node_list);
+            HYDU_ERR_POP(status, "unable to add to node list\n");
         }
     }
 

http://git.mpich.org/mpich.git/commitdiff/dad27b3e8cbf007505332798b9ff43fba44071ac

commit dad27b3e8cbf007505332798b9ff43fba44071ac
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Fri Jun 7 00:58:14 2013 -0500

    Bug-fix: Fix use of wrong string list.

diff --git a/src/pm/hydra/pm/pmiserv/pmiserv_utils.c b/src/pm/hydra/pm/pmiserv/pmiserv_utils.c
index 98a9383..bee4a11 100644
--- a/src/pm/hydra/pm/pmiserv/pmiserv_utils.c
+++ b/src/pm/hydra/pm/pmiserv/pmiserv_utils.c
@@ -488,7 +488,7 @@ HYD_status HYD_pmcd_pmi_fill_in_exec_launch_info(struct HYD_pg *pg)
 
         if (HYD_server_info.user_global.debug) {
             HYDU_dump_noprefix(stdout, "Arguments being passed to proxy %d:\n", proxy_count);
-            HYDU_print_strlist(stash.strlist);
+            HYDU_print_strlist(exec_stash.strlist);
             HYDU_dump_noprefix(stdout, "\n");
         }
 

http://git.mpich.org/mpich.git/commitdiff/a09bfea83f36ac04e3706cef1777746f8a4e97ed

commit a09bfea83f36ac04e3706cef1777746f8a4e97ed
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Sat Jun 1 15:56:30 2013 -0500

    Memory-leak fixes.

diff --git a/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c b/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
index b23ff65..7466a1f 100644
--- a/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
+++ b/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
@@ -56,6 +56,7 @@ static HYD_status send_cmd_upstream(const char *start, int fd, int num_args, cha
     status = HYDU_str_alloc_and_join(tmp, &buf);
     HYDU_ERR_POP(status, "unable to join strings\n");
     HYDU_free_strlist(tmp);
+    HYDU_FREE(tmp);
 
     HYD_pmcd_init_header(&hdr);
     hdr.cmd = PMI_CMD;
@@ -570,6 +571,8 @@ static HYD_status fn_barrier_out(int fd, char *args[])
 static HYD_status fn_finalize(int fd, char *args[])
 {
     const char *cmd;
+    int i;
+    static int finalize_count = 0;
     HYD_status status = HYD_SUCCESS;
 
     HYDU_FUNC_ENTER();
@@ -584,6 +587,18 @@ static HYD_status fn_finalize(int fd, char *args[])
     HYDU_ERR_POP(status, "unable to deregister fd\n");
     close(fd);
 
+    finalize_count++;
+
+    if (finalize_count == HYD_pmcd_pmip.local.proxy_process_count) {
+        /* All processes have finalized */
+        for (i = 0; i < cache_get.keyval_len; i++) {
+            HYDU_FREE(cache_get.key[i]);
+            HYDU_FREE(cache_get.val[i]);
+        }
+        HYDU_FREE(cache_get.key);
+        HYDU_FREE(cache_get.val);
+    }
+
   fn_exit:
     HYDU_FUNC_EXIT();
     return status;

-----------------------------------------------------------------------

Summary of changes:
 src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c              |   15 +++++++++++++++
 src/pm/hydra/pm/pmiserv/pmiserv_utils.c            |    2 +-
 .../bootstrap/external/slurm_query_node_list.c     |   15 +++------------
 3 files changed, 19 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
MPICH primary repository