[mpich2-commits] r7939 - mpich2/trunk/src/pm/hydra/pm/pmiserv
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Fri Feb 11 17:34:14 CST 2011
Author: balaji
Date: 2011-02-11 17:34:14 -0600 (Fri, 11 Feb 2011)
New Revision: 7939
Modified:
mpich2/trunk/src/pm/hydra/pm/pmiserv/common.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/common.h
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_utils.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c
mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_utils.c
Log:
Rename PMI specific constants to start with PMI_ for clarity.
No reviewer.
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/common.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/common.c 2011-02-11 23:34:09 UTC (rev 7938)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/common.c 2011-02-11 23:34:14 UTC (rev 7939)
@@ -184,7 +184,7 @@
HYDU_FUNC_ENTER();
HYDU_MALLOC(*kvs, struct HYD_pmcd_pmi_kvs *, sizeof(struct HYD_pmcd_pmi_kvs), status);
- HYDU_snprintf((*kvs)->kvs_name, MAXNAMELEN, "kvs_%d_%d", (int) getpid(), pgid);
+ HYDU_snprintf((*kvs)->kvs_name, PMI_MAXKVSLEN, "kvs_%d_%d", (int) getpid(), pgid);
(*kvs)->key_pair = NULL;
fn_exit:
@@ -222,8 +222,8 @@
HYDU_MALLOC(key_pair, struct HYD_pmcd_pmi_kvs_pair *, sizeof(struct HYD_pmcd_pmi_kvs_pair),
status);
- HYDU_snprintf(key_pair->key, MAXKEYLEN, "%s", key);
- HYDU_snprintf(key_pair->val, MAXVALLEN, "%s", val);
+ HYDU_snprintf(key_pair->key, PMI_MAXKEYLEN, "%s", key);
+ HYDU_snprintf(key_pair->val, PMI_MAXVALLEN, "%s", val);
key_pair->next = NULL;
*ret = 0;
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/common.h
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/common.h 2011-02-11 23:34:09 UTC (rev 7938)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/common.h 2011-02-11 23:34:14 UTC (rev 7939)
@@ -10,20 +10,18 @@
#include "hydra.h"
/* Generic definitions */
-#define MAXKEYLEN 64 /* max length of key in keyval space */
-/* FIXME: PMI-1 uses 256, PMI-2 uses 1024; we use the MAX */
-#define MAXVALLEN 1024 /* max length of value in keyval space */
-#define MAXNAMELEN 256 /* max length of various names */
-#define MAXKVSNAME MAXNAMELEN /* max length of a kvsname */
+#define PMI_MAXKEYLEN (64) /* max length of key in keyval space */
+#define PMI_MAXVALLEN (1024) /* max length of value in keyval space */
+#define PMI_MAXKVSLEN (256) /* max length of various names */
struct HYD_pmcd_pmi_kvs_pair {
- char key[MAXKEYLEN];
- char val[MAXVALLEN];
+ char key[PMI_MAXKEYLEN];
+ char val[PMI_MAXVALLEN];
struct HYD_pmcd_pmi_kvs_pair *next;
};
struct HYD_pmcd_pmi_kvs {
- char kvs_name[MAXNAMELEN]; /* Name of this kvs */
+ char kvs_name[PMI_MAXKVSLEN]; /* Name of this kvs */
struct HYD_pmcd_pmi_kvs_pair *key_pair;
};
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2011-02-11 23:34:09 UTC (rev 7938)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c 2011-02-11 23:34:14 UTC (rev 7939)
@@ -188,11 +188,11 @@
i = 0;
tmp[i++] = HYDU_strdup("cmd=maxes kvsname_max=");
- tmp[i++] = HYDU_int_to_str(MAXKVSNAME);
+ tmp[i++] = HYDU_int_to_str(PMI_MAXKVSLEN);
tmp[i++] = HYDU_strdup(" keylen_max=");
- tmp[i++] = HYDU_int_to_str(MAXKEYLEN);
+ tmp[i++] = HYDU_int_to_str(PMI_MAXKEYLEN);
tmp[i++] = HYDU_strdup(" vallen_max=");
- tmp[i++] = HYDU_int_to_str(MAXVALLEN);
+ tmp[i++] = HYDU_int_to_str(PMI_MAXVALLEN);
tmp[i++] = HYDU_strdup("\n");
tmp[i++] = NULL;
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_utils.c 2011-02-11 23:34:09 UTC (rev 7938)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_utils.c 2011-02-11 23:34:14 UTC (rev 7939)
@@ -115,7 +115,7 @@
static HYD_status pmi_kvsname_fn(char *arg, char ***argv)
{
- HYDU_snprintf(HYD_pmcd_pmip.local.kvs->kvs_name, MAXNAMELEN, "%s", **argv);
+ HYDU_snprintf(HYD_pmcd_pmip.local.kvs->kvs_name, PMI_MAXKVSLEN, "%s", **argv);
(*argv)++;
return HYD_SUCCESS;
@@ -125,9 +125,9 @@
{
HYD_status status = HYD_SUCCESS;
- HYDU_MALLOC(HYD_pmcd_pmip.local.spawner_kvs_name, char *, MAXNAMELEN, status);
+ HYDU_MALLOC(HYD_pmcd_pmip.local.spawner_kvs_name, char *, PMI_MAXKVSLEN, status);
- HYDU_snprintf(HYD_pmcd_pmip.local.spawner_kvs_name, MAXNAMELEN, "%s", **argv);
+ HYDU_snprintf(HYD_pmcd_pmip.local.spawner_kvs_name, PMI_MAXKVSLEN, "%s", **argv);
(*argv)++;
fn_exit:
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2011-02-11 23:34:09 UTC (rev 7938)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_cb.c 2011-02-11 23:34:14 UTC (rev 7939)
@@ -264,8 +264,8 @@
if (pg_scratch->dead_process_count == 1) {
/* This is the first dead process */
HYDU_FREE(pg_scratch->dead_processes);
- HYDU_MALLOC(pg_scratch->dead_processes, char *, MAXVALLEN, status);
- HYDU_snprintf(pg_scratch->dead_processes, MAXVALLEN, "%d", hdr.pid);
+ HYDU_MALLOC(pg_scratch->dead_processes, char *, PMI_MAXVALLEN, status);
+ HYDU_snprintf(pg_scratch->dead_processes, PMI_MAXVALLEN, "%d", hdr.pid);
}
else {
/* FIXME: If the list of dead processes does not fit
@@ -350,18 +350,18 @@
str = NULL;
for (e = list; e; e = e->next) {
- HYDU_MALLOC(run, char *, MAXVALLEN, status);
+ HYDU_MALLOC(run, char *, PMI_MAXVALLEN, status);
if (str) {
if (e->start == e->end)
- HYDU_snprintf(run, MAXVALLEN, "%s,%d", str, e->start);
+ HYDU_snprintf(run, PMI_MAXVALLEN, "%s,%d", str, e->start);
else
- HYDU_snprintf(run, MAXVALLEN, "%s,%d-%d", str, e->start, e->end);
+ HYDU_snprintf(run, PMI_MAXVALLEN, "%s,%d-%d", str, e->start, e->end);
}
else {
if (e->start == e->end)
- HYDU_snprintf(run, MAXVALLEN, "%d", e->start);
+ HYDU_snprintf(run, PMI_MAXVALLEN, "%d", e->start);
else
- HYDU_snprintf(run, MAXVALLEN, "%d-%d", e->start, e->end);
+ HYDU_snprintf(run, PMI_MAXVALLEN, "%d-%d", e->start, e->end);
}
if (str)
HYDU_FREE(str);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2011-02-11 23:34:09 UTC (rev 7938)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v1.c 2011-02-11 23:34:14 UTC (rev 7939)
@@ -268,7 +268,7 @@
struct HYD_exec *exec_list = NULL, *exec;
struct HYD_env *env;
- char key[MAXKEYLEN], *val;
+ char key[PMI_MAXKEYLEN], *val;
int nprocs, preput_num, info_num, ret;
char *execname, *path = NULL;
@@ -385,14 +385,14 @@
for (i = 0; i < info_num; i++) {
char *info_key, *info_val;
- HYDU_snprintf(key, MAXKEYLEN, "info_key_%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "info_key_%d", i);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
info_key = val;
- HYDU_snprintf(key, MAXKEYLEN, "info_val_%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "info_val_%d", i);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
@@ -447,7 +447,7 @@
i = 0;
exec->exec[i++] = execname;
for (k = 0; k < argcnt; k++) {
- HYDU_snprintf(key, MAXKEYLEN, "arg%d", k + 1);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "arg%d", k + 1);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
@@ -483,13 +483,13 @@
for (i = 0; i < preput_num; i++) {
char *preput_key, *preput_val;
- HYDU_snprintf(key, MAXKEYLEN, "preput_key_%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "preput_key_%d", i);
val = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
preput_key = val;
- HYDU_snprintf(key, MAXKEYLEN, "preput_val_%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "preput_val_%d", i);
val = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2011-02-11 23:34:09 UTC (rev 7938)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_pmi_v2.c 2011-02-11 23:34:14 UTC (rev 7939)
@@ -462,7 +462,7 @@
struct HYD_env *env;
char *thrid;
- char key[MAXKEYLEN], *val;
+ char key[PMI_MAXKEYLEN], *val;
int maxprocs, preputcount, infokeycount, ret;
int ncmds;
char *execname, *path = NULL;
@@ -566,14 +566,14 @@
for (i = 0; i < infokeycount; i++) {
char *info_key, *info_val;
- HYDU_snprintf(key, MAXKEYLEN, "infokey%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "infokey%d", i);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
info_key = val;
- HYDU_snprintf(key, MAXKEYLEN, "infoval%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "infoval%d", i);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
@@ -628,7 +628,7 @@
i = 0;
exec->exec[i++] = execname;
for (k = 0; k < argcnt; k++) {
- HYDU_snprintf(key, MAXKEYLEN, "argv%d", k);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "argv%d", k);
val = HYD_pmcd_pmi_find_token_keyval(&tokens[segment_list[j].start_idx],
segment_list[j].token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
@@ -664,13 +664,13 @@
for (i = 0; i < preputcount; i++) {
char *preput_key, *preput_val;
- HYDU_snprintf(key, MAXKEYLEN, "ppkey%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "ppkey%d", i);
val = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
preput_key = val;
- HYDU_snprintf(key, MAXKEYLEN, "ppval%d", i);
+ HYDU_snprintf(key, PMI_MAXKEYLEN, "ppval%d", i);
val = HYD_pmcd_pmi_find_token_keyval(tokens, token_count, key);
HYDU_ERR_CHKANDJUMP(status, val == NULL, HYD_INTERNAL_ERROR,
"unable to find token: %s\n", key);
Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_utils.c 2011-02-11 23:34:09 UTC (rev 7938)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmiserv_utils.c 2011-02-11 23:34:14 UTC (rev 7939)
@@ -234,7 +234,7 @@
HYDU_ASSERT(mapping, status);
/* Make sure the mapping is within the size allowed by PMI */
- if (strlen(mapping) > MAXVALLEN) {
+ if (strlen(mapping) > PMI_MAXVALLEN) {
HYDU_FREE(mapping);
mapping = NULL;
}
More information about the mpich2-commits
mailing list