database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Code review for isolationtester changes.

Browse Source 
Fix a few oversights in 38f8bdcac4:
don't leak memory in run_permutation(), remember when we've issued
a cancel rather than issuing another one every 10ms,
fix some typos in comments.
This commit is contained in:
Tom Lane
2016-02-11 11:30:46 -05:00
parent 07d25a964b
commit d9dc2b4149
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,9 +478,6 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
Step **waiting;
Step **errorstep;
waiting = malloc(sizeof(Step *) * testspec->nsessions);
errorstep = malloc(sizeof(Step *) * testspec->nsessions);
/*
* In dry run mode, just display the permutation in the same format used
* by spec files, and return.
@ -494,6 +491,9 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
return;
}
waiting = malloc(sizeof(Step *) * testspec->nsessions);
errorstep = malloc(sizeof(Step *) * testspec->nsessions);
printf("\nstarting permutation:");
for (i = 0; i < nsteps; i++)
printf(" %s", steps[i]->name);
@ -548,14 +548,15 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
* Check whether the session that needs to perform the next step
* is still blocked on an earlier step. If so, wait for it to finish.
*
* In older versions of this tool, when allowed precisely one session
* to be waiting at a time. If we reached a step which required that
* (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
* session to execute the next command, we would declare the whole
* permutation invalid, cancel everything, and move on to the next one.
* Unfortunately, that made it impossible to test the deadlock detector
* using this framework unless the numebr of processes involved in the
* deadlock was precisely two. We now assume that if we reach a step
* that is still blocked, we need to wait for it to unblock itself.
* permutation invalid, cancel everything, and move on to the next
* one. Unfortunately, that made it impossible to test the deadlock
* detector using this framework, unless the number of processes
* involved in the deadlock was precisely two. We now assume that if
* we reach a step that is still blocked, we need to wait for it to
* unblock itself.)
*/
for (w = 0; w < nwaiting; ++w)
{
@ -689,6 +690,9 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps)
}
PQclear(res);
}
free(waiting);
free(errorstep);
}
/*
@ -786,13 +790,18 @@ try_complete_step(Step *step, int flags)
if (td > 60 * USECS_PER_SEC && !canceled)
{
PGcancel *cancel = PQgetCancel(conn);
if (cancel != NULL)
{
char buf[256];
if (cancel != NULL && !PQcancel(cancel, buf, sizeof(buf)))
if (PQcancel(cancel, buf, sizeof(buf)))
canceled = true;
else
fprintf(stderr, "PQcancel failed: %s\n", buf);
if (cancel != NULL)
PQfreeCancel(cancel);
}
}
/*
* After 75 seconds, just give up and die.