rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-pgindent isolationtester.c. 

Need to do some more hacking on this, and got annoyed that it's not
indent clean.
This commit is contained in:
Tom Lane 2016-02-12 13:36:13 -05:00
parent 29b4b7bda6
commit a361490806
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/test/isolation/isolationtester.c
View File

@ -429,7 +429,7 @@ static void
report_multiple_error_messages(Step *step, int nextra, Step **extrastep) report_multiple_error_messages(Step *step, int nextra, Step **extrastep)
{ {
PQExpBufferData buffer; PQExpBufferData buffer;
int n; int n;
if (nextra == 0) if (nextra == 0)
{ {
@ -475,8 +475,8 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
int w; int w;
int nwaiting = 0; int nwaiting = 0;
int nerrorstep = 0; int nerrorstep = 0;
Step **waiting; Step **waiting;
Step **errorstep; Step **errorstep;
/* /*
* In dry run mode, just display the permutation in the same format used * In dry run mode, just display the permutation in the same format used
@ -540,13 +540,13 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
for (i = 0; i < nsteps; i++) for (i = 0; i < nsteps; i++)
{ {
Step *step = steps[i]; Step *step = steps[i];
Step *oldstep = NULL; Step *oldstep = NULL;
PGconn *conn = conns[1 + step->session]; PGconn *conn = conns[1 + step->session];
bool mustwait; bool mustwait;
/* /*
* Check whether the session that needs to perform the next step * Check whether the session that needs to perform the next step is
* is still blocked on an earlier step. If so, wait for it to finish. * still blocked on an earlier step. If so, wait for it to finish.
* *
* (In older versions of this tool, we allowed precisely one session * (In older versions of this tool, we allowed precisely one session
* to be waiting at a time. If we reached a step that required that * to be waiting at a time. If we reached a step that required that
@ -762,7 +762,7 @@ try_complete_step(Step *step, int flags)
ntuples = PQntuples(res); ntuples = PQntuples(res);
PQclear(res); PQclear(res);
if (ntuples >= 1) /* waiting to acquire a lock */ if (ntuples >= 1) /* waiting to acquire a lock */
{ {
if (!(flags & STEP_RETRY)) if (!(flags & STEP_RETRY))
printf("step %s: %s <waiting ...>\n", printf("step %s: %s <waiting ...>\n",
@ -781,19 +781,19 @@ try_complete_step(Step *step, int flags)
/* /*
* After 60 seconds, try to cancel the query. * After 60 seconds, try to cancel the query.
* *
* If the user tries to test an invalid permutation, we don't * If the user tries to test an invalid permutation, we don't want
* want to hang forever, especially when this is running in the * to hang forever, especially when this is running in the
* buildfarm. So try to cancel it after a minute. This will * buildfarm. So try to cancel it after a minute. This will
* presumably lead to this permutation failing, but remaining * presumably lead to this permutation failing, but remaining
* permutations and tests should still be OK. * permutations and tests should still be OK.
*/ */
if (td > 60 * USECS_PER_SEC && !canceled) if (td > 60 * USECS_PER_SEC && !canceled)
{ {
PGcancel *cancel = PQgetCancel(conn); PGcancel *cancel = PQgetCancel(conn);
if (cancel != NULL) if (cancel != NULL)
{ {
char buf[256]; char buf[256];
if (PQcancel(cancel, buf, sizeof(buf))) if (PQcancel(cancel, buf, sizeof(buf)))
canceled = true; canceled = true;