open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove now-unnecessary thread pointer arguments in pgbench.

Browse Source 
Not required after nuking the zipfian thread-local cache.

Also add a comment about hazardous pointer punning in threadRun(),
and avoid using "thread" to refer to the threads array as a whole.

Fabien Coelho and Tom Lane, per suggestion from Alvaro Herrera

Discussion: https://postgr.es/m/alpine.DEB.2.21.1904032126060.7997@lancre
pull/40/head
Tom Lane 7 years ago
parent c50b3158bf
commit d8c0bd9fef
1 changed files with 36 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 66
      src/bin/pgbench/pgbench.c

66
src/bin/pgbench/pgbench.c
Unescape View File

@ -575,10 +575,9 @@ static void setNullValue(PgBenchValue *pv);
static void setBoolValue(PgBenchValue *pv, bool bval); static void setBoolValue(PgBenchValue *pv, bool bval);
static void setIntValue(PgBenchValue *pv, int64 ival); static void setIntValue(PgBenchValue *pv, int64 ival);
static void setDoubleValue(PgBenchValue *pv, double dval); static void setDoubleValue(PgBenchValue *pv, double dval);
static bool evaluateExpr(TState *thread, CState *st, PgBenchExpr *expr, static bool evaluateExpr(CState *st, PgBenchExpr *expr,
PgBenchValue *retval); PgBenchValue *retval);
static ConnectionStateEnum executeMetaCommand(TState *thread, CState *st, static ConnectionStateEnum executeMetaCommand(CState *st, instr_time *now);
instr_time *now);
static void doLog(TState *thread, CState *st, static void doLog(TState *thread, CState *st,
StatsData *agg, bool skipped, double latency, double lag); StatsData *agg, bool skipped, double latency, double lag);
static void processXactStats(TState *thread, CState *st, instr_time *now, static void processXactStats(TState *thread, CState *st, instr_time *now,
@ -1744,7 +1743,7 @@ isLazyFunc(PgBenchFunction func)
/* lazy evaluation of some functions */ /* lazy evaluation of some functions */
static bool static bool
evalLazyFunc(TState *thread, CState *st, evalLazyFunc(CState *st,
PgBenchFunction func, PgBenchExprLink *args, PgBenchValue *retval) PgBenchFunction func, PgBenchExprLink *args, PgBenchValue *retval)
{ {
PgBenchValue a1, PgBenchValue a1,
@ -1755,7 +1754,7 @@ evalLazyFunc(TState *thread, CState *st,
Assert(isLazyFunc(func) && args != NULL && args->next != NULL); Assert(isLazyFunc(func) && args != NULL && args->next != NULL);
/* args points to first condition */ /* args points to first condition */
if (!evaluateExpr(thread, st, args->expr, &a1)) if (!evaluateExpr(st, args->expr, &a1))
return false; return false;
/* second condition for AND/OR and corresponding branch for CASE */ /* second condition for AND/OR and corresponding branch for CASE */
@ -1779,7 +1778,7 @@ evalLazyFunc(TState *thread, CState *st,
return true; return true;
} }
if (!evaluateExpr(thread, st, args->expr, &a2)) if (!evaluateExpr(st, args->expr, &a2))
return false; return false;
if (a2.type == PGBT_NULL) if (a2.type == PGBT_NULL)
@ -1814,7 +1813,7 @@ evalLazyFunc(TState *thread, CState *st,
return true; return true;
} }
if (!evaluateExpr(thread, st, args->expr, &a2)) if (!evaluateExpr(st, args->expr, &a2))
return false; return false;
if (a2.type == PGBT_NULL) if (a2.type == PGBT_NULL)
@ -1833,17 +1832,17 @@ evalLazyFunc(TState *thread, CState *st,
case PGBENCH_CASE: case PGBENCH_CASE:
/* when true, execute branch */ /* when true, execute branch */
if (valueTruth(&a1)) if (valueTruth(&a1))
return evaluateExpr(thread, st, args->expr, retval); return evaluateExpr(st, args->expr, retval);
/* now args contains next condition or final else expression */ /* now args contains next condition or final else expression */
args = args->next; args = args->next;
/* final else case? */ /* final else case? */
if (args->next == NULL) if (args->next == NULL)
return evaluateExpr(thread, st, args->expr, retval); return evaluateExpr(st, args->expr, retval);
/* no, another when, proceed */ /* no, another when, proceed */
return evalLazyFunc(thread, st, PGBENCH_CASE, args, retval); return evalLazyFunc(st, PGBENCH_CASE, args, retval);
default: default:
/* internal error, cannot get here */ /* internal error, cannot get here */
@ -1861,7 +1860,7 @@ evalLazyFunc(TState *thread, CState *st,
* which do not require lazy evaluation. * which do not require lazy evaluation.
*/ */
static bool static bool
evalStandardFunc(TState *thread, CState *st, evalStandardFunc(CState *st,
PgBenchFunction func, PgBenchExprLink *args, PgBenchFunction func, PgBenchExprLink *args,
PgBenchValue *retval) PgBenchValue *retval)
{ {
@ -1873,7 +1872,7 @@ evalStandardFunc(TState *thread, CState *st,
for (nargs = 0; nargs < MAX_FARGS && l != NULL; nargs++, l = l->next) for (nargs = 0; nargs < MAX_FARGS && l != NULL; nargs++, l = l->next)
{ {
if (!evaluateExpr(thread, st, l->expr, &vargs[nargs])) if (!evaluateExpr(st, l->expr, &vargs[nargs]))
return false; return false;
has_null |= vargs[nargs].type == PGBT_NULL; has_null |= vargs[nargs].type == PGBT_NULL;
} }
@ -2408,13 +2407,13 @@ evalStandardFunc(TState *thread, CState *st,
/* evaluate some function */ /* evaluate some function */
static bool static bool
evalFunc(TState *thread, CState *st, evalFunc(CState *st,
PgBenchFunction func, PgBenchExprLink *args, PgBenchValue *retval) PgBenchFunction func, PgBenchExprLink *args, PgBenchValue *retval)
{ {
if (isLazyFunc(func)) if (isLazyFunc(func))
return evalLazyFunc(thread, st, func, args, retval); return evalLazyFunc(st, func, args, retval);
else else
return evalStandardFunc(thread, st, func, args, retval); return evalStandardFunc(st, func, args, retval);
} }
/* /*
@ -2424,7 +2423,7 @@ evalFunc(TState *thread, CState *st,
* the value itself is returned through the retval pointer. * the value itself is returned through the retval pointer.
*/ */
static bool static bool
evaluateExpr(TState *thread, CState *st, PgBenchExpr *expr, PgBenchValue *retval) evaluateExpr(CState *st, PgBenchExpr *expr, PgBenchValue *retval)
{ {
switch (expr->etype) switch (expr->etype)
{ {
@ -2453,7 +2452,7 @@ evaluateExpr(TState *thread, CState *st, PgBenchExpr *expr, PgBenchValue *retval
} }
case ENODE_FUNCTION: case ENODE_FUNCTION:
return evalFunc(thread, st, return evalFunc(st,
expr->u.function.function, expr->u.function.function,
expr->u.function.args, expr->u.function.args,
retval); retval);
@ -3072,7 +3071,7 @@ advanceConnectionState(TState *thread, CState *st, StatsData *agg)
* - on sleep CSTATE_SLEEP * - on sleep CSTATE_SLEEP
* - else CSTATE_END_COMMAND * - else CSTATE_END_COMMAND
*/ */
st->state = executeMetaCommand(thread, st, &now); st->state = executeMetaCommand(st, &now);
} }
/* /*
@ -3304,7 +3303,7 @@ advanceConnectionState(TState *thread, CState *st, StatsData *agg)
* take no time to execute. * take no time to execute.
*/ */
static ConnectionStateEnum static ConnectionStateEnum
executeMetaCommand(TState *thread, CState *st, instr_time *now) executeMetaCommand(CState *st, instr_time *now)
{ {
Command *command = sql_script[st->use_file].commands[st->command]; Command *command = sql_script[st->use_file].commands[st->command];
int argc; int argc;
@ -3348,7 +3347,7 @@ executeMetaCommand(TState *thread, CState *st, instr_time *now)
PgBenchExpr *expr = command->expr; PgBenchExpr *expr = command->expr;
PgBenchValue result; PgBenchValue result;
if (!evaluateExpr(thread, st, expr, &result)) if (!evaluateExpr(st, expr, &result))
{ {
commandFailed(st, argv[0], "evaluation of meta-command failed"); commandFailed(st, argv[0], "evaluation of meta-command failed");
return CSTATE_ABORTED; return CSTATE_ABORTED;
@ -3367,7 +3366,7 @@ executeMetaCommand(TState *thread, CState *st, instr_time *now)
PgBenchValue result; PgBenchValue result;
bool cond; bool cond;
if (!evaluateExpr(thread, st, expr, &result)) if (!evaluateExpr(st, expr, &result))
{ {
commandFailed(st, argv[0], "evaluation of meta-command failed"); commandFailed(st, argv[0], "evaluation of meta-command failed");
return CSTATE_ABORTED; return CSTATE_ABORTED;
@ -3390,7 +3389,7 @@ executeMetaCommand(TState *thread, CState *st, instr_time *now)
return CSTATE_END_COMMAND; return CSTATE_END_COMMAND;
} }
if (!evaluateExpr(thread, st, expr, &result)) if (!evaluateExpr(st, expr, &result))
{ {
commandFailed(st, argv[0], "evaluation of meta-command failed"); commandFailed(st, argv[0], "evaluation of meta-command failed");
return CSTATE_ABORTED; return CSTATE_ABORTED;
@ -4773,7 +4772,7 @@ addScript(ParsedScript script)
* progress report. On exit, they are updated with the new stats. * progress report. On exit, they are updated with the new stats.
*/ */
static void static void
printProgressReport(TState *thread, int64 test_start, int64 now, printProgressReport(TState *threads, int64 test_start, int64 now,
StatsData *last, int64 *last_report) StatsData *last, int64 *last_report)
{ {
/* generate and show report */ /* generate and show report */
@ -4801,10 +4800,10 @@ printProgressReport(TState *thread, int64 test_start, int64 now,
initStats(&cur, 0); initStats(&cur, 0);
for (int i = 0; i < nthreads; i++) for (int i = 0; i < nthreads; i++)
{ {
mergeSimpleStats(&cur.latency, &thread[i].stats.latency); mergeSimpleStats(&cur.latency, &threads[i].stats.latency);
mergeSimpleStats(&cur.lag, &thread[i].stats.lag); mergeSimpleStats(&cur.lag, &threads[i].stats.lag);
cur.cnt += thread[i].stats.cnt; cur.cnt += threads[i].stats.cnt;
cur.skipped += thread[i].stats.skipped; cur.skipped += threads[i].stats.skipped;
} }
/* we count only actually executed transactions */ /* we count only actually executed transactions */
@ -4874,7 +4873,7 @@ printSimpleStats(const char *prefix, SimpleStats *ss)
/* print out results */ /* print out results */
static void static void
printResults(TState *threads, StatsData *total, instr_time total_time, printResults(StatsData *total, instr_time total_time,
instr_time conn_total_time, int64 latency_late) instr_time conn_total_time, int64 latency_late)
{ {
double time_include, double time_include,
@ -5887,7 +5886,7 @@ main(int argc, char **argv)
*/ */
INSTR_TIME_SET_CURRENT(total_time); INSTR_TIME_SET_CURRENT(total_time);
INSTR_TIME_SUBTRACT(total_time, start_time); INSTR_TIME_SUBTRACT(total_time, start_time);
printResults(threads, &stats, total_time, conn_total_time, latency_late); printResults(&stats, total_time, conn_total_time, latency_late);
if (exit_code != 0) if (exit_code != 0)
fprintf(stderr, "Run was aborted; the above results are incomplete.\n"); fprintf(stderr, "Run was aborted; the above results are incomplete.\n");
@ -6146,7 +6145,14 @@ threadRun(void *arg)
now = INSTR_TIME_GET_MICROSEC(now_time); now = INSTR_TIME_GET_MICROSEC(now_time);
if (now >= next_report) if (now >= next_report)
{ {
printProgressReport(thread, thread_start, now, &last, &last_report); /*
* Horrible hack: this relies on the thread pointer we are
* passed to be equivalent to threads[0], that is the first
* entry of the threads array. That is why this MUST be done
* by thread 0 and not any other.
*/
printProgressReport(thread, thread_start, now,
&last, &last_report);
/* /*
* Ensure that the next report is in the future, in case * Ensure that the next report is in the future, in case

Write Preview
Loading…
Cancel
Save