[mpich2-commits] r7676 - in mpich2/trunk/src/pm/hydra/ui: include mpich utils
goodell at mcs.anl.gov
goodell at mcs.anl.gov
Mon Jan 10 15:43:59 CST 2011
Author: goodell
Date: 2011-01-10 15:43:59 -0600 (Mon, 10 Jan 2011)
New Revision: 7676
Modified:
mpich2/trunk/src/pm/hydra/ui/include/ui.h
mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c
mpich2/trunk/src/pm/hydra/ui/mpich/utils.c
mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
Log:
rename hydra's "regex" options to "pattern", since it isn't a regex
This builds on r7653 and r7654.
No reviewer.
Modified: mpich2/trunk/src/pm/hydra/ui/include/ui.h
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/include/ui.h 2011-01-10 17:24:47 UTC (rev 7675)
+++ mpich2/trunk/src/pm/hydra/ui/include/ui.h 2011-01-10 21:43:59 UTC (rev 7676)
@@ -8,9 +8,9 @@
#define UI_H_INCLUDED
struct HYD_ui_info {
- char *prepend_regex;
- char *outfile_regex;
- char *errfile_regex;
+ char *prepend_pattern;
+ char *outfile_pattern;
+ char *errfile_pattern;
};
extern struct HYD_ui_info HYD_ui_info;
Modified: mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c 2011-01-10 17:24:47 UTC (rev 7675)
+++ mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c 2011-01-10 21:43:59 UTC (rev 7676)
@@ -109,9 +109,9 @@
printf(" -ppn processes per node\n");
printf(" -profile turn on internal profiling\n");
printf(" -prepend-rank prepend rank to output\n");
- printf(" -prepend-regex prepend regex to output\n");
- printf(" -outfile-regex direct stdout to file\n");
- printf(" -errfile-regex direct stderr to file\n");
+ printf(" -prepend-pattern prepend pattern to output\n");
+ printf(" -outfile-pattern direct stdout to file\n");
+ printf(" -errfile-pattern direct stderr to file\n");
printf
(" -nameserver name server information (host:port format)\n");
printf(" -disable-auto-cleanup don't cleanup processes on error\n");
Modified: mpich2/trunk/src/pm/hydra/ui/mpich/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpich/utils.c 2011-01-10 17:24:47 UTC (rev 7675)
+++ mpich2/trunk/src/pm/hydra/ui/mpich/utils.c 2011-01-10 21:43:59 UTC (rev 7676)
@@ -280,10 +280,10 @@
static HYD_status prepend_rank_fn(char *arg, char ***argv)
{
- return HYDU_set_str(arg, argv, &HYD_ui_info.prepend_regex, "[%r] ");
+ return HYDU_set_str(arg, argv, &HYD_ui_info.prepend_pattern, "[%r] ");
}
-static void regex_info(void)
+static void pattern_info(void)
{
printf(" Regular expressions can include:\n");
printf(" %%r: Process rank\n");
@@ -292,41 +292,41 @@
printf(" %%h: Hostname\n");
}
-static void prepend_regex_help_fn(void)
+static void prepend_pattern_help_fn(void)
{
printf("\n");
- printf("-prepend-regex: Prepend this regular expression to stdout and stderr\n");
- regex_info();
+ printf("-prepend-pattern: Prepend this regular expression to stdout and stderr\n");
+ pattern_info();
printf("\n");
}
-static HYD_status prepend_regex_fn(char *arg, char ***argv)
+static HYD_status prepend_pattern_fn(char *arg, char ***argv)
{
- return HYDU_set_str_and_incr(arg, argv, &HYD_ui_info.prepend_regex);
+ return HYDU_set_str_and_incr(arg, argv, &HYD_ui_info.prepend_pattern);
}
-static void outfile_regex_help_fn(void)
+static void outfile_pattern_help_fn(void)
{
printf("\n");
- printf("-outfile-regex: Send stdout to this file\n\n");
- regex_info();
+ printf("-outfile-pattern: Send stdout to this file\n\n");
+ pattern_info();
}
-static HYD_status outfile_regex_fn(char *arg, char ***argv)
+static HYD_status outfile_pattern_fn(char *arg, char ***argv)
{
- return HYDU_set_str_and_incr(arg, argv, &HYD_ui_info.outfile_regex);
+ return HYDU_set_str_and_incr(arg, argv, &HYD_ui_info.outfile_pattern);
}
-static void errfile_regex_help_fn(void)
+static void errfile_pattern_help_fn(void)
{
printf("\n");
- printf("-errfile-regex: Send stderr to this file\n\n");
- regex_info();
+ printf("-errfile-pattern: Send stderr to this file\n\n");
+ pattern_info();
}
-static HYD_status errfile_regex_fn(char *arg, char ***argv)
+static HYD_status errfile_pattern_fn(char *arg, char ***argv)
{
- return HYDU_set_str_and_incr(arg, argv, &HYD_ui_info.errfile_regex);
+ return HYDU_set_str_and_incr(arg, argv, &HYD_ui_info.errfile_pattern);
}
static void wdir_help_fn(void)
@@ -961,9 +961,9 @@
{"profile", profile_fn, profile_help_fn},
{"prepend-rank", prepend_rank_fn, prepend_rank_help_fn},
{"l", prepend_rank_fn, prepend_rank_help_fn},
- {"prepend-regex", prepend_regex_fn, prepend_regex_help_fn},
- {"outfile-regex", outfile_regex_fn, outfile_regex_help_fn},
- {"errfile-regex", errfile_regex_fn, errfile_regex_help_fn},
+ {"prepend-pattern", prepend_pattern_fn, prepend_pattern_help_fn},
+ {"outfile-pattern", outfile_pattern_fn, outfile_pattern_help_fn},
+ {"errfile-pattern", errfile_pattern_fn, errfile_pattern_help_fn},
{"wdir", wdir_fn, wdir_help_fn},
{"configfile", config_fn, config_help_fn},
Modified: mpich2/trunk/src/pm/hydra/ui/utils/uiu.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2011-01-10 17:24:47 UTC (rev 7675)
+++ mpich2/trunk/src/pm/hydra/ui/utils/uiu.c 2011-01-10 21:43:59 UTC (rev 7676)
@@ -11,7 +11,7 @@
static struct stdoe_fd {
int fd;
- char *regex;
+ char *pattern;
struct stdoe_fd *next;
} *stdoe_fd_list = NULL;
@@ -43,9 +43,9 @@
HYD_server_info.num_pmi_calls = 0;
#endif /* ENABLE_PROFILING */
- HYD_ui_info.prepend_regex = NULL;
- HYD_ui_info.outfile_regex = NULL;
- HYD_ui_info.errfile_regex = NULL;
+ HYD_ui_info.prepend_pattern = NULL;
+ HYD_ui_info.outfile_pattern = NULL;
+ HYD_ui_info.errfile_pattern = NULL;
stdoe_fd_list = NULL;
}
@@ -80,14 +80,14 @@
if (HYD_server_info.pg_list.next)
HYDU_free_pg_list(HYD_server_info.pg_list.next);
- if (HYD_ui_info.prepend_regex)
- HYDU_FREE(HYD_ui_info.prepend_regex);
+ if (HYD_ui_info.prepend_pattern)
+ HYDU_FREE(HYD_ui_info.prepend_pattern);
- if (HYD_ui_info.outfile_regex)
- HYDU_FREE(HYD_ui_info.outfile_regex);
+ if (HYD_ui_info.outfile_pattern)
+ HYDU_FREE(HYD_ui_info.outfile_pattern);
- if (HYD_ui_info.errfile_regex)
- HYDU_FREE(HYD_ui_info.errfile_regex);
+ if (HYD_ui_info.errfile_pattern)
+ HYDU_FREE(HYD_ui_info.errfile_pattern);
for (run = stdoe_fd_list; run;) {
close(run->fd);
@@ -171,7 +171,7 @@
return;
}
-static HYD_status resolve_regex_string(const char *regex, char **str, int pgid, int proxy_id,
+static HYD_status resolve_pattern_string(const char *pattern, char **str, int pgid, int proxy_id,
int rank)
{
int offset, i;
@@ -183,7 +183,7 @@
HYDU_FUNC_ENTER();
- tstr = *str = HYDU_strdup(regex);
+ tstr = *str = HYDU_strdup(pattern);
offset = 0;
i = 0;
@@ -234,7 +234,7 @@
MPL_snprintf(tmp[i], HYD_TMP_STRLEN, "%s", proxy->node.hostname);
}
else {
- HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "unrecognized regex\n");
+ HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "unrecognized pattern\n");
}
i++;
@@ -260,7 +260,7 @@
static HYD_status stdoe_cb(int _fd, int pgid, int proxy_id, int rank, void *_buf, int buflen)
{
int fd = _fd;
- char *regex_resolve, *regex = NULL;
+ char *pattern_resolve, *pattern = NULL;
struct stdoe_fd *tmp, *run;
int sent, closed, mark, i;
char *buf = (char *) _buf, *prepend;
@@ -268,25 +268,25 @@
HYDU_FUNC_ENTER();
- regex = (_fd == STDOUT_FILENO) ? HYD_ui_info.outfile_regex :
- (_fd == STDERR_FILENO) ? HYD_ui_info.errfile_regex : NULL;
+ pattern = (_fd == STDOUT_FILENO) ? HYD_ui_info.outfile_pattern :
+ (_fd == STDERR_FILENO) ? HYD_ui_info.errfile_pattern : NULL;
- if (regex) {
- /* See if the regex already exists */
- status = resolve_regex_string(regex, ®ex_resolve, pgid, proxy_id, rank);
+ if (pattern) {
+ /* See if the pattern already exists */
+ status = resolve_pattern_string(pattern, &pattern_resolve, pgid, proxy_id, rank);
for (run = stdoe_fd_list; run; run = run->next)
- if (!strcmp(run->regex, regex_resolve))
+ if (!strcmp(run->pattern, pattern_resolve))
break;
if (run) {
fd = run->fd;
- HYDU_FREE(regex_resolve);
+ HYDU_FREE(pattern_resolve);
}
else {
HYDU_MALLOC(tmp, struct stdoe_fd *, sizeof(struct stdoe_fd), status);
- tmp->regex = regex_resolve;
- tmp->fd = open(tmp->regex, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+ tmp->pattern = pattern_resolve;
+ tmp->fd = open(tmp->pattern, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
HYDU_ASSERT(tmp->fd >= 0, status);
tmp->next = NULL;
@@ -301,15 +301,15 @@
}
}
- if (HYD_ui_info.prepend_regex == NULL) {
+ if (HYD_ui_info.prepend_pattern == NULL) {
status = HYDU_sock_write(fd, buf, buflen, &sent, &closed);
HYDU_ERR_POP(status, "unable to write data to stdout/stderr\n");
HYDU_ASSERT(!closed, status);
}
else {
- status = resolve_regex_string(HYD_ui_info.prepend_regex, &prepend, pgid, proxy_id,
+ status = resolve_pattern_string(HYD_ui_info.prepend_pattern, &prepend, pgid, proxy_id,
rank);
- HYDU_ERR_POP(status, "error resolving regex\n");
+ HYDU_ERR_POP(status, "error resolving pattern\n");
mark = 0;
for (i = 0; i < buflen; i++) {
More information about the mpich2-commits
mailing list