Merge remote-tracking branch 'origin/ompd' into ompd-devices

Conflicts:
	libompd/src/TargetValue.cpp
	libompd/src/omp-debug.cpp

Author: manorom

libompd/src/TargetValue.cpp

@@ -14,23 +14,7 @@ inline int ompd_sizeof(ompd_target_prim_types_t t) {
   assert(t != ompd_type_max && "ompd_type_max should not be used anywhere");
   assert(t != ompd_type_invalid && "request size of invalid type");
 
-  switch (t) {
-    case ompd_type_char:
-      return TValue::type_sizes.sizeof_char;
-    case ompd_type_short:
-      return TValue::type_sizes.sizeof_short;
-    case ompd_type_int:
-      return TValue::type_sizes.sizeof_int;
-    case ompd_type_long:
-      return TValue::type_sizes.sizeof_long;
-    case ompd_type_long_long:
-      return TValue::type_sizes.sizeof_long_long;
-    case ompd_type_pointer:
-      return TValue::type_sizes.sizeof_pointer;
-    default:
-      break;
-  }
-  return 0;
+  return (((char *)&TValue::type_sizes)[(int)t]);
 }
 
 TType &TTypeFactory::getType(ompd_address_space_context_t *context,

libompd/src/omp-debug.cpp

@@ -68,6 +68,15 @@ ompd_process_initialize(ompd_address_space_context_t
             .getValue(ompd_state);
   if (ret != ompd_rc_ok)
     return ret;
+  ret = callbacks->memory_alloc(sizeof(ompd_address_space_handle_t),
+                                 (void **)(addrhandle));
+  if (ret != ompd_rc_ok)
+    return ret;
+//  *addrhandle = new ompd_address_space_handle_t;
+  if (!addrhandle)
+    return ompd_rc_error;
+  (*addrhandle)->context = context;
+  (*addrhandle)->kind = OMP_DEVICE_KIND_HOST;
 
   return ompd_rc_ok;
 }
@@ -110,8 +119,9 @@ ompd_rc_t ompd_release_address_space_handle(
   if (!addr_handle)
     return ompd_rc_bad_input;
 
-  delete addr_handle;
-  return ompd_rc_ok;
+  ompd_rc_t ret = callbacks->memory_free((void *)(addr_handle));
+//  delete addr_handle;
+  return ret;
 }
 
 ompd_rc_t ompd_device_initialize(
@@ -151,8 +161,11 @@ ompd_rc_t ompd_device_initialize(
     if ( ret != ompd_rc_ok )
       continue;
 
-    if (cuda_ctx == (*((uint64_t *)id))) {
-      *device_handle = new ompd_address_space_handle_t;
+    if (cuda_ctx == *((uint64_t *)id)) {
+      ret = callbacks->memory_alloc(sizeof(ompd_address_space_handle_t),
+                                     (void **)(device_handle));
+      if (ret != ompd_rc_ok)
+        return ret;
       if (!device_handle)
         return ompd_rc_error;
       (*device_handle)->context = device_context;

runtime/src/ompd-specific.cpp

@@ -64,9 +64,6 @@ void ompd_init()
   OMPD_FOREACH_SIZEOF(ompd_init_sizeof)
 #undef ompd_init_sizeof
 
-  ompd_dll_locations=ompd_my_dll_locations;
-  ompd_dll_locations_valid ();
-
   const char *ompd_env_var = getenv("OMP_OMPD");
   if (ompd_env_var && !strcmp(ompd_env_var, "on"))
   {
@@ -77,6 +74,9 @@ void ompd_init()
   }
 
   ompd_initialized = 1;
+  ompd_dll_locations=ompd_my_dll_locations;
+  ompd_dll_locations_valid ();
+
 }
 
 /*void omp_ompd_enable ( void )
@@ -90,7 +90,7 @@ void ompd_init()
 #endif
 }*/
 
-void ompd_dll_locations_valid ( void ){
+void __attribute__((noinline)) ompd_dll_locations_valid ( void ){
   /* naive way of implementing hard to opt-out empty function 
      we might want to use a separate object file? */
   asm ("");