Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 29 Feb 2016 13:06:04 +0000 (14:06 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 29 Feb 2016 13:06:04 +0000 (14:06 +0100)
28 files changed:
.gitignore
doc/doxygen/FAQ.doc
examples/msg/ns3/ns3.c
include/simgrid/s4u/actor.hpp
include/simgrid/simix.h
src/include/surf/surf.h
src/instr/jedule/jedule_sd_binding.cpp
src/mc/RegionSnapshot.cpp
src/mc/RegionSnapshot.hpp
src/mc/mc_checkpoint.cpp
src/mc/mc_compare.cpp
src/mc/mc_snapshot.h
src/msg/msg_environment.cpp
src/msg/msg_gos.cpp
src/msg/msg_mailbox.cpp
src/msg/msg_process.cpp
src/probes.tp [deleted file]
src/s4u/s4u_actor.cpp
src/simix/smx_process.cpp
src/smpi/smpi_global.cpp
src/surf/instr_routing.cpp
src/surf/surf_routing.cpp
src/surf/surf_routing.hpp
src/xbt/probes.h [deleted file]
tools/cmake/DefinePackages.cmake
tools/cmake/MakeLib.cmake
tools/cmake/Modules/FindRubySimgrid.cmake [deleted file]
tools/cmake/Option.cmake

index 9703ad1..d258f85 100644 (file)
 \#*
 .attach_pid* 
 smpitmp-*
-# exuberant ctags
-ctags
-# vim completion
-.ycm_extra_conf.py
-.ycm_extra_conf.pyc
 
 ### cmake
 CTestCustom.cmake
@@ -81,8 +76,6 @@ tools/cmake/test_prog/prog_va_copy.c
 *.bpr
 *.bpf
 ### Documentation
-doc/*.tmp
-doc/example_lists/*
 doc/allclasses-frame.html
 doc/allclasses-noframe.html
 doc/constant-values.html
@@ -146,9 +139,6 @@ examples/msg/cloud/scale
 examples/msg/cloud/simple_vm
 examples/msg/cloud/two_tasks_vm
 examples/msg/energy/consumption/energy_consumption
-examples/msg/energy/e1/e1
-examples/msg/energy/e2/e2
-examples/msg/energy/e3/e3
 examples/msg/energy/onoff/onoff
 examples/msg/energy/pstate/pstate
 examples/msg/gpu/test_MSG_gpu_task_create
@@ -166,15 +156,11 @@ examples/msg/irc_isend/peer
 examples/msg/irc_isend/toto.txt
 examples/msg/kademlia/kademlia
 examples/msg/masterslave/masterslave_arg
-examples/msg/masterslave/masterslave_bypass
 examples/msg/masterslave/masterslave_cluster
-examples/msg/masterslave/masterslave_console
 examples/msg/masterslave/masterslave_failure
-examples/msg/masterslave/masterslave_failure_platfgen
 examples/msg/masterslave/masterslave_forwarder
 examples/msg/masterslave/masterslave_kill
 examples/msg/masterslave/masterslave_mailbox
-examples/msg/masterslave/masterslave_platfgen
 examples/msg/masterslave/toto.txt
 examples/msg/mc/bugged1
 examples/msg/mc/bugged1_liveness
@@ -211,7 +197,6 @@ examples/msg/start_kill_time/sk_time
 examples/msg/suspend/suspend
 examples/msg/tasks.trace
 examples/msg/token_ring/token_ring
-examples/msg/token_ring/token_bypass
 examples/msg/toto.txt
 examples/msg/trace/test_trace_integration
 examples/msg/tracing/categories
@@ -274,7 +259,6 @@ examples/smpi/smpi_replay
 examples/smpi/smpi_traced
 examples/smpi/smpi_traced_simple
 examples/smpi/smpi_traced.trace
-examples/smpi/tmp*
 examples/smpi/toto.txt
 examples/smpi/ttest01
 src/replay/replay
index 11b7ba9..0cdd751 100644 (file)
@@ -49,19 +49,16 @@ We also have a more graphical output. Have a look at section \ref options_tracin
 
 \subsection faq_C Argh! Do I really have to code in C?
 
-Currently bindings on top of MSG are supported for Java, Ruby and Lua. You can find a few
-documentation about them on the doc page. Note that bindings are released separately from the main dist
-and so have their own version numbers.
-
-Moreover If you use C++,
-you should be able to use the SimGrid library as a standard C library
-and everything should work fine (simply <i>link</i> against this
-library; recompiling SimGrid with a C++ compiler won't work and it
-wouldn't help if you could).
-
-For now,
-we do not feel a real demand for any other language. But if you think there is one,
- please speak up!
+We provide Java bindings of the MSG interface, which is the main
+SimGrid user API.
+
+Moreover If you use C++, you should be able to use the SimGrid library
+as a standard C library and everything should work fine (simply
+<i>link</i> against this library; recompiling SimGrid with a C++
+compiler won't work and it wouldn't help if you could).
+
+For now, we do not feel a real demand for any other language. But if
+you think there is one, please speak up!
 
 \section faq_howto Feature related questions
 
index f2fb14b..9d9a3f9 100644 (file)
@@ -82,7 +82,7 @@ static int master(int argc, char *argv[])
   return 0;
 }
 
-int timer(int argc, char *argv[])
+static int timer(int argc, char *argv[])
 {
   double sleep_time;
   double first_sleep;
index 696da86..680bcd6 100644 (file)
@@ -51,7 +51,7 @@ public:
   /** The Actor that is currently running */
   static Actor *current();
   /** Retrieves the actor that have the given PID (or NULL if not existing) */
-  static Actor *byPid(int pid);
+  //static Actor *byPid(int pid); not implemented
 
   /** Retrieves the name of that actor */
   const char*getName();
index c1b403c..dc95bd2 100644 (file)
@@ -244,8 +244,8 @@ XBT_PUBLIC(void*) SIMIX_host_self_get_data(void);
 XBT_PUBLIC(int) SIMIX_process_count(void);
 XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
 XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
-XBT_PUBLIC(void) SIMIX_process_self_set_data(smx_process_t self, void *data);
-XBT_PUBLIC(void*) SIMIX_process_self_get_data(smx_process_t self);
+XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data);
+XBT_PUBLIC(void*) SIMIX_process_self_get_data(void);
 XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t);
 XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c);
 XBT_PUBLIC(int) SIMIX_process_has_pending_comms(smx_process_t process);
index 4605e69..771db26 100644 (file)
@@ -779,7 +779,7 @@ XBT_PUBLIC_DATA(xbt_dict_t) watched_hosts_lib;
 XBT_PUBLIC_DATA(AS_t) surf_AS_get_routing_root(void);
 XBT_PUBLIC_DATA(const char *) surf_AS_get_name(AS_t as);
 XBT_PUBLIC_DATA(AS_t) surf_AS_get_by_name(const char * name);
-XBT_PUBLIC_DATA(xbt_dict_t) surf_AS_get_routing_sons(AS_t as);
+XBT_PUBLIC_DATA(xbt_dict_t) surf_AS_get_children(AS_t as);
 XBT_PUBLIC_DATA(xbt_dynar_t) surf_AS_get_hosts(AS_t as);
 XBT_PUBLIC_DATA(void) surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
 
index d780d3c..e2a09f4 100644 (file)
@@ -58,7 +58,7 @@ static void create_hierarchy(AS_t current_comp,
   xbt_dict_cursor_t cursor = NULL;
   char *key;
   AS_t elem;
-  xbt_dict_t routing_sons = surf_AS_get_routing_sons(current_comp);
+  xbt_dict_t routing_sons = surf_AS_get_children(current_comp);
 
   if (xbt_dict_is_empty(routing_sons)) {
     // I am no AS
index 7e96951..a045b2f 100644 (file)
@@ -39,36 +39,63 @@ const char* to_cstr(RegionType region)
   }
 }
 
-void data_deleter::operator()(void* p) const
+buffer::buffer(std::size_t size, Type type) : size_(size), type_(type)
 {
   switch(type_) {
-  case Free:
-    std::free(p);
+  case Type::Malloc:
+    data_ = malloc(size_);
     break;
-  case Munmap:
-    munmap(p, size_);
+  case Type::Mmap:
+    data_ = mmap(nullptr, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0);
+    if (data_ == MAP_FAILED) {
+      data_ = nullptr;
+      size_ = 0;
+      type_ = Type::Malloc;
+      throw std::bad_alloc();
+    }
+    break;
+  default:
+    abort();
+  }
+}
+
+void buffer::clear() noexcept
+{
+  switch(type_) {
+  case Type::Malloc:
+    std::free(data_);
     break;
+  case Type::Mmap:
+    if (munmap(data_, size_) != 0)
+      abort();
+    break;
+  default:
+    abort();
   }
+  data_ = nullptr;
+  size_ = 0;
+  type_ = Type::Malloc;
 }
 
 RegionSnapshot dense_region(
   RegionType region_type,
   void *start_addr, void* permanent_addr, size_t size)
 {
-  simgrid::mc::RegionSnapshot::flat_data_ptr data;
-  if (!_sg_mc_ksm)
-    data = simgrid::mc::RegionSnapshot::flat_data_ptr((char*) std::malloc(size));
-  else {
-    char* ptr = (char*) mmap(nullptr, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0);
-    if (ptr == MAP_FAILED)
-      throw std::bad_alloc();
-    simgrid::mc::data_deleter deleter(
-      simgrid::mc::data_deleter::Munmap, size);
-    data = simgrid::mc::RegionSnapshot::flat_data_ptr(ptr, deleter);
-  }
+  simgrid::mc::buffer::Type buffer_type;
+  if (_sg_mc_ksm)
+    // We use mmap to allocate the memory in order to madvise it.
+    // We don't want to madvise the main heap.
+    // Moreover we get aligned pgaes which is merge-friendly.
+    buffer_type = simgrid::mc::buffer::Type::Mmap;
+  else
+    buffer_type = simgrid::mc::buffer::Type::Malloc;
+
+  simgrid::mc::buffer data(size, buffer_type);
+
   mc_model_checker->process().read_bytes(data.get(), size,
     remote(permanent_addr),
     simgrid::mc::ProcessIndexDisabled);
+
   if (_sg_mc_ksm)
     // Mark the region as mergeable *after* we have written into it.
     // There no point to let KSM do the hard work before that.
@@ -79,7 +106,7 @@ RegionSnapshot dense_region(
   region.flat_data(std::move(data));
 
   XBT_DEBUG("New region : type : %s, data : %p (real addr %p), size : %zu",
-            to_cstr(region_type), region.flat_data(), permanent_addr, size);
+            to_cstr(region_type), region.flat_data().get(), permanent_addr, size);
   return std::move(region);
 }
 
index a003191..f1007ac 100644 (file)
@@ -37,22 +37,53 @@ enum class StorageType {
   Privatized = 3
 };
 
-class data_deleter {
+class buffer {
 public:
-  enum Type {
-    Free,
-    Munmap
+  enum class Type {
+    Malloc,
+    Mmap
   };
 private:
-  Type type_;
+  void* data_ = nullptr;
   std::size_t size_;
+  Type type_ = Type::Malloc;
 public:
-  data_deleter() : type_(Free) {}
-  data_deleter(Type type, std::size_t size) : type_(type), size_(size) {}
-  void operator()(void* p) const;
-};
+  buffer() {}
+  buffer(std::size_t size, Type type = Type::Malloc);
+  buffer(void* data, std::size_t size, Type type = Type::Malloc) :
+    data_(data), size_(size), type_(type) {}
+  void clear() noexcept;
+  ~buffer() noexcept { clear(); }
+
+  // No copy
+  buffer(buffer const& buffer) = delete;
+  buffer& operator=(buffer const& buffer) = delete;
+
+  // Move
+  buffer(buffer&& that) noexcept
+    : data_(that.data_), size_(that.size_), type_(that.type_)
+  {
+    that.data_ = nullptr;
+    that.size_ = 0;
+    that.type_ = Type::Malloc;
+  }
+  buffer& operator=(buffer&& that) noexcept
+  {
+    clear();
+    data_ = that.data_;
+    size_ = that.size_;
+    type_ = that.type_;
+    that.data_ = nullptr;
+    that.size_ = 0;
+    that.type_ = Type::Malloc;
+    return *this;
+  }
 
-typedef std::unique_ptr<char[], data_deleter> unique_data_ptr;
+  void* get()              { return data_; }
+  const void* get()  const { return data_; }
+  std::size_t size() const { return size_; }
+  Type type()        const { return type_; }
+};
 
 /** A copy/snapshot of a given memory region
  *
@@ -77,8 +108,6 @@ public:
   static const RegionType UnknownRegion = RegionType::Unknown;
   static const RegionType HeapRegion = RegionType::Heap;
   static const RegionType DataRegion = RegionType::Data;
-public:
-  typedef unique_data_ptr flat_data_ptr;
 private:
   RegionType region_type_;
   StorageType storage_type_;
@@ -101,7 +130,7 @@ private:
    * */
   void *permanent_addr_;
 
-  flat_data_ptr flat_data_;
+  buffer flat_data_;
   ChunkedData page_numbers_;
   std::vector<RegionSnapshot> privatized_regions_;
 public:
@@ -160,7 +189,7 @@ public:
     storage_type_ = StorageType::NoData;
     privatized_regions_.clear();
     page_numbers_.clear();
-    flat_data_.reset();
+    flat_data_.clear();
     object_info_ = nullptr;
     start_addr_ = nullptr;
     size_ = 0;
@@ -170,24 +199,25 @@ public:
   void clear_data()
   {
     storage_type_ = StorageType::NoData;
-    flat_data_.reset();
+    flat_data_.clear();
     page_numbers_.clear();
     privatized_regions_.clear();
   }
   
-  void flat_data(flat_data_ptr data)
+  void flat_data(buffer data)
   {
     storage_type_ = StorageType::Flat;
     flat_data_ = std::move(data);
     page_numbers_.clear();
     privatized_regions_.clear();
   }
-  const char* flat_data() const { return flat_data_.get(); }
+  const buffer& flat_data() const { return flat_data_; }
+  buffer& flat_data()             { return flat_data_; }
 
   void page_data(ChunkedData page_data)
   {
     storage_type_ = StorageType::Chunked;
-    flat_data_.reset();
+    flat_data_.clear();
     page_numbers_ = std::move(page_data);
     privatized_regions_.clear();
   }
@@ -196,7 +226,7 @@ public:
   void privatized_data(std::vector<RegionSnapshot> data)
   {
     storage_type_ = StorageType::Privatized;
-    flat_data_.reset();
+    flat_data_.clear();
     page_numbers_.clear();
     privatized_regions_ = std::move(data);
   }
index baf90a2..07fa867 100644 (file)
@@ -66,7 +66,7 @@ static void restore(mc_mem_region_t region)
     break;
 
   case simgrid::mc::StorageType::Flat:
-    mc_model_checker->process().write_bytes(region->flat_data(),
+    mc_model_checker->process().write_bytes(region->flat_data().get(),
       region->size(), region->permanent_address());
     break;
 
index 4c1e7df..00ead0e 100644 (file)
@@ -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);
index 45db54c..a1e7399 100644 (file)
@@ -55,7 +55,7 @@ void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int pr
   case simgrid::mc::StorageType::Flat:
     {
       uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address();
-      return (void *) ((uintptr_t) region->flat_data() + offset);
+      return (void *) ((uintptr_t) region->flat_data().get() + offset);
     }
 
   case simgrid::mc::StorageType::Chunked:
@@ -243,7 +243,7 @@ const void* MC_region_read(
     xbt_die("Storage type not supported");
 
   case simgrid::mc::StorageType::Flat:
-    return (char*) region->flat_data() + offset;
+    return (char*) region->flat_data().get() + offset;
 
   case simgrid::mc::StorageType::Chunked:
     {
index d070253..067eb5f 100644 (file)
@@ -60,7 +60,7 @@ msg_as_t MSG_environment_as_get_by_name(const char * name) {
 }
 
 xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
-  xbt_dict_t res = surf_AS_get_routing_sons(as);
+  xbt_dict_t res = surf_AS_get_children(as);
   return res;
 }
 
index cf71980..b49ab64 100644 (file)
@@ -44,8 +44,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
 {
   xbt_ex_t e;
   simdata_task_t simdata = task->simdata;
-  msg_process_t self = SIMIX_process_self();
-  simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(self);
+  simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data();
   e_smx_state_t comp_state;
   msg_error_t status = MSG_OK;
 
@@ -297,7 +296,7 @@ static XBT_INLINE msg_comm_t MSG_task_isend_internal(msg_task_t task, const char
   /* Prepare the task to send */
   t_simdata = task->simdata;
   t_simdata->sender = process;
-  t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host;
+  t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data())->m_host;
 
   if (t_simdata->isused != 0) {
     if (msg_global->debug_multiple_use){
index 74d330d..cb67a3f 100644 (file)
@@ -154,14 +154,14 @@ msg_error_t MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
   msg_error_t ret = MSG_OK;
   simdata_task_t t_simdata = NULL;
   msg_process_t process = MSG_process_self();
-  simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(process);
+  simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data();
 
   int call_end = TRACE_msg_task_put_start(task);    //must be after CHECK_HOST()
 
   /* Prepare the task to send */
   t_simdata = task->simdata;
   t_simdata->sender = process;
-  t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host;
+  t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data())->m_host;
 
   if (t_simdata->isused != 0) {
     if (msg_global->debug_multiple_use){
index 5ce8704..7ddd2c4 100644 (file)
@@ -34,8 +34,8 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
   // get the MSG process from the SIMIX process
   if (smx_proc == SIMIX_process_self()) {
     /* avoid a SIMIX request if this function is called by the process itself */
-    msg_proc = (simdata_process_t) SIMIX_process_self_get_data(smx_proc);
-    SIMIX_process_self_set_data(smx_proc, NULL);
+    msg_proc = (simdata_process_t) SIMIX_process_self_get_data();
+    SIMIX_process_self_set_data(NULL);
   } else {
     msg_proc = (simdata_process_t) simcall_process_get_data(smx_proc);
     simcall_process_set_data(smx_proc, NULL);
@@ -294,7 +294,7 @@ msg_host_t MSG_process_get_host(msg_process_t process)
 {
   simdata_process_t simdata;
   if (process == NULL) {
-    simdata = (simdata_process_t) SIMIX_process_self_get_data(SIMIX_process_self());
+    simdata = (simdata_process_t) SIMIX_process_self_get_data();
   }
   else {
     simdata = (simdata_process_t) simcall_process_get_data(process);
diff --git a/src/probes.tp b/src/probes.tp
deleted file mode 100644 (file)
index 6ccc0aa..0000000
+++ /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)
index daf355b..4e7594c 100644 (file)
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 
 /* C main function of a actor, running this->main */
-static int s4u_actor_runner(int argc, char **argv) {
-
-  smx_process_t smx_proc = SIMIX_process_self();
-  simgrid::s4u::Actor *actor = (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
+static int s4u_actor_runner(int argc, char **argv)
+{
+  simgrid::s4u::Actor *actor = (simgrid::s4u::Actor*) SIMIX_process_self_get_data();
   int res = actor->main(argc,argv);
   return res;
 }
@@ -45,16 +44,14 @@ int s4u::Actor::main(int argc, char **argv) {
   fprintf(stderr,"Error: You should override the method main(int, char**) in Actor class %s\n",getName());
   return 0;
 }
-s4u::Actor *s4u::Actor::current() {
+s4u::Actor *s4u::Actor::current()
+{
   smx_process_t smx_proc = SIMIX_process_self();
-  simgrid::s4u::Actor* res = (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
+  simgrid::s4u::Actor* res = (simgrid::s4u::Actor*) SIMIX_process_self_get_data();
   if (res == NULL) // The smx_process was not created by S4U (but by deployment?). Embed it in a S4U object
     res = new Actor(smx_proc);
   return res;
 }
-s4u::Actor *s4u::Actor::byPid(int pid) {
-  return (simgrid::s4u::Actor*) SIMIX_process_self_get_data(SIMIX_process_from_PID(pid));
-}
 
 void s4u::Actor::setAutoRestart(bool autorestart) {
   simcall_process_auto_restart_set(p_smx_process,autorestart);
index f61113a..99063d9 100644 (file)
@@ -768,9 +768,9 @@ int SIMIX_process_get_PPID(smx_process_t self){
     return self->ppid;
 }
 
-void* SIMIX_process_self_get_data(smx_process_t self)
+void* SIMIX_process_self_get_data()
 {
-  xbt_assert(self == SIMIX_process_self(), "This is not the current process");
+  smx_process_t self = SIMIX_process_self();
 
   if (!self) {
     return NULL;
@@ -778,9 +778,9 @@ void* SIMIX_process_self_get_data(smx_process_t self)
   return SIMIX_process_get_data(self);
 }
 
-void SIMIX_process_self_set_data(smx_process_t self, void *data)
+void SIMIX_process_self_set_data(void *data)
 {
-  xbt_assert(self == SIMIX_process_self(), "This is not the current process");
+  smx_process_t self = SIMIX_process_self();
 
   SIMIX_process_set_data(self, data);
 }
index e9ef952..de9a238 100644 (file)
@@ -214,7 +214,7 @@ int smpi_global_size(void)
 
 smpi_process_data_t smpi_process_data(void)
 {
-  simdata_process_t simdata = static_cast<simdata_process_t>(SIMIX_process_self_get_data(SIMIX_process_self()));
+  simdata_process_t simdata = static_cast<simdata_process_t>(SIMIX_process_self_get_data());
   return static_cast<smpi_process_data_t>(simdata->data);
 }
 
index fc53997..d53c5d2 100644 (file)
@@ -130,12 +130,12 @@ static void recursiveGraphExtraction (simgrid::surf::As *rc, container_t contain
     return;
   }
   XBT_DEBUG ("Graph extraction for routing_component = %s", rc->name_);
-  if (!xbt_dict_is_empty(rc->sons_)){
+  if (!xbt_dict_is_empty(rc->children_)){
     xbt_dict_cursor_t cursor = NULL;
     AS_t rc_son;
     char *child_name;
     //bottom-up recursion
-    xbt_dict_foreach(surf_AS_get_routing_sons(rc), cursor, child_name, rc_son) {
+    xbt_dict_foreach(surf_AS_get_children(rc), cursor, child_name, rc_son) {
       container_t child_container = (container_t) xbt_dict_get (
         container->children, surf_AS_get_name(rc_son));
       recursiveGraphExtraction (rc_son, child_container, filter);
@@ -446,12 +446,12 @@ int instr_platform_traced ()
 static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
     AS_t rc, container_t container)
 {
-  if (!xbt_dict_is_empty(surf_AS_get_routing_sons(rc))){
+  if (!xbt_dict_is_empty(surf_AS_get_children(rc))){
     xbt_dict_cursor_t cursor = NULL;
     AS_t rc_son;
     char *child_name;
     //bottom-up recursion
-    xbt_dict_foreach(surf_AS_get_routing_sons(rc), cursor, child_name, rc_son) {
+    xbt_dict_foreach(surf_AS_get_children(rc), cursor, child_name, rc_son) {
       container_t child_container = (container_t) xbt_dict_get (
         container->children, surf_AS_get_name(rc_son));
       recursiveXBTGraphExtraction (graph, nodes, edges, rc_son, child_container);
index b09f0e7..9b64a4e 100644 (file)
@@ -37,18 +37,16 @@ namespace surf {
     xbt_dict_cursor_t cursor = NULL;
     char *key;
     AS_t elem;
-    xbt_dict_foreach(sons_, cursor, key, elem) {
+    xbt_dict_foreach(children_, cursor, key, elem) {
       delete (As*)elem;
     }
 
 
-    xbt_dict_free(&sons_);
+    xbt_dict_free(&children_);
     xbt_dynar_free(&vertices_);
     xbt_dynar_free(&upDownLinks);
-    if (nullptr != bypassRoutes_)
-      for (auto &kv : *bypassRoutes_)
-        delete kv.second;
-    delete bypassRoutes_;
+    for (auto &kv : bypassRoutes_)
+      delete kv.second;
     xbt_free(name_);
     delete netcard_;
   }
@@ -75,15 +73,15 @@ namespace surf {
   {
     // If never set a bypass route return NULL without any further computations
     XBT_DEBUG("generic_get_bypassroute from %s to %s", src->name(), dst->name());
-    if (bypassRoutes_ == nullptr)
+    if (bypassRoutes_.empty())
       return nullptr;
 
     std::vector<Link*> *bypassedRoute = nullptr;
 
     if(dst->containingAS() == this && src->containingAS() == this ){
       char *route_name = bprintf("%s#%s", src->name(), dst->name());
-      if (bypassRoutes_->find(route_name) != bypassRoutes_->end()) {
-        bypassedRoute = bypassRoutes_->at(route_name);
+      if (bypassRoutes_.find(route_name) != bypassRoutes_.end()) {
+        bypassedRoute = bypassRoutes_.at(route_name);
         XBT_DEBUG("Found a bypass route with %zu links",bypassedRoute->size());
       }
       free(route_name);
@@ -136,8 +134,8 @@ namespace surf {
           char *route_name = bprintf("%s#%s",
               (*(As **) (xbt_dynar_get_ptr(path_src, i)))->name_,
               (*(As **) (xbt_dynar_get_ptr(path_dst, max)))->name_);
-          if (bypassRoutes_->find(route_name) != bypassRoutes_->end())
-            bypassedRoute = bypassRoutes_->at(route_name);
+          if (bypassRoutes_.find(route_name) != bypassRoutes_.end())
+            bypassedRoute = bypassRoutes_.at(route_name);
           xbt_free(route_name);
         }
         if (bypassedRoute)
@@ -146,8 +144,8 @@ namespace surf {
           char *route_name = bprintf("%s#%s",
               (*(As **) (xbt_dynar_get_ptr(path_src, max)))->name_,
               (*(As **) (xbt_dynar_get_ptr(path_dst, i)))->name_);
-          if (bypassRoutes_->find(route_name) != bypassRoutes_->end())
-            bypassedRoute = bypassRoutes_->at(route_name);
+          if (bypassRoutes_.find(route_name) != bypassRoutes_.end())
+            bypassedRoute = bypassRoutes_.at(route_name);
           xbt_free(route_name);
         }
         if (bypassedRoute)
@@ -162,8 +160,8 @@ namespace surf {
             (*(As **) (xbt_dynar_get_ptr(path_src, max)))->name_,
             (*(As **) (xbt_dynar_get_ptr(path_dst, max)))->name_);
 
-        if (bypassRoutes_->find(route_name) != bypassRoutes_->end())
-          bypassedRoute = bypassRoutes_->at(route_name);
+        if (bypassRoutes_.find(route_name) != bypassRoutes_.end())
+          bypassedRoute = bypassRoutes_.at(route_name);
         xbt_free(route_name);
       }
       if (bypassedRoute)
@@ -180,9 +178,6 @@ namespace surf {
     const char *src = e_route->src;
     const char *dst = e_route->dst;
 
-    if(bypassRoutes_ == nullptr)
-      bypassRoutes_ = new std::map<std::string, std::vector<Link*>*>();
-
     char *route_name = bprintf("%s#%s", src, dst);
 
     /* Argument validity checks */
@@ -191,13 +186,12 @@ namespace surf {
           src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
       xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
           src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
-      xbt_assert(bypassRoutes_->find(route_name) == bypassRoutes_->end(),
-          "The bypass route between %s@%s and %s@%s already exists.",
+      xbt_assert(bypassRoutes_.find(route_name) == bypassRoutes_.end(), "The bypass route between %s@%s and %s@%s already exists.",
           src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
     } else {
       XBT_DEBUG("Load bypassRoute from %s to %s", src, dst);
-      xbt_assert(!e_route->link_list->empty(),                            "Bypass route between %s and %s cannot be empty.",    src, dst);
-      xbt_assert(bypassRoutes_->find(route_name) == bypassRoutes_->end(), "The bypass route between %s and %s already exists.", src, dst);
+      xbt_assert(!e_route->link_list->empty(),                          "Bypass route between %s and %s cannot be empty.",    src, dst);
+      xbt_assert(bypassRoutes_.find(route_name) == bypassRoutes_.end(), "The bypass route between %s and %s already exists.", src, dst);
     }
 
     /* Build a copy that will be stored in the dict */
@@ -206,7 +200,7 @@ namespace surf {
       newRoute->push_back(link);
 
     /* Store it */
-    bypassRoutes_->insert({route_name, newRoute});
+    bypassRoutes_.insert({route_name, newRoute});
     xbt_free(route_name);
   }
 
@@ -342,7 +336,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
     netcard->setId(-1);
   } else if (current_routing != NULL && routing_platf->root_ != NULL) {
 
-    xbt_assert(!xbt_dict_get_or_null(current_routing->sons_, AS->id),
+    xbt_assert(!xbt_dict_get_or_null(current_routing->children_, AS->id),
                "The AS \"%s\" already exists", AS->id);
     /* it is a part of the tree */
     new_as->father_ = current_routing;
@@ -350,7 +344,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
     if (current_routing->hierarchy_ == SURF_ROUTING_NULL)
       current_routing->hierarchy_ = SURF_ROUTING_RECURSIVE;
     /* add to the sons dictionary */
-    xbt_dict_set(current_routing->sons_, AS->id, (void *) new_as, NULL);
+    xbt_dict_set(current_routing->children_, AS->id, (void *) new_as, NULL);
     /* add to the father element list */
     netcard->setId(current_routing->addComponent(netcard));
   } else {
@@ -540,7 +534,7 @@ static xbt_dynar_t _recursiveGetOneLinkRoutes(As *rc)
   char *key;
   xbt_dict_cursor_t cursor = NULL;
   AS_t rc_child;
-  xbt_dict_foreach(rc->sons_, cursor, key, rc_child) {
+  xbt_dict_foreach(rc->children_, cursor, key, rc_child) {
     xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child);
     if (onelink_child)
       xbt_dynar_merge(&ret,&onelink_child);
@@ -786,7 +780,7 @@ static simgrid::surf::As *surf_AS_recursive_get_by_name(simgrid::surf::As *curre
   if(!strcmp(current->name_, name))
     return current;
 
-  xbt_dict_foreach(current->sons_, cursor, key, elem) {
+  xbt_dict_foreach(current->children_, cursor, key, elem) {
     tmp = surf_AS_recursive_get_by_name(elem, name);
     if(tmp != NULL ) {
         break;
@@ -803,9 +797,9 @@ simgrid::surf::As *surf_AS_get_by_name(const char * name)
   return as;
 }
 
-xbt_dict_t surf_AS_get_routing_sons(simgrid::surf::As *as)
+xbt_dict_t surf_AS_get_children(simgrid::surf::As *as)
 {
-  return as->sons_;
+  return as->children_;
 }
 
 xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as)
index c64d677..bd09517 100644 (file)
@@ -68,12 +68,12 @@ public:
   char *name_ = nullptr;
   NetCard *netcard_ = nullptr; // Our representative in the father AS
   As *father_ = nullptr;
-  xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL); // sub-ASes
+  xbt_dict_t children_ = xbt_dict_new_homogeneous(NULL); // sub-ASes
   xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),NULL); // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
 
 private:
   bool sealed_ = false; // We cannot add more content when sealed
-  std::map<std::string, std::vector<Link*>*> *bypassRoutes_ = nullptr;
+  std::map<std::string, std::vector<Link*>*> bypassRoutes_;
 
 public:
   /**
diff --git a/src/xbt/probes.h b/src/xbt/probes.h
deleted file mode 100644 (file)
index 187e4cd..0000000
+++ /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
index a02f7d3..bc04b32 100644 (file)
@@ -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
@@ -1144,7 +1142,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindRngStream.cmake
-  tools/cmake/Modules/FindRubySimgrid.cmake
   tools/cmake/Modules/FindSimGrid.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
@@ -1251,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})
index 995dd7f..91aa064 100644 (file)
@@ -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/Modules/FindRubySimgrid.cmake b/tools/cmake/Modules/FindRubySimgrid.cmake
deleted file mode 100644 (file)
index 9228fd8..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-include(FindRuby)
-
-if(RUBY_EXECUTABLE)
-  message(STATUS "Found ruby:  ${RUBY_EXECUTABLE}")
-endif()
-
-message(STATUS "Looking for ruby.h")
-if(RUBY_INCLUDE_DIR)
-  message(STATUS "Looking for ruby.h - found")
-else()
-  message(STATUS "Looking for ruby.h - not found")
-endif()
-
-message(STATUS "Looking for confi.h")
-if(RUBY_CONFIG_INCLUDE_DIR)
-  message(STATUS "Looking for config.h - found")
-else()
-  message(STATUS "Looking for config.h - not found")
-endif()
-
-message(STATUS "Looking for lib ruby")
-if(RUBY_LIBRARY)
-  message(STATUS "Looking for lib ruby - found")
-else()
-  message(STATUS "Looking for lib ruby - not found")
-endif()
-
-if(RUBY_LIBRARY)
-  set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
-  message(STATUS "Lib ruby version: ${LIB_RUBY_VERSION}")
-  if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
-    string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY})
-    if(NOT RUBY_LIBRARY_NAME)
-      set(RUBY_LIBRARY_NAME ruby)
-    endif()
-    string(REGEX REPLACE "/libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY})
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h
-    string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation)
-    if(NOT operation)
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_INCLUDE_DIR} ") #path to ruby.h
-    endif()
-    ADD_DEFINITIONS("-I${CMAKE_HOME_DIRECTORY}/src/bindings/ruby -I${CMAKE_HOME_DIRECTORY}/src/simix")
-    SET(HAVE_RUBY 1)
-  else()
-    message(STATUS "Warning: Ruby bindings need version 1.9.x, but found version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x")
-    SET(HAVE_RUBY 0)
-  endif()
-else()
-  SET(HAVE_RUBY 0)
-endif()
-
-if(NOT RUBY_EXECUTABLE)
-  message(STATUS "Warning: you are missing the ruby executable, so you can compile and build examples but can't execute them!")
-endif()
\ No newline at end of file
index 6b554a4..540753a 100644 (file)
@@ -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)