From: bdemsky Date: Wed, 24 Jun 2009 05:56:52 +0000 (+0000) Subject: changes X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b6924fd0af21b1013d036eb6e01fe7a25da47e8;p=IRC.git changes --- diff --git a/Robust/src/Runtime/STM/stm.c b/Robust/src/Runtime/STM/stm.c index fb35ff39..8e256116 100644 --- a/Robust/src/Runtime/STM/stm.c +++ b/Robust/src/Runtime/STM/stm.c @@ -312,10 +312,17 @@ int transCommit() { do { /* Look through all the objects in the transaction hash table */ int finalResponse; +#ifdef DELAYCOMP if (c_numelements<(c_size>>3)) finalResponse= alttraverseCache(commitmethod, primitives, locals, params); else finalResponse= traverseCache(commitmethod, primitives, locals, params); +#else + if (c_numelements<(c_size>>3)) + finalResponse= alttraverseCache(); + else + finalResponse= traverseCache(); +#endif if(finalResponse == TRANS_ABORT) { #ifdef TRANSSTATS numTransAbort++; @@ -1063,7 +1070,11 @@ void transAbortProcess(void **oidwrlocked, int numoidwrlocked) { #endif /* Release write locks */ +#ifdef DELAYCOMP for(i=numoidwrtotal-1; i>=0; i--) { +#else + for(i=numoidwrlocked-1; i>=0; i--) { +#endif header = (objheader_t *)oidwrlocked[i]; write_unlock(&header->lock); }