add .gitignore

[tedtools.git] / memtest.c

diff --git a/memtest.c b/memtest.c
index 6f1aa09..e5bf088 100644 (file)
--- a/memtest.c
+++ b/memtest.c
@@ -41,7 +41,7 @@ static void
 usage() {
        puts(
        "Usage:\n"
-       "memtest [-c COUNT [-t [-D]] [-s MAXSIZE]]\n"
+       "memtest [-c COUNT [-t [-D]] [-s MAXSIZE] [-C COUNTCOUNT]]\n"
        );
        exit(1);
 }
@@ -54,16 +54,19 @@ int
 main(int argn, char *argv[]) {
        MemoryContext   *base, *child;
        int i, SZ=32;
-       int count=0, iscntx=0, flags=0;
+       int count=0, iscntx=0, flags=0,  COUNT=1;
 
        opentlog(TL_OPEN_STDERR,TL_DEBUG, NULL);
        opterr=0;
 
-       while((i=getopt(argn,argv,"s:Dc:ht")) != 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;
@@ -94,39 +97,39 @@ main(int argn, char *argv[]) {
                
                ptr1 = mcstrdup(base, ptr);
                strupper(ptr1); 
-               printf("lc:%s uc:%s free:%d\n", ptr, ptr1, base->chunk->freesize);
+               printf("lc:%s uc:%s free:%d\n", ptr, ptr1, (int)base->chunk->freesize);
 
                mcfree(ptr1);
-               printf("lc:%s free:%d\n", ptr, base->chunk->freesize);
+               printf("lc:%s free:%d\n", ptr, (int)base->chunk->freesize);
 
                ptr1 = mcstrdup(base, ptr);
                mcfree(ptr);
                strupper(ptr1); 
-               printf("uc:%s free:%d\n", ptr1, base->chunk->freesize);
+               printf("uc:%s free:%d\n", ptr1, (int)base->chunk->freesize);
 
                ptr= mcstrdup(base, ptr1);
                strlower(ptr);
                ptr1 =mcrealloc(ptr1, 60);
                strcat(ptr1, ptr);  
-               printf("mixed:%s free:%d\n", ptr1, base->chunk->freesize);
+               printf("mixed:%s free:%d\n", ptr1, (int)base->chunk->freesize);
 
                ptr = mcrealloc(ptr1, 59);
                tassert( ptr==ptr1 );
-               printf("mixed:%s free:%d\n", ptr, base->chunk->freesize);
+               printf("mixed:%s free:%d\n", ptr, (int)base->chunk->freesize);
 
                ptr = mcrealloc(ptr1, 120); 
                tassert( ptr==ptr1 );
-               printf("mixed:%s free:%d\n", ptr, base->chunk->freesize);
+               printf("mixed:%s free:%d\n", ptr, (int)base->chunk->freesize);
        
-               ptr = mcalloc(base, CNTXCHUNK);
-               strcpy(ptr, ptr1);
-               printf("mixed:%s free:%d freenew:%d\n", ptr1, base->chunk->freesize, base->chunk->next->freesize);
+               ptr1 = mcalloc(base, CNTXCHUNK);
+               strcpy(ptr1, ptr);
+               printf("mixed:%s free:%d freenew:%d\n", ptr1, (int)base->chunk->freesize, (int)base->chunk->next->freesize);
 
-               ptr= mcstrdup(child, ptr1);
-               printf("mixed:%s free:%d freechild:%d\n", ptr1, base->chunk->freesize, child->chunk->freesize);
+               ptr1= mcstrdup(child, ptr);
+               printf("mixed:%s free:%d freechild:%d\n", ptr1, (int)base->chunk->freesize, (int)child->chunk->freesize);
 
                freeMemoryContext(child);
-               printf("Child: %d\n", (int)(base->child));
+               printf("Child: IS %sNULL\n", (base->child == NULL) ? "" : "NOT ");
 
                child = allocMemoryContext(base, flags);
                freeMemoryContext(base);
@@ -137,6 +140,7 @@ main(int argn, char *argv[]) {
                srandom(1);
                if ( iscntx ) {
                        gettimeofday(&begin, NULL);
+                       while(COUNT-- > 0) {
                        base = allocMemoryContext(NULL, flags);
                        for(i=0;i<count;i++) {
                                ptr = mcalloc(base, 1+random()%SZ );
@@ -162,11 +166,13 @@ main(int argn, char *argv[]) {
        
                        }
                        freeMemoryContext(base);
+                       }
                        printf("MC elapsed: %f sec\n", elapsedtime(&begin));
 
                } 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");
@@ -200,6 +206,7 @@ main(int argn, char *argv[]) {
                                allptr++;
                        }
                        free(all);
+                       }
                        printf("Malloc elapsed: %f sec\n", elapsedtime(&begin));
                }