Remove static tracepoint support

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index 4c1e7df..00ead0e 100644 (file)
--- a/src/mc/mc_compare.cpp
+++ b/src/mc/mc_compare.cpp
@@ -30,8 +30,6 @@
 #include "xbt/mmalloc.h"
 #include "src/xbt/mmalloc/mmprivate.h"
 
-#include "src/xbt/probes.h"
-
 using simgrid::mc::remote;
 
 extern "C" {
@@ -288,7 +286,6 @@ static int compare_global_variables(simgrid::mc::ObjectInformation* object_info,
                                 (char *) current_var.address, snapshot2, r2,
                                 bvariable_type, 0);
     if (res == 1) {
-      XBT_TRACE3(mc, global_diff, -1, -1, current_var->name);
       XBT_VERB("Global variable %s (%p) is different between snapshots",
                current_var.name.c_str(),
                (char *) current_var.address);
@@ -344,7 +341,6 @@ static int compare_local_variables(int process_index,
 
       if (res == 1) {
         // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
-        XBT_TRACE3(mc, local_diff, -1, -1, current_var1->name);
         XBT_VERB
             ("Local variable %s (%p - %p) in frame %s "
              "is different between snapshots",
@@ -391,7 +387,6 @@ int snapshot_compare(void *state1, void *state2)
   if (_sg_mc_hash) {
     hash_result = (s1->hash != s2->hash);
     if (hash_result) {
-      XBT_TRACE2(mc, hash_diff, num1, num2);
       XBT_VERB("(%d - %d) Different hash : 0x%" PRIx64 "--0x%" PRIx64, num1,
                num2, s1->hash, s2->hash);
 #ifndef MC_DEBUG
@@ -404,7 +399,6 @@ int snapshot_compare(void *state1, void *state2)
 
   /* Compare enabled processes */
   if (s1->enabled_processes != s2->enabled_processes) {
-      //XBT_TRACE3(mc, state_diff, num1, num2, "Different enabled processes");
       XBT_VERB("(%d - %d) Different enabled processes", num1, num2);
       // return 1; ??
   }
@@ -428,7 +422,6 @@ int snapshot_compare(void *state1, void *state2)
       XBT_VERB("(%d - %d) Different size used in stacks : %zu - %zu", num1,
                num2, size_used1, size_used2);
 #endif
-      XBT_TRACE3(mc, state_diff, num1, num2, "Different stack size");
       return 1;
 #endif
     }
@@ -451,7 +444,6 @@ int snapshot_compare(void *state1, void *state2)
     errors++;
 #else
 #ifdef MC_VERBOSE
-    XBT_TRACE3(mc, state_diff, num1, num2, "Different heap information");
     XBT_VERB("(%d - %d) Different heap information", num1, num2);
 #endif
 
@@ -478,7 +470,6 @@ int snapshot_compare(void *state1, void *state2)
     else diff_local =
         compare_local_variables(stack1->process_index, s1, s2, stack1, stack2);
     if (diff_local > 0) {
-      XBT_TRACE3(mc, state_diff, num1, num2, "Different local variables");
 #ifdef MC_DEBUG
       XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1,
                 num2, cursor + 1);
@@ -525,7 +516,6 @@ int snapshot_compare(void *state1, void *state2)
         s1, s2);
 
     if (is_diff != 0) {
-      XBT_TRACE3(mc, state_diff, num1, num2, "Different global variables");
 #ifdef MC_DEBUG
       XBT_DEBUG("(%d - %d) Different global variables in %s",
         num1, num2, name.c_str());
@@ -543,7 +533,6 @@ int snapshot_compare(void *state1, void *state2)
 
   /* Compare heap */
   if (mmalloc_compare_heap(s1, s2) > 0) {
-    XBT_TRACE3(mc, state_diff, num1, num2, "Different heap");
 
 #ifdef MC_DEBUG
     XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2);

diff --git a/src/probes.tp b/src/probes.tp
deleted file mode 100644 (file)
index 6ccc0aa..0000000
--- a/src/probes.tp
+++ /dev/null
@@ -1,61 +0,0 @@
-TRACEPOINT_EVENT(
-  mc,
-  state_diff,
-  TP_ARGS(
-    int, state1,
-    int, state2,
-    char*, message
-  ),
-  TP_FIELDS(
-    ctf_integer(int, state1, state1)
-    ctf_integer(int, state2, state2)
-    ctf_string(message, message)
-  )
-)
-TRACEPOINT_LOGLEVEL(mc, state_diff, TRACE_INFO)
-
-TRACEPOINT_EVENT(
-  mc,
-  hash_diff,
-  TP_ARGS(
-    int, state1,
-    int, state2
-  ),
-  TP_FIELDS(
-    ctf_integer(int, state1, state1)
-    ctf_integer(int, state2, state2)
-  )
-)
-TRACEPOINT_LOGLEVEL(mc, hash_diff, TRACE_INFO)
-
-TRACEPOINT_EVENT(
-  mc,
-  global_diff,
-  TP_ARGS(
-    int, state1,
-    int, state2,
-    char*, variable
-  ),
-  TP_FIELDS(
-    ctf_integer(int, state1, state1)
-    ctf_integer(int, state2, state2)
-    ctf_string(variable, variable)
-  )
-)
-TRACEPOINT_LOGLEVEL(mc, global_diff, TRACE_INFO)
-
-TRACEPOINT_EVENT(
-  mc,
-  local_diff,
-  TP_ARGS(
-    int, state1,
-    int, state2,
-    char*, variable
-  ),
-  TP_FIELDS(
-    ctf_integer(int, state1, state1)
-    ctf_integer(int, state2, state2)
-    ctf_string(variable, variable)
-  )
-)
-TRACEPOINT_LOGLEVEL(mc, local_diff, TRACE_INFO)

diff --git a/src/xbt/probes.h b/src/xbt/probes.h
deleted file mode 100644 (file)
index 187e4cd..0000000
--- a/src/xbt/probes.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (c) 2014. The SimGrid Team.
- * All rights reserved.                                                     */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#ifdef USE_UST
-#  include <lttng/tracepoint.h>
-#  include "simgrid_ust.h"
-#  define XBT_TRACE0 tracepoint
-#  define XBT_TRACE1 tracepoint
-#  define XBT_TRACE2 tracepoint
-#  define XBT_TRACE3 tracepoint
-#  define XBT_TRACE4 tracepoint
-#  define XBT_TRACE5 tracepoint
-#  define XBT_TRACE6 tracepoint
-#  define XBT_TRACE7 tracepoint
-#  define XBT_TRACE8 tracepoint
-#  define XBT_TRACE9 tracepoint
-#  define XBT_TRACE10 tracepoint
-#  define XBT_TRACE11 tracepoint
-#  define XBT_TRACE12 tracepoint
-#elif USE_SDT
-#  include <sys/sdt.h>
-#  define XBT_TRACE0  DTRACE_PROBE0
-#  define XBT_TRACE1  DTRACE_PROBE1
-#  define XBT_TRACE2  DTRACE_PROBE2
-#  define XBT_TRACE3  DTRACE_PROBE3
-#  define XBT_TRACE4  DTRACE_PROBE4
-#  define XBT_TRACE5  DTRACE_PROBE5
-#  define XBT_TRACE6  DTRACE_PROBE6
-#  define XBT_TRACE7  DTRACE_PROBE7
-#  define XBT_TRACE8  DTRACE_PROBE8
-#  define XBT_TRACE9  DTRACE_PROBE9
-#  define XBT_TRACE10  DTRACE_PROBE10
-#  define XBT_TRACE11  DTRACE_PROBE11
-#  define XBT_TRACE12  DTRACE_PROBE12
-#else
-#  define XBT_TRACE0(...)
-#  define XBT_TRACE1(...)
-#  define XBT_TRACE2(...)
-#  define XBT_TRACE3(...)
-#  define XBT_TRACE4(...)
-#  define XBT_TRACE5(...)
-#  define XBT_TRACE6(...)
-#  define XBT_TRACE7(...)
-#  define XBT_TRACE8(...)
-#  define XBT_TRACE9(...)
-#  define XBT_TRACE10(...)
-#  define XBT_TRACE11(...)
-#  define XBT_TRACE12(...)
-#endif

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a46d075..bc04b32 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -17,7 +17,6 @@ set(EXTRA_DIST
   src/include/xbt/wine_dbghelp.h
   src/msg/msg_private.h
   src/portable.h
-  src/probes.tp
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h
@@ -108,7 +107,6 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mmorecore.c
   src/xbt/mmalloc/mmprivate.h
   src/xbt/mmalloc/mrealloc.c
-  src/xbt/probes.h
   src/xbt/win32_ucontext.c
   tools/tesh/generate_tesh
   tools/lualib.patch
@@ -1250,23 +1248,6 @@ set(generated_src_files
   src/xbt/automaton/parserPromela.tab.hacc
   )
 
-if(enable_ust)
-  set(simgrid_sources ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c ${simgrid_sources})
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.h
-    COMMAND lttng-gen-tp -o simgrid_ust.c -o simgrid_ust.h ${CMAKE_CURRENT_SOURCE_DIR}/src/probes.tp
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src/
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/probes.tp
-  )
-  ADD_CUSTOM_TARGET(simgrid_ust
-    DEPENDS
-      ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c
-      ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.h
-    )
-  set(generated_src_files ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c ${generated_src_files})
-endif()
-
 foreach(file ${generated_src_files})
   set_source_files_properties(${file} PROPERTIES GENERATED true)
 endforeach(file ${generated_src_files})

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 995dd7f..91aa064 100644 (file)
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -8,10 +8,6 @@
 add_library(simgrid SHARED ${simgrid_sources})
 set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
 
-if(enable_ust)
-  ADD_DEPENDENCIES(simgrid simgrid_ust)
-endif()
-
 add_dependencies(simgrid maintainer_files)
 
 if(enable_model-checking)
@@ -108,12 +104,6 @@ if(HAVE_BACKTRACE_IN_LIBEXECINFO)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lexecinfo")
 endif(HAVE_BACKTRACE_IN_LIBEXECINFO)
 
-# Dependencies from USR
-###################################
-if(enable_ust)
-  set(SIMGRID_DEP "${SIMGRID_DEP} -llttng-ust")
-endif()
-
 # Compute the dependencies of SMPI
 ##################################
 if(enable_smpi AND APPLE)

diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake
index 6b554a4..540753a 100644 (file)
--- a/tools/cmake/Option.cmake
+++ b/tools/cmake/Option.cmake
@@ -19,16 +19,6 @@ option(enable_compile_warnings "Whether compilation warnings should be turned in
 option(enable_maintainer_mode "Whether flex and flexml files should be rebuilt." off)
 option(enable_tracing "Tracing simulations for visualization." on)
 option(enable_latency_bound_tracking "" off)
-
-option(enable_ust "Enable userspace static tracepoint (lttng-ust)." off)
-if(enable_sdt)
-  add_definitions(-DUSE_SDT)
-endif()
-  
-option(enable_sdt "Enable statically defined tracepoint (strace/systemtap)." off)
-if(enable_ust)
-  add_definitions(-DUSE_UST)
-endif()
     
 option(enable_coverage "Whether coverage should be enabled." off)
 mark_as_advanced(enable_coverage)