← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mpich/vivid-proposed

« back to all changes in this revision

Viewing changes to src/pm/hydra/pm/pmiserv/pmiserv_pmci.c

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2014-04-01 20:24:20 UTC
  • mfrom: (5.2.4 sid)
  • Revision ID: package-import@ubuntu.com-20140401202420-t5ey1ia2klt5dkq3
Tags: 3.1-4
http://bugs.debian.org/743047
* [c3e3398] Disable test_primitives, which is unreliable on some platforms.
            (Closes: #743047)
* [265a699] Add minimal autotest.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pm/hydra/pm/pmiserv/pmiserv_pmci.c
94
94
HYD_status HYD_pmci_launch_procs(void)
95
95
{
96
96
    struct HYD_proxy *proxy;
97
 
    char *proxy_args[HYD_NUM_TMP_STRINGS] = { NULL }, *control_port = NULL;
 
97
    struct HYD_string_stash proxy_stash;
 
98
    char *control_port = NULL;
98
99
    int node_count, i, *control_fd;
99
100
    HYD_status status = HYD_SUCCESS;
100
101
 
115
116
    if (HYD_server_info.user_global.debug)
116
117
        HYDU_dump(stdout, "Got a control port string of %s\n", control_port);
117
118
 
118
 
    status = HYD_pmcd_pmi_fill_in_proxy_args(proxy_args, control_port, 0);
 
119
    status = HYD_pmcd_pmi_fill_in_proxy_args(&proxy_stash, control_port, 0);
119
120
    HYDU_ERR_POP(status, "unable to fill in proxy arguments\n");
120
121
 
121
122
    status = HYD_pmcd_pmi_fill_in_exec_launch_info(&HYD_server_info.pg_list);
129
130
    for (i = 0; i < node_count; i++)
130
131
        control_fd[i] = HYD_FD_UNSET;
131
132
 
132
 
    status =
133
 
        HYDT_bsci_launch_procs(proxy_args, HYD_server_info.pg_list.proxy_list, control_fd);
 
133
    status = HYDT_bsci_launch_procs(proxy_stash.strlist, HYD_server_info.pg_list.proxy_list,
 
134
                                    control_fd);
134
135
    HYDU_ERR_POP(status, "launcher cannot launch processes\n");
135
136
 
136
137
    for (i = 0, proxy = HYD_server_info.pg_list.proxy_list; proxy; proxy = proxy->next, i++)
147
148
  fn_exit:
148
149
    if (control_port)
149
150
        HYDU_FREE(control_port);
150
 
    HYDU_free_strlist(proxy_args);
 
151
    HYD_STRING_STASH_FREE(proxy_stash);
151
152
    HYDU_FUNC_EXIT();
152
153
    return status;
153
154