Various fixes for the OMPD library

- types of the type_sizes struct were changed to char. The cast to (int*) broke everything
- Remove the use of new
- Fix the order of setting ompd_status and posting ompd_dll_locations_valid

Author: Nina Loeseke

libompd/src/TargetValue.cpp

@@ -9,7 +9,7 @@ const ompd_callbacks_t *TValue::callbacks = NULL;
 ompd_target_type_sizes_t TValue::type_sizes;
 
 inline int ompd_sizeof(ompd_target_prim_types_t t) {
-  return (((int *)&TValue::type_sizes)[(int)t]);
+  return (((char *)&TValue::type_sizes)[(int)t]);
 }
 
 TType &TTypeFactory::getType(ompd_address_space_context_t *context,

libompd/src/omp-debug.cpp

@@ -70,7 +70,11 @@ ompd_process_initialize(ompd_address_space_context_t
             .getValue(ompd_state);
   if (ret != ompd_rc_ok)
     return ret;
-  *addrhandle = new ompd_address_space_handle_t;
+  ret = callbacks->dmemory_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;
@@ -117,8 +121,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->dmemory_free((void *)(addr_handle));
+//  delete addr_handle;
+  return ret;
 }
 
 #if 0  // no device support yet
@@ -166,7 +171,11 @@ ompd_rc_t ompd_device_initialize (
       continue;
 
     if (cuda_ctx == id) {
-      *addrhandle = new ompd_address_space_handle_t;
+      ret = callbacks->dmemory_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;

libompd/src/ompd.h

@@ -266,7 +266,7 @@ typedef struct ompd_target_type_sizes_t {
   uint8_t sizeof_long;
   uint8_t sizeof_long_long;
   uint8_t sizeof_pointer;
-} ompd_device_type_sizes_t;
+} ompd_target_type_sizes_t;
 
 /******************************************************************************
  * Debugger callback signatures.

runtime/src/ompd-specific.cpp

@@ -64,9 +64,6 @@ OMPD_FOREACH_ACCESS(ompd_init_sizeof_member)
 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 @@ OMPD_FOREACH_SIZEOF(ompd_init_sizeof)
   }
 
   ompd_initialized = 1;
+  ompd_dll_locations=ompd_my_dll_locations;
+  ompd_dll_locations_valid ();
+
 }
 
 /*void omp_ompd_enable ( void )
@@ -90,7 +90,7 @@ OMPD_FOREACH_SIZEOF(ompd_init_sizeof)
 #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 ("");