From: bdemsky Date: Wed, 3 Sep 2008 23:13:33 +0000 (+0000) Subject: make tabbing changes X-Git-Tag: buildscript^6~49 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6f567fe9f9b709c72eb7f86df51778a42d7d5d3b;p=IRC.git make tabbing changes --- diff --git a/Robust/src/Runtime/chash.c b/Robust/src/Runtime/chash.c index 6c98d94f..924c14f4 100644 --- a/Robust/src/Runtime/chash.c +++ b/Robust/src/Runtime/chash.c @@ -130,7 +130,7 @@ unsigned int cResize(ctable_t *table, unsigned int newsize) { cnode_t * next = curr->next; int index =(curr->key & mask)>>2; cnode_t * newnode=&ntable[index]; - + if(newnode->key==0) { newnode->key=curr->key; newnode->val=curr->val; @@ -144,7 +144,7 @@ unsigned int cResize(ctable_t *table, unsigned int newsize) { tmp->val=curr->val; tmp->lnext=last; last=tmp; - } + } if (isfirst) { isfirst=0; } else { diff --git a/Robust/src/Runtime/chash.h b/Robust/src/Runtime/chash.h index f21f3c94..23a44247 100644 --- a/Robust/src/Runtime/chash.h +++ b/Robust/src/Runtime/chash.h @@ -20,7 +20,7 @@ typedef struct ctable { unsigned int numelements; unsigned int resize; float loadfactor; - struct cnode *listhead; + struct cnode *listhead; } ctable_t; /* Prototypes for hash*/ diff --git a/Robust/src/Runtime/checkpoint.c b/Robust/src/Runtime/checkpoint.c index 5585699a..78d662d3 100644 --- a/Robust/src/Runtime/checkpoint.c +++ b/Robust/src/Runtime/checkpoint.c @@ -67,10 +67,10 @@ void checkvalid(void * ptr) { } /* -void validitycheck(struct ctable *forward, struct ctable *reverse) { - struct RuntimeIterator rit; - RuntimeHashiterator(forward, &rit); - while(RunhasNext(&rit)) { + void validitycheck(struct ctable *forward, struct ctable *reverse) { + struct RuntimeIterator rit; + RuntimeHashiterator(forward, &rit); + while(RunhasNext(&rit)) { struct ___Object___ * data=(struct ___Object___*) Runnext(&rit); int type=data->type; unsigned int * pointer=pointerarray[type]; @@ -79,20 +79,20 @@ void validitycheck(struct ctable *forward, struct ctable *reverse) { if (pointer!=0&&((int)pointer)!=1) { size=pointer[0]; for(i=1; i<=size; i++) { - int offset=pointer[i]; - void * ptr=*(void **)(((int) data) + offset); - if (ptr!=NULL&&!RuntimeHashcontainskey(reverse, (int) ptr)) { -#ifndef RAW - printf("Bad\n"); -#endif - } - checkvalid(ptr); + int offset=pointer[i]; + void * ptr=*(void **)(((int) data) + offset); + if (ptr!=NULL&&!RuntimeHashcontainskey(reverse, (int) ptr)) { + #ifndef RAW + printf("Bad\n"); + #endif + } + checkvalid(ptr); } } - } + } - RuntimeHashiterator(reverse, &rit); - while(RunhasNext(&rit)) { + RuntimeHashiterator(reverse, &rit); + while(RunhasNext(&rit)) { struct ___Object___ * data=(struct ___Object___*) Runkey(&rit); int type=0; unsigned int * pointer=NULL; @@ -104,19 +104,19 @@ void validitycheck(struct ctable *forward, struct ctable *reverse) { if (pointer!=0&&((int)pointer)!=1) { size=pointer[0]; for(i=1; i<=size; i++) { - int offset=pointer[i]; - void * ptr=*(void **)(((int) data) + offset); - if (ptr!=NULL&&!RuntimeHashcontainskey(reverse, (int) ptr)) { -#ifndef RAW - printf("Bad2\n"); -#endif - } - checkvalid(ptr); + int offset=pointer[i]; + void * ptr=*(void **)(((int) data) + offset); + if (ptr!=NULL&&!RuntimeHashcontainskey(reverse, (int) ptr)) { + #ifndef RAW + printf("Bad2\n"); + #endif + } + checkvalid(ptr); } } - } -} -*/ + } + } + */ void ** makecheckpoint(int numparams, void ** srcpointer, struct ctable * forward, struct ctable * reverse) { @@ -163,9 +163,9 @@ void ** makecheckpoint(int numparams, void ** srcpointer, struct ctable * forwar ((struct ___TagDescriptor___*)cpy)->flagptr=copy; } else { ((struct ___TagDescriptor___*) cpy)->flagptr=dst; + } } - } - } else + } else #endif if (pointer==0) { /* Array of primitives */ diff --git a/Robust/src/Runtime/multicoretask.c b/Robust/src/Runtime/multicoretask.c index f39473bb..df467696 100644 --- a/Robust/src/Runtime/multicoretask.c +++ b/Robust/src/Runtime/multicoretask.c @@ -3404,7 +3404,7 @@ parameterpresent: }*/ /* Actually call task */ #ifdef PRECISE_GC - ((int *)taskpointerarray)[0]=currtpd->numParameters; + ((int *)taskpointerarray)[0]=currtpd->numParameters; taskpointerarray[1]=NULL; #endif execute: diff --git a/Robust/src/Runtime/task.c b/Robust/src/Runtime/task.c index 53861273..e5477132 100644 --- a/Robust/src/Runtime/task.c +++ b/Robust/src/Runtime/task.c @@ -1200,7 +1200,7 @@ parameterpresent: } /* Actually call task */ #ifdef PRECISE_GC - ((int *)taskpointerarray)[0]=currtpd->numParameters; + ((int *)taskpointerarray)[0]=currtpd->numParameters; taskpointerarray[1]=NULL; #endif #ifdef OPTIONAL