add one more cycle

[tedtools.git] / memtest.c

diff --git a/memtest.c b/memtest.c
index 2cb2040..a4536d5 100644 (file)
--- a/memtest.c
+++ b/memtest.c
@@ -41,12 +41,11 @@ static void
 usage() {
        puts(
        "Usage:\n"
-       "memtest [-c COUNT [-m]]\n"
+       "memtest [-c COUNT [-t [-D]] [-s MAXSIZE] [-C COUNTCOUNT]]\n"
        );
        exit(1);
 }
 
-#define SZ     32
 
 extern char *optarg;
 extern int opterr;
@@ -54,18 +53,27 @@ extern int opterr;
 int
 main(int argn, char *argv[]) {
        MemoryContext   *base, *child;
-       int i;
-       int count=0, iscntx=0;
+       int i, SZ=32;
+       int count=0, iscntx=0, flags=0,  COUNT=1;
 
        opentlog(TL_OPEN_STDERR,TL_DEBUG, NULL);
        opterr=0;
 
-       while((i=getopt(argn,argv,"c:hm")) != EOF) {
+       while((i=getopt(argn,argv,"s:Dc:htC:")) != EOF) {
                switch(i) {
+                       case 's':
+                               SZ=atoi(optarg);
+                               break;
+                       case 'C':
+                               COUNT=atoi(optarg);
+                               break;
                        case 'c':
                                count=atoi(optarg);
                                break;
-                       case 'm':
+                       case 'D':
+                               flags=MC_DEBUG;
+                               break;
+                       case 't':
                                iscntx=1;
                                break;
                        case 'h':
@@ -79,8 +87,8 @@ main(int argn, char *argv[]) {
                char *ptr, *ptr1;
 
                /* test correctness */
-               base = allocMemoryContext(NULL, MC_DEBUG);
-               child = allocMemoryContext(base, MC_DEBUG);
+               base = allocMemoryContext(NULL, flags);
+               child = allocMemoryContext(base, flags);
 
                ptr = mcalloc(base, 30);
                for(i=0;i<26;i++)
@@ -123,7 +131,7 @@ main(int argn, char *argv[]) {
                freeMemoryContext(child);
                printf("Child: %d\n", (int)(base->child));
 
-               child = allocMemoryContext(base, MC_DEBUG);
+               child = allocMemoryContext(base, flags);
                freeMemoryContext(base);
        } else {
                struct timeval begin;   
@@ -132,7 +140,8 @@ main(int argn, char *argv[]) {
                srandom(1);
                if ( iscntx ) {
                        gettimeofday(&begin, NULL);
-                       base = allocMemoryContext(NULL, MC_DEBUG);
+                       while(COUNT-- > 0) {
+                       base = allocMemoryContext(NULL, flags);
                        for(i=0;i<count;i++) {
                                ptr = mcalloc(base, 1+random()%SZ );
                                ptr1 = mcalloc(base, 1+random()%SZ );
@@ -155,12 +164,18 @@ main(int argn, char *argv[]) {
                                        tlog(TL_CRIT|TL_EXIT,"No memory");
                                *ptr = (i+3)%256;
        
+                       }
+                       freeMemoryContext(base);
                        }
                        printf("MC elapsed: %f sec\n", elapsedtime(&begin));
 
-                       freeMemoryContext(base);
                } else {
+                       char **all, **allptr;
                        gettimeofday(&begin, NULL);
+                       while(COUNT-- > 0) {
+                       allptr=all=malloc(sizeof(char*)*count*2);
+                       if ( !all )
+                               tlog(TL_CRIT|TL_EXIT,"No memory");
                        for(i=0;i<count;i++) {
                                ptr = malloc( 1+random()%SZ );
                                ptr1 = malloc( 1+random()%SZ );
@@ -175,14 +190,22 @@ main(int argn, char *argv[]) {
                                        tlog(TL_CRIT|TL_EXIT,"No memory");
                                *ptr = (i+1)%256;
 
-                               ptr1=malloc( 1+random()%SZ );
+                               *allptr = ptr1=malloc( 1+random()%SZ );
+                               allptr++;
                                *ptr1 = (i+2)%256;
 
-                               ptr = realloc(ptr, 1+random()%SZ );
+                               *allptr = ptr = realloc(ptr, 1+random()%SZ );
+                               allptr++;
                                if ( !ptr )
                                        tlog(TL_CRIT|TL_EXIT,"No memory");
                                *ptr = (i+3)%256;
-       
+                       }
+                       allptr=all;
+                       while( allptr-all < count ) {
+                               free(*allptr);
+                               allptr++;
+                       }
+                       free(all);
                        }
                        printf("Malloc elapsed: %f sec\n", elapsedtime(&begin));
                }