database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-23 14:01:44 +03:00
Code Activity

Add per-test-script runtime display to pg_regress.

Browse Source 
It seems useful to have this information available, so that it's
easier to tell when a test script is taking a disproportionate
amount of time.

Discussion: https://postgr.es/m/16646.1549770618@sss.pgh.pa.us
This commit is contained in:
Tom Lane
2019-02-10 16:54:31 -05:00
parent cb90de1aac
commit 72d71e0356
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/test/regress/pg_regress.c
View File

@ -36,6 +36,7 @@
#include "getopt_long.h" #include "getopt_long.h"
#include "libpq/pqcomm.h" /* needed for UNIXSOCK_PATH() */ #include "libpq/pqcomm.h" /* needed for UNIXSOCK_PATH() */
#include "pg_config_paths.h" #include "pg_config_paths.h"
#include "portability/instr_time.h"
/* for resultmap we need a list of pairs of strings */ /* for resultmap we need a list of pairs of strings */
typedef struct _resultmap typedef struct _resultmap
@ -1473,14 +1474,15 @@ results_differ(const char *testname, const char *resultsfile, const char *defaul
/* /*
* Wait for specified subprocesses to finish, and return their exit * Wait for specified subprocesses to finish, and return their exit
* statuses into statuses[] * statuses into statuses[] and stop times into stoptimes[]
* *
* If names isn't NULL, print each subprocess's name as it finishes * If names isn't NULL, print each subprocess's name as it finishes
* *
* Note: it's OK to scribble on the pids array, but not on the names array * Note: it's OK to scribble on the pids array, but not on the names array
*/ */
static void static void
wait_for_tests(PID_TYPE * pids, int *statuses, char **names, int num_tests) wait_for_tests(PID_TYPE * pids, int *statuses, instr_time *stoptimes,
char **names, int num_tests)
{ {
int tests_left; int tests_left;
int i; int i;
@ -1533,6 +1535,7 @@ wait_for_tests(PID_TYPE * pids, int *statuses, char **names, int num_tests)
#endif #endif
pids[i] = INVALID_PID; pids[i] = INVALID_PID;
statuses[i] = (int) exit_status; statuses[i] = (int) exit_status;
INSTR_TIME_SET_CURRENT(stoptimes[i]);
if (names) if (names)
status(" %s", names[i]); status(" %s", names[i]);
tests_left--; tests_left--;
@ -1582,6 +1585,8 @@ run_schedule(const char *schedule, test_function tfunc)
_stringlist *expectfiles[MAX_PARALLEL_TESTS]; _stringlist *expectfiles[MAX_PARALLEL_TESTS];
_stringlist *tags[MAX_PARALLEL_TESTS]; _stringlist *tags[MAX_PARALLEL_TESTS];
PID_TYPE pids[MAX_PARALLEL_TESTS]; PID_TYPE pids[MAX_PARALLEL_TESTS];
instr_time starttimes[MAX_PARALLEL_TESTS];
instr_time stoptimes[MAX_PARALLEL_TESTS];
int statuses[MAX_PARALLEL_TESTS]; int statuses[MAX_PARALLEL_TESTS];
_stringlist *ignorelist = NULL; _stringlist *ignorelist = NULL;
char scbuf[1024]; char scbuf[1024];
@ -1687,7 +1692,8 @@ run_schedule(const char *schedule, test_function tfunc)
{ {
status(_("test %-28s ... "), tests[0]); status(_("test %-28s ... "), tests[0]);
pids[0] = (tfunc) (tests[0], &resultfiles[0], &expectfiles[0], &tags[0]); pids[0] = (tfunc) (tests[0], &resultfiles[0], &expectfiles[0], &tags[0]);
wait_for_tests(pids, statuses, NULL, 1); INSTR_TIME_SET_CURRENT(starttimes[0]);
wait_for_tests(pids, statuses, stoptimes, NULL, 1);
/* status line is finished below */ /* status line is finished below */
} }
else if (max_concurrent_tests > 0 && max_concurrent_tests < num_tests) else if (max_concurrent_tests > 0 && max_concurrent_tests < num_tests)
@ -1707,12 +1713,15 @@ run_schedule(const char *schedule, test_function tfunc)
if (i - oldest >= max_connections) if (i - oldest >= max_connections)
{ {
wait_for_tests(pids + oldest, statuses + oldest, wait_for_tests(pids + oldest, statuses + oldest,
stoptimes + oldest,
tests + oldest, i - oldest); tests + oldest, i - oldest);
oldest = i; oldest = i;
} }
pids[i] = (tfunc) (tests[i], &resultfiles[i], &expectfiles[i], &tags[i]); pids[i] = (tfunc) (tests[i], &resultfiles[i], &expectfiles[i], &tags[i]);
INSTR_TIME_SET_CURRENT(starttimes[i]);
} }
wait_for_tests(pids + oldest, statuses + oldest, wait_for_tests(pids + oldest, statuses + oldest,
stoptimes + oldest,
tests + oldest, i - oldest); tests + oldest, i - oldest);
status_end(); status_end();
} }
@ -1722,8 +1731,9 @@ run_schedule(const char *schedule, test_function tfunc)
for (i = 0; i < num_tests; i++) for (i = 0; i < num_tests; i++)
{ {
pids[i] = (tfunc) (tests[i], &resultfiles[i], &expectfiles[i], &tags[i]); pids[i] = (tfunc) (tests[i], &resultfiles[i], &expectfiles[i], &tags[i]);
INSTR_TIME_SET_CURRENT(starttimes[i]);
} }
wait_for_tests(pids, statuses, tests, num_tests); wait_for_tests(pids, statuses, stoptimes, tests, num_tests);
status_end(); status_end();
} }
@ -1793,6 +1803,9 @@ run_schedule(const char *schedule, test_function tfunc)
if (statuses[i] != 0) if (statuses[i] != 0)
log_child_failure(statuses[i]); log_child_failure(statuses[i]);
INSTR_TIME_SUBTRACT(stoptimes[i], starttimes[i]);
status(_(" (%.0f ms)"), INSTR_TIME_GET_MILLISEC(stoptimes[i]));
status_end(); status_end();
} }
@ -1818,6 +1831,8 @@ static void
run_single_test(const char *test, test_function tfunc) run_single_test(const char *test, test_function tfunc)
{ {
PID_TYPE pid; PID_TYPE pid;
instr_time starttime;
instr_time stoptime;
int exit_status; int exit_status;
_stringlist *resultfiles = NULL; _stringlist *resultfiles = NULL;
_stringlist *expectfiles = NULL; _stringlist *expectfiles = NULL;
@ -1829,7 +1844,8 @@ run_single_test(const char *test, test_function tfunc)
status(_("test %-28s ... "), test); status(_("test %-28s ... "), test);
pid = (tfunc) (test, &resultfiles, &expectfiles, &tags); pid = (tfunc) (test, &resultfiles, &expectfiles, &tags);
wait_for_tests(&pid, &exit_status, NULL, 1); INSTR_TIME_SET_CURRENT(starttime);
wait_for_tests(&pid, &exit_status, &stoptime, NULL, 1);
/* /*
* Advance over all three lists simultaneously. * Advance over all three lists simultaneously.
@ -1867,6 +1883,9 @@ run_single_test(const char *test, test_function tfunc)
if (exit_status != 0) if (exit_status != 0)
log_child_failure(exit_status); log_child_failure(exit_status);
INSTR_TIME_SUBTRACT(stoptime, starttime);
status(_(" (%.0f ms)"), INSTR_TIME_GET_MILLISEC(stoptime));
status_end(); status_end();
} }