Modified infinite_loop.c, timed_loop.c, and fancy_timed_loop.c to include the max failures functionality. These loop procedures are used to run certain programs repeatedly. The max failures functionality set an upper bound on the number of times the programs are allowed to fail before terminating the run entirely.
Signed-off-by: Lucy Liang <[email protected]> --- tools/pounder21/fancy_timed_loop.c | 92 +++++++++++++++++++++++++++++------- tools/pounder21/infinite_loop.c | 73 +++++++++++++++++++++++----- tools/pounder21/timed_loop.c | 81 ++++++++++++++++++++++++++------ 3 files changed, 200 insertions(+), 46 deletions(-) --------------1.7.4.1 Content-Type: text/x-patch; name="0007-Changes-to-pounder-s-loop-procedures.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0007-Changes-to-pounder-s-loop-procedures.patch" diff --git a/tools/pounder21/fancy_timed_loop.c b/tools/pounder21/fancy_timed_loop.c index 35260d8..7f4deb4 100644 --- a/tools/pounder21/fancy_timed_loop.c +++ b/tools/pounder21/fancy_timed_loop.c @@ -56,12 +56,32 @@ int main(int argc, char *argv[]) { struct sigaction zig; uid_t uid; gid_t gid; + int use_max_failures = 0; + int max_failures = 0; + int fail_counter = 1; if (argc < 5) { - printf("Usage: %s time_in_sec uid gid signal command [args]\n", argv[0]); + printf("Usage: %s [-m max_failures] time_in_sec uid gid signal command [args]\n", argv[0]); exit(1); } + //by default, set max_failures to whatever the env variable $MAX_FAILURES is + char *max_failures_env = getenv("MAX_FAILURES"); + max_failures = atoi(max_failures_env); + + //if the -m option is used when calling fancy_timed_loop, override max_failures + //specified by $MAX_FAILURES with the given argument instead + if (argc > 6 && strcmp(argv[1], "-m") == 0) { + if ((max_failures = atoi(argv[2])) >= 0) { + use_max_failures = 1; + } + else { + printf("Usage: %s [-m max_failures] time_in_sec uid gid signal command [args]\n", argv[0]); + printf("max_failures should be a nonnegative integer\n"); + exit(1); + } + } + tty_fp = fdopen(3, "w+"); if (tty_fp == NULL) { tty_fp = fopen("/dev/tty", "w+"); @@ -71,11 +91,21 @@ int main(int argc, char *argv[]) { } } - progname = rindex(argv[5], '/'); - if (progname == NULL) { - progname = argv[5]; - } else { - progname++; + if (use_max_failures) { + progname = rindex(argv[7], '/'); + if (progname == NULL) { + progname = argv[7]; + } else { + progname++; + } + } + else { + progname = rindex(argv[5], '/'); + if (progname == NULL) { + progname = argv[5]; + } else { + progname++; + } } /* Set up signals */ @@ -89,12 +119,22 @@ int main(int argc, char *argv[]) { /* set up process groups so that we can kill the * loop test and descendants easily */ - secs = atoi(argv[1]); - alarm(secs); + if (use_max_failures) { + secs = atoi(argv[3]); + alarm(secs); - the_signal = atoi(argv[4]); - uid = atoi(argv[2]); - gid = atoi(argv[3]); + the_signal = atoi(argv[6]); + uid = atoi(argv[4]); + gid = atoi(argv[5]); + } + else { + secs = atoi(argv[1]); + alarm(secs); + + the_signal = atoi(argv[4]); + uid = atoi(argv[2]); + gid = atoi(argv[3]); + } pounder_fprintf(tty_fp, "%s: uid = %d, gid = %d, sig = %d\n", progname, uid, gid, the_signal); @@ -121,13 +161,24 @@ int main(int argc, char *argv[]) { } // run the program - if (argc > 3) { - stat = execvp(argv[5], &argv[5]); - } else { - stat = execvp(argv[5], &argv[5]); + if (use_max_failures) { + if (argc > 5) { + stat = execvp(argv[7], &argv[7]); + } else { + stat = execvp(argv[7], &argv[7]); + } + + perror(argv[7]); + } + else { + if (argc > 3) { + stat = execvp(argv[5], &argv[5]); + } else { + stat = execvp(argv[5], &argv[5]); + } + + perror(argv[5]); } - - perror(argv[5]); exit(-1); } @@ -158,7 +209,12 @@ int main(int argc, char *argv[]) { } else { pounder_fprintf(tty_fp, "%s: %s with code %d.\n", progname, fail_msg, res); + if (max_failures > 0) { + if (++fail_counter > max_failures) { + exit(-1); + } + } } } } -} \ No newline at end of file +} diff --git a/tools/pounder21/infinite_loop.c b/tools/pounder21/infinite_loop.c index 1c67bc8..4d151b1 100644 --- a/tools/pounder21/infinite_loop.c +++ b/tools/pounder21/infinite_loop.c @@ -46,12 +46,32 @@ int main(int argc, char *argv[]) { pid_t pid; struct sigaction zig; unsigned int revs = 0; + int use_max_failures = 0; + int max_failures = 0; + int fail_counter = 1; if (argc < 2) { - printf("Usage: %s command [args]\n", argv[0]); + printf("Usage: %s [-m max_failures] command [args]\n", argv[0]); exit(1); } + //by default, set max_failures to whatever the env variable $MAX_FAILURES is + char *max_failures_env = getenv("MAX_FAILURES"); + max_failures = atoi(max_failures_env); + + //if the -m option is used when calling infinite_loop, override max_failures + //specified by $MAX_FAILURES with the given argument instead + if (argc > 3 && strcmp(argv[1], "-m") == 0) { + if((max_failures = atoi(argv[2])) >= 0) { + use_max_failures = 1; + } + else { + printf("Usage: %s [-m max_failures] command [args]\n", argv[0]); + printf("max_failures should be a nonnegative integer\n"); + exit(1); + } + } + tty_fp = fdopen(3, "w+"); if (tty_fp == NULL) { tty_fp = fopen("/dev/tty", "w+"); @@ -61,11 +81,21 @@ int main(int argc, char *argv[]) { } } - progname = rindex(argv[1], '/'); - if (progname == NULL) { - progname = argv[1]; - } else { - progname++; + if (use_max_failures) { + progname = rindex(argv[3], '/'); + if (progname == NULL) { + progname = argv[3]; + } else { + progname++; + } + } + else { + progname = rindex(argv[1], '/'); + if (progname == NULL) { + progname = argv[1]; + } else { + progname++; + } } /* Set up signals */ @@ -86,13 +116,24 @@ int main(int argc, char *argv[]) { } // run the program - if (argc > 3) { - stat = execvp(argv[1], &argv[1]); - } else { - stat = execvp(argv[1], &argv[1]); + if (use_max_failures) { + if (argc > 5) { + stat = execvp(argv[3], &argv[3]); + } else { + stat = execvp(argv[3], &argv[3]); + } + + perror(argv[3]); + } + else { + if (argc > 3) { + stat = execvp(argv[1], &argv[1]); + } else { + stat = execvp(argv[1], &argv[1]); + } + + perror(argv[1]); } - - perror(argv[1]); exit(-1); } @@ -123,7 +164,13 @@ int main(int argc, char *argv[]) { } else { pounder_fprintf(tty_fp, "%s: %s with code %d.\n", progname, fail_msg, res); + if (max_failures > 0) { + if(++fail_counter > max_failures) { + pounder_fprintf("Reached max number of failures allowed: %d. Aborting.", max_failures); + exit(-1); + } + } } } } -} \ No newline at end of file +} diff --git a/tools/pounder21/timed_loop.c b/tools/pounder21/timed_loop.c index e2fe6a7..8e2d536 100644 --- a/tools/pounder21/timed_loop.c +++ b/tools/pounder21/timed_loop.c @@ -58,12 +58,32 @@ int main(int argc, char *argv[]) { pid_t pid; unsigned int revs = 0; struct sigaction zig; + int use_max_failures = 0; + int max_failures = 0; + int fail_counter = 1; if (argc < 3) { - printf("Usage: %s time_in_sec command [args]\n", argv[0]); + printf("Usage: %s [-m max_failures] time_in_sec command [args]\n", argv[0]); exit(1); } + //by default, set max_failures to whatever the env variable $MAX_FAILURES is + char *max_failures_env = getenv("MAX_FAILURES"); + max_failures = atoi(max_failures_env); + + //if the -m option is used when calling timed_loop, override max_failures + //specified by $MAX_FAILURES with the given argument instead + if (argc > 4 && strcmp(argv[1], "-m") == 0) { + if ((max_failures = atoi(argv[2])) >= 0) { + use_max_failures = 1; + } + else { + printf("Usage: %s [-m max_failures] time_in_sec command [args]\n", argv[0]); + printf("max_failures should be a nonnegative integer\n"); + exit(1); + } + } + tty_fp = fdopen(3, "w+"); if (tty_fp == NULL) { tty_fp = fopen("/dev/tty", "w+"); @@ -73,11 +93,21 @@ int main(int argc, char *argv[]) { } } - progname = rindex(argv[2], '/'); - if (progname == NULL) { - progname = argv[2]; - } else { - progname++; + if (use_max_failures) { + progname = rindex(argv[4], '/'); + if (progname == NULL) { + progname = argv[4]; + } else { + progname++; + } + } + else { + progname = rindex(argv[2], '/'); + if (progname == NULL) { + progname = argv[2]; + } else { + progname++; + } } /* Set up signals */ @@ -91,7 +121,12 @@ int main(int argc, char *argv[]) { /* set up process groups so that we can kill the * loop test and descendants easily */ - secs = atoi(argv[1]); + if (use_max_failures) { + secs = atoi(argv[3]); + } + else { + secs = atoi(argv[1]); + } alarm(secs); while (1) { @@ -103,13 +138,24 @@ int main(int argc, char *argv[]) { } // run the program - if (argc > 3) { - stat = execvp(argv[2], &argv[2]); - } else { - stat = execvp(argv[2], &argv[2]); + if (use_max_failures) { + if (argc > 5) { + stat = execvp(argv[4], &argv[4]); + } else { + stat = execvp(argv[4], &argv[4]); + } + + perror(argv[4]); + } + else { + if (argc > 3) { + stat = execvp(argv[2], &argv[2]); + } else { + stat = execvp(argv[2], &argv[2]); + } + + perror(argv[2]); } - - perror(argv[2]); exit(-1); } @@ -133,14 +179,19 @@ int main(int argc, char *argv[]) { if (res == 0) { pounder_fprintf(tty_fp, "%s: %s.\n", progname, pass_msg); } else if (res < 0 || res == 255) { - pounder_fprintf(tty_fp, "%s: %s with code %d.\n", + pounder_fprintf(tty_fp, "CHECK %s: %s with code %d.\n", progname, abort_msg, res); exit(-1); // FIXME: add test to blacklist } else { pounder_fprintf(tty_fp, "%s: %s with code %d.\n", progname, fail_msg, res); + if (max_failures > 0) { + if (++fail_counter > max_failures) { + exit(-1); + } + } } } } -} \ No newline at end of file +} --------------1.7.4.1-- ------------------------------------------------------------------------------ FREE DOWNLOAD - uberSVN with Social Coding for Subversion. Subversion made easy with a complete admin console. Easy to use, easy to manage, easy to install, easy to extend. Get a Free download of the new open ALM Subversion platform now. http://p.sf.net/sfu/wandisco-dev2dev _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
