[GC] OpenMP GC error fixes

libocca · Aug 26, 2018 · 1024a62 · 1024a62
1 parent 95f53f3
commit 1024a62
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/mode/openmp/device.cpp b/src/mode/openmp/device.cpp
@@ -102,9 +102,9 @@ namespace occa {
                                                     allKernelProps);
 
       if (k && usingOpenMP) {
-        k->modeDevice->removeRef();
+        k->modeDevice->removeKernelRef(k);
         k->modeDevice = this;
-        addRef();
+        addKernelRef(k);
       }
 
       return k;

diff --git a/tests/src/c/memory.cpp b/tests/src/c/memory.cpp
@@ -275,8 +275,19 @@ void testInteropMethods() {
     ptr[i] = i;
   }
 
-  mem2 = occaWrapCpuMemory(ptr, bytes);
+  mem2 = occaWrapCpuMemory(occaHost(),
+                           ptr,
+                           bytes,
+                           occaDefault);
 
+  occaProperties props = (
+    occaCreatePropertiesFromString("foo: 'bar'")
+  );
+  mem2 = occaWrapCpuMemory(occaHost(),
+                           ptr,
+                           bytes,
+                           props);
   occaFree(mem1);
   occaFree(mem2);
+  occaFree(props);
 }
diff --git a/tests/src/tools/gc.cpp b/tests/src/tools/gc.cpp
@@ -69,7 +69,7 @@ void testWithRefs() {
 }
 
 void testRingEntry() {
-  occa::gc::ringEntry a, b;
+  occa::gc::ringEntry_t a, b;
 
   ASSERT_EQ(a.leftRingEntry,
             &a);
@@ -96,8 +96,8 @@ void testRingEntry() {
 }
 
 void testRing() {
-  occa::gc::ringEntry a, b, c;
-  occa::gc::ring<occa::gc::ringEntry> values;
+  occa::gc::ringEntry_t a, b, c;
+  occa::gc::ring_t<occa::gc::ringEntry_t> values;
 
   ASSERT_EQ((void*) values.head,
             (void*) NULL);