From e4e64d2901fa755a0973dc363fc18798f2f44adc Mon Sep 17 00:00:00 2001 From: adash Date: Wed, 7 Mar 2007 03:14:28 +0000 Subject: [PATCH] Delete the ObjInsert() function from dstm.h Omit the mhashtable_t* and lhashtable* parameters from functions --- Robust/src/Runtime/DSTM/interface/dstm.h | 2 -- Robust/src/Runtime/DSTM/interface/llookup.h | 12 ++++++------ Robust/src/Runtime/DSTM/interface/mlookup.h | 12 ++++++------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Robust/src/Runtime/DSTM/interface/dstm.h b/Robust/src/Runtime/DSTM/interface/dstm.h index 7e8df577..3b938a7f 100644 --- 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 c7b169c9..ffae96a2 100644 --- 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 e5c545d2..fec3fa36 100644 --- 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 -- 2.34.1