edits

[cdsspec-compiler.git] / benchmark / concurrent-hashmap / main.cc

diff --git a/benchmark/concurrent-hashmap/main.cc b/benchmark/concurrent-hashmap/main.cc
index 084230eb3045e0cebc2efee4872258ce9218a613..4190075cbd195d946774878be9cc8f2057fd66f6 100644 (file)
--- a/benchmark/concurrent-hashmap/main.cc
+++ b/benchmark/concurrent-hashmap/main.cc
@@ -4,66 +4,25 @@
 
 HashMap *table;
 
-
-void printKey(Key *key) {
-       if (key)
-               printf("pos = (%d, %d, %d)\n", key->x, key->y, key->z);
-       else
-               printf("pos = NULL\n");
-}
-
-void printValue(Value *value) {
-       if (value)
-               printf("velocity = (%d, %d, %d)\n", value->vX, value->vY, value->vZ);
-       else
-               printf("velocity = NULL\n");
-}
-
-// Key(3, 2, 6) & Key(1, 3, 3) are hashed to the same slot -> 4
-// Key(1, 1, 1) & Key(3, 2, 2) are hashed to the same slot -> 0
-// Key(2, 4, 1) & Key(3, 4, 2) are hashed to the same slot -> 3
-// Key(3, 4, 5) & Key(1, 4, 3) are hashed to the same slot -> 5
-
-
 void threadA(void *arg) {
-       Key *k1 = new Key(3, 2, 6);
-       Key *k2 = new Key(1, 1, 1);
-       Value *v1 = new Value(10, 10, 10);
-       Value *r1 = table->put(k1, v1);
-       //printValue(r1);
-       Value *r2 = table->get(k2);
-       //printf("Thrd A:\n");
-       printValue(r2);
+       table->put(1, 1);
+       printf("Thrd A: Put %d -> %d\n", 1, 1);
+       int r1 = table->get(2);
+       printf("Thrd A: Get %d\n", r1);
 }
 
 void threadB(void *arg) {
-       Key *k1 = new Key(3, 2, 6);
-       Key *k2 = new Key(1, 1, 1);
-       Value *v2 = new Value(30, 40, 50);
-       Value *r3 = table->put(k2, v2);
-       //printValue(r3);
-       Value *r4 = table->get(k1);
-       printf("Thrd B:\n");
-       printValue(r4);
+       table->put(2, 2);
+       printf("Thrd B: Put %d -> %d\n", 2, 2);
+       int r2 = table->get(1);
+       printf("Thrd B: Get %d\n", r2);
 }
 
 int user_main(int argc, char *argv[]) {
        thrd_t t1, t2;
 
-       Key *k1 = new Key(1, 3, 3);
-       Key *k1_prime = new Key(3, 2, 6);
-       Key *k2 = new Key(3, 2, 2);
-       Key *k2_prime = new Key(1, 1, 1);
-       Value *v1 = new Value(111, 111, 111);
-       Value *v2 = new Value(222, 222, 222);
-
        table = new HashMap;
 
-       printf("Key1: %d\n", table->hashKey(k1) % table->capacity);
-       printf("Key1': %d\n", table->hashKey(k1_prime) % table->capacity);
-       printf("Key2: %d\n", table->hashKey(k2) % table->capacity);
-       printf("Key2': %d\n", table->hashKey(k2_prime) % table->capacity);
-
        thrd_create(&t1, threadA, NULL);
        thrd_create(&t2, threadB, NULL);
        thrd_join(t1);