[mc] C++ify Variable

[simgrid.git] / src / mc / mc_object_info.cpp

diff --git a/src/mc/mc_object_info.cpp b/src/mc/mc_object_info.cpp
index 95f9e2a..b05c69e 100644 (file)
--- a/src/mc/mc_object_info.cpp
+++ b/src/mc/mc_object_info.cpp
@@ -11,11 +11,46 @@
 #include "mc_object_info.h"
 #include "mc_private.h"
 
-extern "C" {
+namespace simgrid {
+namespace mc {
 
-dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *ip)
+// Type
+
+Type::Type()
+{
+  this->type = 0;
+  this->id = 0;
+  this->byte_size = 0;
+  this->element_count = 0;
+  this->is_pointer_type = 0;
+  this->subtype = nullptr;
+  this->full_type = nullptr;
+}
+
+// Type
+
+Variable::Variable()
+{
+  this->dwarf_offset = 0;
+  this->global = 0;
+  this->type = nullptr;
+  this->location_list = {0, nullptr};
+  this->address = nullptr;
+  this->start_scope = 0;
+  this->object_info = nullptr;
+}
+
+Variable::~Variable()
 {
-  xbt_dynar_t dynar = info->functions_index;
+  if (this->location_list.locations)
+    mc_dwarf_location_list_clear(&this->location_list);
+}
+
+// ObjectInformations
+
+dw_frame_t ObjectInformation::find_function(const void *ip) const
+{
+  xbt_dynar_t dynar = this->functions_index;
   mc_function_index_item_t base =
       (mc_function_index_item_t) xbt_dynar_get_ptr(dynar, 0);
   int i = 0;
@@ -30,19 +65,18 @@ dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *
       return base[k].function;
     }
   }
-  return NULL;
+  return nullptr;
 }
 
-dw_variable_t MC_file_object_info_find_variable_by_name(mc_object_info_t info, const char* name)
+mc_variable_t ObjectInformation::find_variable(const char* name) const
 {
   unsigned int cursor = 0;
-  dw_variable_t variable;
-  xbt_dynar_foreach(info->global_variables, cursor, variable){
-    if(!strcmp(name, variable->name))
+  mc_variable_t variable;
+  xbt_dynar_foreach(this->global_variables, cursor, variable)
+    if(variable->name == name)
       return variable;
-  }
-
-  return NULL;
+  return nullptr;
 }
 
 }
+}
\ No newline at end of file