Merge pull request #47 from score-p/issue-46

Fixes #46 .
OPARI defines his own `.opari2_init.c`. Unfortunately, it does not allow an as easy usage as `scorep-config`. However, adding the required definitions manually seems to work.

Author: AndreasGocht

scorep/helper.py

@@ -52,19 +52,6 @@ def add_to_ld_library_path(path):
                 ":" + os.environ["LD_LIBRARY_PATH"]
 
 
-def generate_ld_preload(scorep_config):
-    """
-    This functions generate a string that needs to be passed to $LD_PRELOAD.
-    After this sting is passed, the tracing needs to be restarted with this $LD_PRELOAD in env.
-
-    @return ld_preload string which needs to be passed to LD_PRELOAD
-    """
-
-    (_, preload, _) = call(["scorep-config"] +
-                           scorep_config + ["--user", "--preload-libs"])
-    return preload
-
-
 def generate_compile_deps(config=[]):
     """
     Generates the data needed for compilation.

scorep/subsystem.py

@@ -7,7 +7,7 @@
 import scorep.helper
 
 
-def gen_subsystem_lib_name():
+def generate_subsystem_lib_name():
     """
     generate the name for the subsystem lib.
     """
@@ -16,6 +16,19 @@ def gen_subsystem_lib_name():
     return mpi_lib_name
 
 
+def generate_ld_preload(scorep_config):
+    """
+    This functions generate a string that needs to be passed to $LD_PRELOAD.
+    After this sting is passed, the tracing needs to be restarted with this $LD_PRELOAD in env.
+
+    @return ld_preload string which needs to be passed to LD_PRELOAD
+    """
+
+    (_, preload, _) = scorep.helper.call(
+        ["scorep-config"] + scorep_config + ["--user", "--preload-libs"])
+    return preload
+
+
 def generate_subsystem_code(config=[]):
     """
     Generates the data needed to be preloaded.
@@ -45,6 +58,13 @@ def generate(scorep_config, keep_files=False):
     (include, lib, lib_dir, macro,
      linker_flags_tmp) = scorep.helper.generate_compile_deps(scorep_config)
     scorep_adapter_init = generate_subsystem_code(scorep_config)
+    if ("-lscorep_adapter_opari2_mgmt" in lib):
+        scorep_adapter_init += "\n"
+        scorep_adapter_init += "/* OPARI dependencies */\n"
+        scorep_adapter_init += "void POMP2_Init_regions(){}\n"
+        scorep_adapter_init += "size_t POMP2_Get_num_regions(){return 0;};\n"
+        scorep_adapter_init += "void POMP2_USER_Init_regions(){};\n"
+        scorep_adapter_init += "size_t POMP2_USER_Get_num_regions(){return 0;};\n"
 
     # add -Wl,-no-as-needed to tell the compiler that we really want to link these. Actually this sould be default.
     # as distutils adds extra args at the very end we need to add all the libs
@@ -62,7 +82,7 @@ def generate(scorep_config, keep_files=False):
     with open(temp_dir + "/scorep_init.c", "w") as f:
         f.write(scorep_adapter_init)
 
-    subsystem_lib_name = gen_subsystem_lib_name()
+    subsystem_lib_name = generate_subsystem_lib_name()
 
     cc = distutils.ccompiler.new_compiler()
     compiled_subsystem = cc.compile(
@@ -97,7 +117,7 @@ def init_environment(scorep_config=[], keep_files=False):
 
     subsystem_lib_name, temp_dir = scorep.subsystem.generate(
         scorep_config, keep_files)
-    scorep_ld_preload = scorep.helper.generate_ld_preload(scorep_config)
+    scorep_ld_preload = generate_ld_preload(scorep_config)
 
     scorep.helper.add_to_ld_library_path(temp_dir)