X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=benchmark%2Fcliffc-hashtable%2Fmain.cc;h=351c0da7989fecad5c0ec98b20f5da768541d20b;hb=635b0659aadff512de8d0ca508ecd98cce4f845c;hp=517e4a7b895bb81fa193ca4ea685ccd4fbd668f2;hpb=d8379bc0ab37f46daad7fd5fa7538435591ef836;p=cdsspec-compiler.git

diff --git a/benchmark/cliffc-hashtable/main.cc b/benchmark/cliffc-hashtable/main.cc
index 517e4a7..351c0da 100644
--- a/benchmark/cliffc-hashtable/main.cc
+++ b/benchmark/cliffc-hashtable/main.cc
@@ -51,26 +51,25 @@ class IntWrapper {
 
 cliffc_hashtable<IntWrapper, IntWrapper> *table;
 IntWrapper *val1, *val2;
+IntWrapper *k1, *k2, *k3, *k4, *k5;
+IntWrapper *v1, *v2, *v3, *v4, *v5;
 
 void threadA(void *arg) {
-	/*
-	IntWrapper *k1 = new IntWrapper(3), *k2 = new IntWrapper(5),
-		*k3 = new IntWrapper(1024), *k4 = new IntWrapper(1025);
-	IntWrapper *v1 = new IntWrapper(1024), *v2 = new IntWrapper(1025),
-		*v3 = new IntWrapper(73), *v4 = new IntWrapper(81);
 	table->put(k1, v1);
-	table->put(k2, v2);
+	//table->put(k4, v3);
+	//table->put(v3, v3);
+	
 	val1 = table->get(k3);
-	table->put(k3, v3);
-	*/
+	if (val1 != NULL)
+		model_print("val1: %d\n", val1->_val);
+	else
+		model_print("val1: NULL\n");
+	//table->put(k3, v3);
+	
 }
 
 void threadB(void *arg) {
 	/*
-	IntWrapper *k1 = new IntWrapper(3), *k2 = new IntWrapper(5),
-		*k3 = new IntWrapper(1024), *k4 = new IntWrapper(1025);
-	IntWrapper *v1 = new IntWrapper(1024), *v2 = new IntWrapper(1025),
-		*v3 = new IntWrapper(73), *v4 = new IntWrapper(81);
 	table->put(k1, v3);
 	val1 = table->get(k2);
 	table->put(k2, v4);
@@ -79,26 +78,28 @@ void threadB(void *arg) {
 }
 
 void threadMain(void *arg) {
-	/*
-	for (int i = 0; i < 5; i++) {
-		IntWrapper *k = new IntWrapper(i), *v = new IntWrapper(i * 2);
-		table->put(k, v);
-	}
-	*/
-	IntWrapper *k1 = new IntWrapper(3), *k2 = new IntWrapper(5),
-		*k3 = new IntWrapper(1024), *k4 = new IntWrapper(1025);
-	IntWrapper *v1 = new IntWrapper(1024), *v2 = new IntWrapper(1025),
-		*v3 = new IntWrapper(73), *v4 = new IntWrapper(81);
-	table->put(k1, v3);
-	val1 = table->get(k2);
+	table->put(k3, v3);
+	val1 = table->get(k1);
+	if (val1 != NULL)
+		model_print("val1: %d\n", val1->_val);
+	else
+		model_print("val1: NULL\n");
 }
 
 int user_main(int argc, char *argv[]) {
 	thrd_t t1, t2;
-	table = new cliffc_hashtable<IntWrapper, IntWrapper>();
-	val1 = NULL;
-	val2 = NULL;
-	//threadMain(NULL);
+	table = new cliffc_hashtable<IntWrapper, IntWrapper>(2);
+    k1 = new IntWrapper(3);
+	k2 = new IntWrapper(5);
+	k3 = new IntWrapper(11);
+	k4 = new IntWrapper(7);
+	k5 = new IntWrapper(13);
+
+	v1 = new IntWrapper(1024);
+	v2 = new IntWrapper(47);
+	v3 = new IntWrapper(73);
+	v4 = new IntWrapper(81);
+	v5 = new IntWrapper(99);
 
 	thrd_create(&t1, threadA, NULL);
 	thrd_create(&t2, threadB, NULL);