Delete the ObjInsert() function from dstm.h

Omit the mhashtable_t* and lhashtable* parameters from functions

diff --git a/Robust/src/Runtime/DSTM/interface/dstm.h b/Robust/src/Runtime/DSTM/interface/dstm.h
index 7e8df57751508cdad86aae54d28389a3cd395375..3b938a7f6dab54f7045d1f876bbba3cd07dc7ead 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/dstm.h
+++ b/Robust/src/Runtime/DSTM/interface/dstm.h
@@ -33,7 +33,6 @@ void dstmInit(void);
 /* Prototypes for object header */
 unsigned int getNewOID(void);
 unsigned int objSize(objheader_t *object);
-void objInsert(objheader_t *object); //copies object to main object store
 /* end object header */
 
 /* Prototypes for object store */
@@ -55,4 +54,3 @@ int transCommit(transrecord_t *record); //return 0 if successful
 /* end transactions */
 
 #endif
-

diff --git a/Robust/src/Runtime/DSTM/interface/llookup.h b/Robust/src/Runtime/DSTM/interface/llookup.h
index c7b169c99ec236b44cac662297160c033ab366f0..ffae96a207920d23f2099be8aaf3db610ff5d9d6 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/llookup.h
+++ b/Robust/src/Runtime/DSTM/interface/llookup.h
@@ -18,12 +18,12 @@ typedef struct hashtable {
 } lhashtable_t;
 
 /* Prototypes for hash*/
-lhashtable_t *lhashCreate(unsigned int size, float loadfactor);
-unsigned int lhashFunction(lhashtable_t *table, unsigned int oid);
-void lhashInsert(lhashtable_t *table, unsigned int oid, unsigned int mid);
-int lhashSearch(lhashtable_t *table, unsigned int oid); //returns val, NULL if not found
-int lhashRemove(lhashtable_t *table, unsigned int oid); //returns -1 if not found
-void lhashResize(lhashtable_t *table, unsigned int newsize);
+lhashtable_t lhashCreate(unsigned int size, float loadfactor);
+unsigned int lhashFunction(lhashtable_t table, unsigned int oid);
+void lhashInsert(lhashtable_t table, unsigned int oid, unsigned int mid);
+int lhashSearch(lhashtable_t table, unsigned int oid); //returns oid, -1 if not found
+int lhashRemove(lhashtable_t table, unsigned int oid); //returns -1 if not found
+void lhashResize(lhashtable_t table, unsigned int newsize);
 /* end hash */
 
 #endif

diff --git a/Robust/src/Runtime/DSTM/interface/mlookup.h b/Robust/src/Runtime/DSTM/interface/mlookup.h
index e5c545d256bdf040cf1777e91249a8f5c0210f85..fec3fa364ae6e59b8a30e99df37bd59be17a9a35 100644 (file)
--- a/Robust/src/Runtime/DSTM/interface/mlookup.h
+++ b/Robust/src/Runtime/DSTM/interface/mlookup.h
@@ -18,12 +18,12 @@ typedef struct hashtable {
 } mhashtable_t;
 
 /* Prototypes for hash*/
-mhashtable_t *mhashCreate(unsigned int size, float loadfactor);
-unsigned int mhashFunction(mhashtable_t *table, unsigned int key);
-void mhashInsert(mhashtable_t *table, unsigned int key, void *val);
-void *mhashSearch(mhashtable_t *table, unsigned int key); //returns val, NULL if not found
-int mhashRemove(mhashtable_t *table, unsigned int key); //returns -1 if not found
-void mhashResize(mhashtable_t *table, unsigned int newsize);
+mhashtable_t mhashCreate(unsigned int size, float loadfactor);
+unsigned int mhashFunction(mhashtable_t table, unsigned int key);
+void mhashInsert(mhashtable_t table, unsigned int key, void *val);
+void *mhashSearch(mhashtable_t table, unsigned int key); //returns val, NULL if not found
+int mhashRemove(mhashtable_t table, unsigned int key); //returns -1 if not found
+void mhashResize(mhashtable_t table, unsigned int newsize);
 /* end hash */
 
 #endif