Access the task routine to provide a task function for OMPD

Author: jprotze

libompd/src/CMakeLists.txt

@@ -1,12 +1,10 @@
 project (libompd)
 
-message( "LIBOMP_INCLUDE_DIR = ${LIBOMP_INCLUDE_DIR}" )
 add_library (ompd SHARED TargetValue.cpp omp-debug.cpp)
 
 add_dependencies(ompd omp) # ensure generated import library is created first
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-message( "CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}" )
 
 include_directories (
         ${CMAKE_CURRENT_SOURCE_DIR}

libompd/src/omp-debug.cpp

@@ -1407,7 +1407,7 @@ ompd_get_task_data(ompd_task_handle_t *task_handle, /* IN: OpenMP task handle*/
   return ret;
 }
 
-#if 0 // the runtime currently does not have task function information
+#if 1 // the runtime currently does not have task function information
 ompd_rc_t ompd_get_task_function(
     ompd_task_handle_t *task_handle, /* IN: OpenMP task handle */
     ompd_address_t *task_addr /* OUT: first instruction in the task region */
@@ -1439,17 +1439,15 @@ ompd_rc_t ompd_get_task_function(
   task_addr->segment = OMPD_SEGMENT_UNSPECIFIED;
   TValue taskInfo;
   if(task_handle->lwt.address!=0)
-    taskInfo = TValue(context, task_handle->lwt).
-          cast("ompt_lw_taskteam_t",0);		/*lwt*/
+    return ompd_rc_bad_input; // We need to decide what we do here. 
   else
-    taskInfo = TValue(context, task_handle->th).
-          cast("kmp_taskdata_t",0);		/*t*/
-  ret = taskInfo.
-        access("ompt_task_info").             /*td->ompt_task_info*/
-        cast("ompt_task_info_t").
-        access("function").                /*td->ompt_task_info.function*/
-        castBase().    
-        getValue(task_addr->address);
+    ret = TValue(context, task_handle->th).
+          cast("kmp_taskdata_t",0).		/*t*/
+          getArrayElement(1).                   /* see kmp.h: #define KMP_TASKDATA_TO_TASK(taskdata) (kmp_task_t *)(taskdata + 1) */
+          cast("kmp_task_t",0).                 /* (kmp_task_t *) */
+          access("routine").             /*td->ompt_task_info*/
+          castBase().    
+          getValue(task_addr->address);
   return ret;
 }
 #endif

runtime/src/ompd-specific.h

@@ -69,6 +69,8 @@ OMPD_ACCESS(kmp_taskdata_t,       td_icvs) \
 OMPD_ACCESS(kmp_taskdata_t,       td_parent) \
 OMPD_ACCESS(kmp_taskdata_t,       td_team) \
 \
+OMPD_ACCESS(kmp_task_t,           routine) \
+\
 OMPD_ACCESS(kmp_team_p,           t) \
 \
 OMPD_ACCESS(ompt_task_info_t,     frame) \
@@ -110,6 +112,7 @@ OMPD_BITFIELD(kmp_tasking_flags_t,  native) \
 #define OMPD_FOREACH_SIZEOF(OMPD_SIZEOF) \
 OMPD_SIZEOF(kmp_info_t) \
 OMPD_SIZEOF(kmp_taskdata_t) \
+OMPD_SIZEOF(kmp_task_t) \
 OMPD_SIZEOF(kmp_tasking_flags_t) \
 OMPD_SIZEOF(kmp_thread_t) \
 OMPD_SIZEOF(ompt_data_t) \