Merge branch 'multiple-parents' into python_and_multi_parents

CMakeLists.txt

@@ -90,7 +90,7 @@ IF("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
   endif(NOT DEFINED APEX_BUILD_EXAMPLES)
   add_definitions(-DDEBUG)
   add_definitions(-DCMAKE_BUILD_TYPE=3)
-  set(APEX_ERROR_HANDLING TRUE)
+  #set(APEX_ERROR_HANDLING TRUE)
 endif()
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
@@ -964,6 +964,13 @@ else()
             "Try manually check out https://github.com/khuck/taskStubs.git to ${PROJECT_SOURCE_DIR}")
 endif()
 
+if(APEX_BUILD_TESTS)
+    # Include path needed for example in src/unit_tests/C++
+    include_directories(${PROJECT_SOURCE_DIR}/taskStubs/timer_plugin)
+    # Build the taskstubs library for testing purposes
+    add_subdirectory (taskStubs)
+endif(APEX_BUILD_TESTS)
+
 if(APEX_WITH_PLUGINS)
     message(INFO " apex will be built with plugin support.")
     set(LIBS ${LIBS} ${CMAKE_DL_LIBS})

src/apex/address_resolution.cpp

@@ -118,8 +118,18 @@ namespace apex {
         if (rc == 0) {
         } else {
             node->info.probeAddr = ip;
-            node->info.filename = strdup(info.dli_fname);
-            node->info.funcname = strdup(info.dli_sname);
+            if (info.dli_fname == nullptr) {
+                node->info.filename = strdup("unknown");
+            } else {
+                node->info.filename = strdup(info.dli_fname);
+            }
+            if (info.dli_sname == nullptr) {
+                stringstream ss;
+                ss << "UNRESOLVED  ADDR 0x" << hex << ip;
+                node->info.funcname = strdup(ss.str().c_str());
+            } else {
+                node->info.funcname = strdup(info.dli_sname);
+            }
         }
 #endif // no APEX_HAVE_BFD
 #endif // no __APPLE__