Remove memory leaks in isolationtester.

specscanner.l leaked a kilobyte of memory per token of the spec file.
Apparently somebody thought that the introductory code block would be
executed once; but it's once per yylex() call.

A couple of functions in isolationtester.c leaked small amounts of
memory due to not bothering to free one-time allocations.  Might
as well improve these so that valgrind gives this program a clean
bill of health.  Also get rid of an ugly static variable.

Coverity complained about one of the one-time leaks, which led me
to try valgrind'ing isolationtester, which led to discovery of the
larger leak.

diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index 978873726e85c4564485e578fa007afc15179dc5..f25c3127463a39efa018de89f8ab3753db53e64b 100644 (file)
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -53,8 +53,8 @@ static int64 max_step_wait = 300 * USECS_PER_SEC;
 static void check_testspec(TestSpec *testspec);
 static void run_testspec(TestSpec *testspec);
 static void run_all_permutations(TestSpec *testspec);
-static void run_all_permutations_recurse(TestSpec *testspec, int nsteps,
-                                                                                PermutationStep **steps);
+static void run_all_permutations_recurse(TestSpec *testspec, int *piles,
+                                                                                int nsteps, PermutationStep **steps);
 static void run_named_permutations(TestSpec *testspec);
 static void run_permutation(TestSpec *testspec, int nsteps,
                                                        PermutationStep **steps);
@@ -365,9 +365,9 @@ check_testspec(TestSpec *testspec)
                                fprintf(stderr, "unused step name: %s\n", allsteps[i]->name);
                }
        }
-}
 
-static int *piles;
+       free(allsteps);
+}
 
 /*
  * Run the permutations specified in the spec, or all if none were
@@ -392,6 +392,7 @@ run_all_permutations(TestSpec *testspec)
        int                     i;
        PermutationStep *steps;
        PermutationStep **stepptrs;
+       int                *piles;
 
        /* Count the total number of steps in all sessions */
        nsteps = 0;
@@ -417,11 +418,16 @@ run_all_permutations(TestSpec *testspec)
        for (i = 0; i < testspec->nsessions; i++)
                piles[i] = 0;
 
-       run_all_permutations_recurse(testspec, 0, stepptrs);
+       run_all_permutations_recurse(testspec, piles, 0, stepptrs);
+
+       free(steps);
+       free(stepptrs);
+       free(piles);
 }
 
 static void
-run_all_permutations_recurse(TestSpec *testspec, int nsteps, PermutationStep **steps)
+run_all_permutations_recurse(TestSpec *testspec, int *piles,
+                                                        int nsteps, PermutationStep **steps)
 {
        int                     i;
        bool            found = false;
@@ -443,7 +449,7 @@ run_all_permutations_recurse(TestSpec *testspec, int nsteps, PermutationStep **s
 
                        piles[i]++;
 
-                       run_all_permutations_recurse(testspec, nsteps + 1, steps);
+                       run_all_permutations_recurse(testspec, piles, nsteps + 1, steps);
 
                        piles[i]--;
 

diff --git a/src/test/isolation/specscanner.l b/src/test/isolation/specscanner.l
index c4c6266d7fd9a27ed6e4109ade44a0e4963a106a..4f94714ecb897699d6f4a68f87e9a320a43d34c3 100644 (file)
--- a/src/test/isolation/specscanner.l
+++ b/src/test/isolation/specscanner.l
@@ -50,8 +50,12 @@ self                 [,()*]
 %%
 
 %{
-       litbuf = pg_malloc(LITBUF_INIT);
-       litbufsize = LITBUF_INIT;
+       /* Allocate litbuf in first call of yylex() */
+       if (litbuf == NULL)
+       {
+               litbuf = pg_malloc(LITBUF_INIT);
+               litbufsize = LITBUF_INIT;
+       }
 %}
 
  /* Keywords (must appear before the {identifier} rule!) */