From: bdemsky <bdemsky>
Date: Fri, 17 Aug 2007 01:16:36 +0000 (+0000)
Subject: add another field
X-Git-Tag: preEdgeChange~468
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aad89d07ec9f5d0e5cca0a91af7f11a1fd8254c4;p=IRC.git

add another field
---

diff --git a/Robust/src/Runtime/ObjectHash.c b/Robust/src/Runtime/ObjectHash.c
new file mode 100755
index 00000000..de85a533
--- /dev/null
+++ b/Robust/src/Runtime/ObjectHash.c
@@ -0,0 +1,260 @@
+#include "ObjectHash.h"
+#include <stdio.h>
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
+/* SIMPLE HASH ********************************************************/
+struct ObjectIterator* ObjectHashcreateiterator(struct ObjectHash * thisvar) {
+    return allocateObjectIterator(thisvar->listhead);
+}
+
+void ObjectHashiterator(struct ObjectHash *thisvar, struct ObjectIterator * it) {
+  it->cur=thisvar->listhead;
+}
+
+struct ObjectHash * noargallocateObjectHash() {
+    return allocateObjectHash(100);
+}
+
+struct ObjectHash * allocateObjectHash(int size) {
+    struct ObjectHash *thisvar=(struct ObjectHash *)RUNMALLOC(sizeof(struct ObjectHash));
+    if (size <= 0) {
+        printf("Negative Hashtable size Exception\n");
+        exit(-1);
+    }
+    thisvar->size = size;
+    thisvar->bucket = (struct ObjectNode **) RUNMALLOC(sizeof(struct ObjectNode *)*size);
+    /* Set allocation blocks*/
+    thisvar->listhead=NULL;
+    thisvar->listtail=NULL;
+    /*Set data counts*/
+    thisvar->numelements = 0;
+    return thisvar;
+}
+
+void freeObjectHash(struct ObjectHash *thisvar) {
+    struct ObjectNode *ptr=thisvar->listhead;
+    RUNFREE(thisvar->bucket);
+    while(ptr) {
+        struct ObjectNode *next=ptr->lnext;
+        RUNFREE(ptr);
+        ptr=next;
+    }
+    RUNFREE(thisvar);
+}
+
+inline int ObjectHashcountset(struct ObjectHash * thisvar) {
+    return thisvar->numelements;
+}
+
+int ObjectHashfirstkey(struct ObjectHash *thisvar) {
+  struct ObjectNode *ptr=thisvar->listhead;
+  return ptr->key;
+}
+
+int ObjectHashremove(struct ObjectHash *thisvar, int key) {
+    unsigned int hashkey = (unsigned int)key % thisvar->size;
+
+    struct ObjectNode **ptr = &thisvar->bucket[hashkey];
+    int i;
+
+    while (*ptr) {
+      if ((*ptr)->key == key) {
+	  struct ObjectNode *toremove=*ptr;
+	  *ptr=(*ptr)->next;
+
+	  if (toremove->lprev!=NULL)
+	    toremove->lprev->lnext=toremove->lnext;
+	  else
+	    thisvar->listhead=toremove->lnext;
+	  if (toremove->lnext!=NULL)
+	    toremove->lnext->lprev=toremove->lprev;
+	  else
+	    thisvar->listtail=toremove->lprev;
+	  RUNFREE(toremove);
+
+	  thisvar->numelements--;
+	  return 1;
+        }
+        ptr = &((*ptr)->next);
+    }
+
+    return 0;
+}
+
+void ObjectHashrehash(struct ObjectHash * thisvar) {
+  int newsize=thisvar->size;
+  struct ObjectNode ** newbucket = (struct ObjectNode **) RUNMALLOC(sizeof(struct ObjectNode *)*newsize);
+  int i;
+  for(i=thisvar->size-1;i>=0;i--) {
+    struct ObjectNode *ptr;
+    for(ptr=thisvar->bucket[i];ptr!=NULL;) {
+      struct ObjectNode * nextptr=ptr->next;
+      unsigned int newhashkey=(unsigned int)ptr->key % newsize;
+      ptr->next=newbucket[newhashkey];
+      newbucket[newhashkey]=ptr;
+      ptr=nextptr;
+    }
+  }
+  thisvar->size=newsize;
+  RUNFREE(thisvar->bucket);
+  thisvar->bucket=newbucket;
+}
+
+int ObjectHashadd(struct ObjectHash * thisvar,int key, int data, int data2) {
+  /* Rehash code */
+  unsigned int hashkey;
+  struct ObjectNode **ptr;
+
+  if (thisvar->numelements>=thisvar->size) {
+    int newsize=2*thisvar->size+1;
+    struct ObjectNode ** newbucket = (struct ObjectNode **) RUNMALLOC(sizeof(struct ObjectNode *)*newsize);
+    int i;
+    for(i=thisvar->size-1;i>=0;i--) {
+        struct ObjectNode *ptr;
+        for(ptr=thisvar->bucket[i];ptr!=NULL;) {
+            struct ObjectNode * nextptr=ptr->next;
+            unsigned int newhashkey=(unsigned int)ptr->key % newsize;
+            ptr->next=newbucket[newhashkey];
+            newbucket[newhashkey]=ptr;
+            ptr=nextptr;
+        }
+    }
+    thisvar->size=newsize;
+    RUNFREE(thisvar->bucket);
+    thisvar->bucket=newbucket;
+  }
+
+  hashkey = (unsigned int)key % thisvar->size;
+  ptr = &thisvar->bucket[hashkey];
+
+  while (*ptr) {
+    if ((*ptr)->key == key) {
+      (*ptr)->data=data;
+      (*ptr)->data2=data2;
+      return 1;
+    }
+    ptr = &((*ptr)->next);
+  }
+
+  {
+    struct ObjectNode *node=RUNMALLOC(sizeof(struct ObjectNode));
+    node->data=data;
+    node->data2=data2;
+    node->key=key;
+    node->next=(*ptr);
+    *ptr=node;
+    if (thisvar->listhead==NULL) {
+      thisvar->listhead=node;
+      thisvar->listtail=node;
+      node->lnext=NULL;
+      node->lprev=NULL;
+    } else {
+      node->lprev=NULL;
+      node->lnext=thisvar->listhead;
+      thisvar->listhead->lprev=node;
+      thisvar->listhead=node;
+    }
+  }
+
+  thisvar->numelements++;
+  return 1;
+}
+
+bool ObjectHashcontainskey(struct ObjectHash *thisvar,int key) {
+    unsigned int hashkey = (unsigned int)key % thisvar->size;
+
+    struct ObjectNode *ptr = thisvar->bucket[hashkey];
+    while (ptr) {
+        if (ptr->key == key) {
+            /* we already have thisvar object
+               stored in the hash so just return */
+            return true;
+        }
+        ptr = ptr->next;
+    }
+    return false;
+}
+
+bool ObjectHashcontainskeydata(struct ObjectHash *thisvar, int key, int data) {
+    unsigned int hashkey = (unsigned int)key % thisvar->size;
+
+    struct ObjectNode *ptr = thisvar->bucket[hashkey];
+    while (ptr) {
+        if (ptr->key == key && ptr->data == data) {
+            /* we already have thisvar object
+               stored in the hash so just return*/
+            return true;
+        }
+        ptr = ptr->next;
+    }
+    return false;
+}
+
+int ObjectHashcount(struct ObjectHash *thisvar,int key) {
+    unsigned int hashkey = (unsigned int)key % thisvar->size;
+    int count = 0;
+
+    struct ObjectNode *ptr = thisvar->bucket[hashkey];
+    while (ptr) {
+        if (ptr->key == key) {
+            count++;
+        }
+        ptr = ptr->next;
+    }
+    return count;
+}
+
+struct ObjectHash * ObjectHashimageSet(struct ObjectHash *thisvar, int key) {
+  struct ObjectHash * newset=allocateObjectHash(2*ObjectHashcount(thisvar,key)+4);
+  unsigned int hashkey = (unsigned int)key % thisvar->size;
+
+  struct ObjectNode *ptr = thisvar->bucket[hashkey];
+  while (ptr) {
+    if (ptr->key == key) {
+        ObjectHashadd(newset,ptr->data,ptr->data);
+    }
+    ptr = ptr->next;
+  }
+  return newset;
+}
+
+int ObjectHashget(struct ObjectHash *thisvar, int key, int *data, int *data2) {
+    unsigned int hashkey = (unsigned int)key % thisvar->size;
+
+    struct ObjectNode *ptr = thisvar->bucket[hashkey];
+    while (ptr) {
+        if (ptr->key == key) {
+            *data = ptr->data;
+	    *data2 = ptr->data2;
+            return 1; /* success */
+        }
+        ptr = ptr->next;
+    }
+
+    return 0; /* failure */
+}
+
+inline struct ObjectIterator * noargallocateObjectIterator() {
+    return (struct ObjectIterator*)RUNMALLOC(sizeof(struct ObjectIterator));
+}
+
+inline struct ObjectIterator * allocateObjectIterator(struct ObjectNode *start) {
+    struct ObjectIterator *thisvar=(struct ObjectIterator*)RUNMALLOC(sizeof(struct ObjectIterator));
+    thisvar->cur = start;
+    return thisvar;
+}
+
+inline int ObjhasNext(struct ObjectIterator *thisvar) {
+  return (thisvar->cur!=NULL);
+}
+
+inline int Objnext(struct ObjectIterator *thisvar) {
+  int curr=thisvar->cur->data;
+  thisvar->cur=thisvar->cur->next;
+}
+
+inline int Objkey(struct ObjectIterator *thisvar) {
+  return thisvar->cur->key;
+}
diff --git a/Robust/src/Runtime/ObjectHash.h b/Robust/src/Runtime/ObjectHash.h
new file mode 100755
index 00000000..23a05fce
--- /dev/null
+++ b/Robust/src/Runtime/ObjectHash.h
@@ -0,0 +1,72 @@
+#ifndef OBJECTHASH_H
+#define OBJECTHASH_H
+
+#ifndef bool
+#define bool int
+#endif
+
+#ifndef true
+#define true 1
+#endif
+
+#ifndef false
+#define false 0
+#endif
+
+#include "mem.h"
+
+/* ObjectHash *********************************************************/
+
+struct ObjectHash * noargallocateObjectHash();
+struct ObjectHash * allocateObjectHash(int size);
+void ObjectHashaddChild(struct ObjectHash *thisvar, struct ObjectHash * child);
+void freeObjectHash(struct ObjectHash *);
+
+void ObjectHashrehash(struct ObjectHash * thisvar);
+int ObjectHashadd(struct ObjectHash *, int key, int data, int data2);
+int ObjectHashremove(struct ObjectHash *,int key);
+bool ObjectHashcontainskey(struct ObjectHash *,int key);
+bool ObjectHashcontainskeydata(struct ObjectHash *,int key, int data);
+int ObjectHashget(struct ObjectHash *,int key, int* data, int* data2);
+void ObjectHashaddParent(struct ObjectHash *,struct ObjectHash* parent);
+int ObjectHashfirstkey(struct ObjectHash *);
+struct ObjectIterator* ObjectHashcreateiterator(struct ObjectHash *);
+void ObjectHashiterator(struct ObjectHash *, struct ObjectIterator * it);
+int ObjectHashcount(struct ObjectHash *, int key);
+
+struct ObjectHash {
+    int numelements;
+    int size;
+    struct ObjectNode **bucket;
+    struct ObjectNode *listhead;
+    struct ObjectNode *listtail;
+};
+
+inline int ObjectHashcountset(struct ObjectHash * thisvar);
+
+/* ObjectIterator *****************************************************/
+
+struct ObjectNode {
+  struct ObjectNode *next;
+  struct ObjectNode *lnext;
+  struct ObjectNode *lprev;
+  int key;
+  int data;
+  int data2;
+};
+
+struct ObjectIterator {
+  struct ObjectNode *cur;
+};
+
+inline struct ObjectIterator * noargallocateObjectIterator();
+
+inline struct ObjectIterator * allocateObjectIterator(struct ObjectNode *start);
+
+inline int ObjasNext(struct ObjectIterator *thisvar);
+
+inline int Objnext(struct ObjectIterator *thisvar);
+
+inline int Objkey(struct ObjectIterator *thisvar);
+
+#endif
diff --git a/Robust/src/Runtime/task.c b/Robust/src/Runtime/task.c
index 5b811b26..88633ca0 100644
--- a/Robust/src/Runtime/task.c
+++ b/Robust/src/Runtime/task.c
@@ -27,7 +27,6 @@ struct genhashtable * failedtasks;
 struct taskparamdescriptor * currtpd;
 struct RuntimeHash * forward;
 struct RuntimeHash * reverse;
-struct RuntimeHash * exitfsesdata;
 
 int main(int argc, char **argv) {
 #ifdef BOEHM_GC
@@ -45,7 +44,6 @@ int main(int argc, char **argv) {
   activetasks=genallocatehashtable((unsigned int (*)(void *)) &hashCodetpd, 
 				   (int (*)(void *,void *)) &comparetpd);
   
-  exitfsesdata=allocateRuntimeHash(10);
   /* Process task information */
   processtasks();