From 6c2219db1cbbb20f7dc02829922a4bb97cc3cd6b Mon Sep 17 00:00:00 2001 From: stephey Date: Thu, 27 Jan 2011 23:39:33 +0000 Subject: [PATCH] Removed vestigial code left over from "waiting queues". Scratch previous comment about removing the need to coalesce weakly connected groups. --- Robust/src/IR/Flat/RuntimeConflictResolver.java | 9 ++++----- Robust/src/Runtime/oooJava/hashStructure.c | 6 +----- Robust/src/Runtime/oooJava/hashStructure.h | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Robust/src/IR/Flat/RuntimeConflictResolver.java b/Robust/src/IR/Flat/RuntimeConflictResolver.java index 324c482c..32b216e7 100644 --- a/Robust/src/IR/Flat/RuntimeConflictResolver.java +++ b/Robust/src/IR/Flat/RuntimeConflictResolver.java @@ -80,7 +80,7 @@ public class RuntimeConflictResolver { * 2a) Use Effects to verify we can access something (reads) * 2b) Use conflicts to mark conflicts (read/write/strongupdate) * 2c) At second level of hash, store Heaproots that can cause conflicts at the field - * 3) Walk hash structure to identify and enumerate weakly connected groups and generate waiting queue slots. + * 3) Walk hash structure to identify and enumerate weakly connected groups * 4) Build internal representation of the rgs (pruned) * 5) Print c methods by walking internal representation */ @@ -474,9 +474,7 @@ public class RuntimeConflictResolver { //Prints out the master traverser Invocation that'll call all other traversers //based on traverserID - printMasterTraverserInvocation(); - printResumeTraverserInvocation(); - + printMasterTraverserInvocation(); createMasterHashTableArray(); // Adds Extra supporting methods @@ -570,6 +568,7 @@ public class RuntimeConflictResolver { } + //Currently UNUSED method but may be useful in the future. //This will print the traverser invocation that takes in a traverserID and starting ptr private void printResumeTraverserInvocation() { headerFile.println("\nint traverse(void * startingPtr, SESEcommon * record, int traverserID);"); @@ -699,7 +698,7 @@ public class RuntimeConflictResolver { /* * addChecker creates a case statement for every object that is an inset variable, has more - * than 1 parent && has conflicts, or where resumes are possible (from waiting queue). + * than 1 parent && has conflicts, or where resumes are possible * See .qualifiesForCaseStatement */ private void addChecker(Taint taint, diff --git a/Robust/src/Runtime/oooJava/hashStructure.c b/Robust/src/Runtime/oooJava/hashStructure.c index 36876afe..d49a4f92 100644 --- a/Robust/src/Runtime/oooJava/hashStructure.c +++ b/Robust/src/Runtime/oooJava/hashStructure.c @@ -5,9 +5,6 @@ #include "mem.h" #include "classdefs.h" - -//NOTE: this is only temporary (for testing) and will be removed in favor of thread local variables -//It's basically an array of hashStructures so we can simulate what would happen in a many-threaded version __thread HashStructure ** allHashStructures; #define ISWRITEBIN(x) (x&BINMASK) #define ISREADBIN(x) (!(x&BINMASK)) @@ -38,12 +35,11 @@ inline enqueuerecord(struct rcrRecord *rcrrec, int tmpkey, BinItem_rcr *item) { } } -//NOTE: only temporary HashStructure ** rcr_createMasterHashTableArray(int maxSize){ return (HashStructure **) malloc(sizeof(HashStructure *) * maxSize); } -HashStructure* rcr_createHashtable(int sizeofWaitingQueue){ +HashStructure* rcr_createHashtable(){ int i=0; HashStructure* newTable=(HashStructure*)RUNMALLOC(sizeof(HashStructure)); for(i=0;i