Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fix bugs due to subVariable method
[simgrid.git] / src / instr / instr_trace.cpp
index 15c0158..0580aa2 100644 (file)
@@ -18,13 +18,9 @@ void print_NULL(paje_event_t event){}
 /* The active set of functions for the selected trace format
  * By default, they all do nothing, hence the print_NULL to avoid segfaults */
 
-s_instr_trace_writer_t active_writer = {
-    print_NULL, print_NULL, print_NULL, print_NULL,
-    print_NULL, print_NULL, print_NULL, print_NULL,
-    print_NULL, print_NULL, print_NULL, print_NULL,
-    print_NULL, print_NULL, print_NULL, print_NULL,
-    print_NULL, print_NULL
-};
+s_instr_trace_writer_t active_writer = {&print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL,
+                                        &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL,
+                                        &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL};
 
 std::vector<paje_event_t> buffer;
 
@@ -129,12 +125,12 @@ static void free_paje_event (paje_event_t event)
 
 void new_pajeDefineContainerType(type_t type)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_DefineContainerType;
-  event->timestamp = 0;
-  event->print = active_writer.print_DefineContainerType;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_defineContainerType_t, 1);
+  paje_event_t event                           = xbt_new0(s_paje_event_t, 1);
+  event->event_type                            = PAJE_DefineContainerType;
+  event->timestamp                             = 0;
+  event->print                                 = active_writer.print_DefineContainerType;
+  event->free                                  = &free_paje_event;
+  event->data                                  = xbt_new0(s_defineContainerType_t, 1);
   ((defineContainerType_t)(event->data))->type = type;
 
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
@@ -146,12 +142,12 @@ void new_pajeDefineContainerType(type_t type)
 
 void new_pajeDefineVariableType(type_t type)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_DefineVariableType;
-  event->timestamp = 0;
-  event->print = active_writer.print_DefineVariableType;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_defineVariableType_t, 1);
+  paje_event_t event                          = xbt_new0(s_paje_event_t, 1);
+  event->event_type                           = PAJE_DefineVariableType;
+  event->timestamp                            = 0;
+  event->print                                = active_writer.print_DefineVariableType;
+  event->free                                 = &free_paje_event;
+  event->data                                 = xbt_new0(s_defineVariableType_t, 1);
   ((defineVariableType_t)(event->data))->type = type;
 
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
@@ -163,12 +159,12 @@ void new_pajeDefineVariableType(type_t type)
 
 void new_pajeDefineStateType(type_t type)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_DefineStateType;
-  event->timestamp = 0;
-  event->print = active_writer.print_DefineStateType;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_defineStateType_t, 1);
+  paje_event_t event                       = xbt_new0(s_paje_event_t, 1);
+  event->event_type                        = PAJE_DefineStateType;
+  event->timestamp                         = 0;
+  event->print                             = active_writer.print_DefineStateType;
+  event->free                              = &free_paje_event;
+  event->data                              = xbt_new0(s_defineStateType_t, 1);
   ((defineStateType_t)(event->data))->type = type;
 
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
@@ -180,12 +176,12 @@ void new_pajeDefineStateType(type_t type)
 
 void new_pajeDefineEventType(type_t type)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_DefineEventType;
-  event->timestamp = 0;
-  event->print = active_writer.print_DefineEventType;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_defineEventType_t, 1);
+  paje_event_t event                       = xbt_new0(s_paje_event_t, 1);
+  event->event_type                        = PAJE_DefineEventType;
+  event->timestamp                         = 0;
+  event->print                             = active_writer.print_DefineEventType;
+  event->free                              = &free_paje_event;
+  event->data                              = xbt_new0(s_defineEventType_t, 1);
   ((defineEventType_t)(event->data))->type = type;
 
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
@@ -197,15 +193,15 @@ void new_pajeDefineEventType(type_t type)
 
 void new_pajeDefineLinkType(type_t type, type_t source, type_t dest)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_DefineLinkType;
-  event->timestamp = 0;
-  event->print = active_writer.print_DefineLinkType;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_defineLinkType_t, 1);
-  ((defineLinkType_t)(event->data))->type = type;
+  paje_event_t event                        = xbt_new0(s_paje_event_t, 1);
+  event->event_type                         = PAJE_DefineLinkType;
+  event->timestamp                          = 0;
+  event->print                              = active_writer.print_DefineLinkType;
+  event->free                               = &free_paje_event;
+  event->data                               = xbt_new0(s_defineLinkType_t, 1);
+  ((defineLinkType_t)(event->data))->type   = type;
   ((defineLinkType_t)(event->data))->source = source;
-  ((defineLinkType_t)(event->data))->dest = dest;
+  ((defineLinkType_t)(event->data))->dest   = dest;
 
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
 
@@ -216,12 +212,12 @@ void new_pajeDefineLinkType(type_t type, type_t source, type_t dest)
 
 void new_pajeDefineEntityValue (val_t value)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_DefineEntityValue;
-  event->timestamp = 0;
-  event->print = active_writer.print_DefineEntityValue;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_defineEntityValue_t, 1);
+  paje_event_t event                          = xbt_new0(s_paje_event_t, 1);
+  event->event_type                           = PAJE_DefineEntityValue;
+  event->timestamp                            = 0;
+  event->print                                = active_writer.print_DefineEntityValue;
+  event->free                                 = &free_paje_event;
+  event->data                                 = xbt_new0(s_defineEntityValue_t, 1);
   ((defineEntityValue_t)(event->data))->value = value;
 
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
@@ -233,12 +229,12 @@ void new_pajeDefineEntityValue (val_t value)
 
 void new_pajeCreateContainer (container_t container)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_CreateContainer;
-  event->timestamp = SIMIX_get_clock();
-  event->print = active_writer.print_CreateContainer;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_createContainer_t, 1);
+  paje_event_t event                            = xbt_new0(s_paje_event_t, 1);
+  event->event_type                             = PAJE_CreateContainer;
+  event->timestamp                              = SIMIX_get_clock();
+  event->print                                  = active_writer.print_CreateContainer;
+  event->free                                   = &free_paje_event;
+  event->data                                   = xbt_new0(s_createContainer_t, 1);
   ((createContainer_t)(event->data))->container = container;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
@@ -250,12 +246,12 @@ void new_pajeCreateContainer (container_t container)
 
 void new_pajeDestroyContainer (container_t container)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_DestroyContainer;
-  event->timestamp = SIMIX_get_clock();
-  event->print = active_writer.print_DestroyContainer;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_destroyContainer_t, 1);
+  paje_event_t event                             = xbt_new0(s_paje_event_t, 1);
+  event->event_type                              = PAJE_DestroyContainer;
+  event->timestamp                               = SIMIX_get_clock();
+  event->print                                   = active_writer.print_DestroyContainer;
+  event->free                                    = &free_paje_event;
+  event->data                                    = xbt_new0(s_destroyContainer_t, 1);
   ((destroyContainer_t)(event->data))->container = container;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
@@ -267,15 +263,15 @@ void new_pajeDestroyContainer (container_t container)
 
 void new_pajeSetVariable (double timestamp, container_t container, type_t type, double value)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_SetVariable;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_SetVariable;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_setVariable_t, 1);
-  ((setVariable_t)(event->data))->type = type;
+  paje_event_t event                        = xbt_new0(s_paje_event_t, 1);
+  event->event_type                         = PAJE_SetVariable;
+  event->timestamp                          = timestamp;
+  event->print                              = active_writer.print_SetVariable;
+  event->free                               = &free_paje_event;
+  event->data                               = xbt_new0(s_setVariable_t, 1);
+  ((setVariable_t)(event->data))->type      = type;
   ((setVariable_t)(event->data))->container = container;
-  ((setVariable_t)(event->data))->value = value;
+  ((setVariable_t)(event->data))->value     = value;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
 
@@ -285,32 +281,32 @@ void new_pajeSetVariable (double timestamp, container_t container, type_t type,
 
 void new_pajeAddVariable (double timestamp, container_t container, type_t type, double value)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_AddVariable;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_AddVariable;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_addVariable_t, 1);
-  ((addVariable_t)(event->data))->type = type;
+  paje_event_t event                        = xbt_new0(s_paje_event_t, 1);
+  event->event_type                         = PAJE_AddVariable;
+  event->timestamp                          = timestamp;
+  event->print                              = active_writer.print_AddVariable;
+  event->free                               = &free_paje_event;
+  event->data                               = xbt_new0(s_addVariable_t, 1);
+  ((addVariable_t)(event->data))->type      = type;
   ((addVariable_t)(event->data))->container = container;
-  ((addVariable_t)(event->data))->value = value;
+  ((addVariable_t)(event->data))->value     = value;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
 
-void new_pajeSubVariable (double timestamp, container_t container, type_t type, double value)
+void s_subVariable_t::new_pajeSubVariable (double timestamp, container_t container, type_t type, double value)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_SubVariable;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_SubVariable;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_subVariable_t, 1);
-  ((subVariable_t)(event->data))->type = type;
+  paje_event_t event                        = xbt_new0(s_paje_event_t, 1);
+  event->event_type                         = PAJE_SubVariable;
+  event->timestamp                          = timestamp;
+  event->print                              = active_writer.print_SubVariable;
+  event->free                               = &free_paje_event;
+  event->data                               = xbt_new0(s_subVariable_t, 1);
+  ((subVariable_t)(event->data))->type      = type;
   ((subVariable_t)(event->data))->container = container;
-  ((subVariable_t)(event->data))->value = value;
+  ((subVariable_t)(event->data))->value     = value;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
 
@@ -319,15 +315,15 @@ void new_pajeSubVariable (double timestamp, container_t container, type_t type,
 
 void new_pajeSetState (double timestamp, container_t container, type_t type, val_t value)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_SetState;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_SetState;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_setState_t, 1);
-  ((setState_t)(event->data))->type = type;
+  paje_event_t event                     = xbt_new0(s_paje_event_t, 1);
+  event->event_type                      = PAJE_SetState;
+  event->timestamp                       = timestamp;
+  event->print                           = active_writer.print_SetState;
+  event->free                            = &free_paje_event;
+  event->data                            = xbt_new0(s_setState_t, 1);
+  ((setState_t)(event->data))->type      = type;
   ((setState_t)(event->data))->container = container;
-  ((setState_t)(event->data))->value = value;
+  ((setState_t)(event->data))->value     = value;
 
 #if HAVE_SMPI
   if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
@@ -345,16 +341,16 @@ void new_pajeSetState (double timestamp, container_t container, type_t type, val
 
 void new_pajePushStateWithExtra (double timestamp, container_t container, type_t type, val_t value, void* extra)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_PushState;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_PushState;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_pushState_t, 1);
+  paje_event_t event                 = xbt_new0(s_paje_event_t, 1);
+  event->event_type                  = PAJE_PushState;
+  event->timestamp                   = timestamp;
+  event->print                       = active_writer.print_PushState;
+  event->free                        = &free_paje_event;
+  event->data                        = xbt_new0(s_pushState_t, 1);
   ((pushState_t)(event->data))->type = type;
   ((pushState_t)(event->data))->container = container;
-  ((pushState_t)(event->data))->value = value;
-  ((pushState_t)(event->data))->extra = extra;
+  ((pushState_t)(event->data))->value     = value;
+  ((pushState_t)(event->data))->extra     = extra;
 
 #if HAVE_SMPI
   if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
@@ -377,13 +373,13 @@ void new_pajePushState (double timestamp, container_t container, type_t type, va
 
 void new_pajePopState (double timestamp, container_t container, type_t type)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_PopState;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_PopState;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_popState_t, 1);
-  ((popState_t)(event->data))->type = type;
+  paje_event_t event                     = xbt_new0(s_paje_event_t, 1);
+  event->event_type                      = PAJE_PopState;
+  event->timestamp                       = timestamp;
+  event->print                           = active_writer.print_PopState;
+  event->free                            = &free_paje_event;
+  event->data                            = xbt_new0(s_popState_t, 1);
+  ((popState_t)(event->data))->type      = type;
   ((popState_t)(event->data))->container = container;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
@@ -394,13 +390,13 @@ void new_pajePopState (double timestamp, container_t container, type_t type)
 
 void new_pajeResetState (double timestamp, container_t container, type_t type)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_ResetState;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_ResetState;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_resetState_t, 1);
-  ((resetState_t)(event->data))->type = type;
+  paje_event_t event                       = xbt_new0(s_paje_event_t, 1);
+  event->event_type                        = PAJE_ResetState;
+  event->timestamp                         = timestamp;
+  event->print                             = active_writer.print_ResetState;
+  event->free                              = &free_paje_event;
+  event->data                              = xbt_new0(s_resetState_t, 1);
+  ((resetState_t)(event->data))->type      = type;
   ((resetState_t)(event->data))->container = container;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
@@ -411,38 +407,24 @@ void new_pajeResetState (double timestamp, container_t container, type_t type)
 void new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer,
                         const char *value, const char *key)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_StartLink;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_StartLink;
-  event->free = free_paje_event;
-  event->data = xbt_new0(s_startLink_t, 1);
-  ((startLink_t)(event->data))->type = type;
-  ((startLink_t)(event->data))->container = container;
-  ((startLink_t)(event->data))->sourceContainer = sourceContainer;
-  ((startLink_t)(event->data))->value = xbt_strdup(value);
-  ((startLink_t)(event->data))->key = xbt_strdup(key);
-  ((startLink_t)(event->data))->size = -1;
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
-
-  insert_into_buffer (event);
+  new_pajeStartLinkWithSize(timestamp, container, type, sourceContainer, value, key, -1);
 }
 
 void new_pajeStartLinkWithSize (double timestamp, container_t container, type_t type, container_t sourceContainer,
                                 const char *value, const char *key, int size)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_StartLink;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_StartLink;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_startLink_t, 1);
-  ((startLink_t)(event->data))->type = type;
-  ((startLink_t)(event->data))->container = container;
+  paje_event_t event                            = xbt_new0(s_paje_event_t, 1);
+  event->event_type                             = PAJE_StartLink;
+  event->timestamp                              = timestamp;
+  event->print                                  = active_writer.print_StartLink;
+  event->free                                   = &free_paje_event;
+  event->data                                   = xbt_new0(s_startLink_t, 1);
+  ((startLink_t)(event->data))->type            = type;
+  ((startLink_t)(event->data))->container       = container;
   ((startLink_t)(event->data))->sourceContainer = sourceContainer;
-  ((startLink_t)(event->data))->value = xbt_strdup(value);
-  ((startLink_t)(event->data))->key = xbt_strdup(key);
-  ((startLink_t)(event->data))->size = size;
+  ((startLink_t)(event->data))->value           = xbt_strdup(value);
+  ((startLink_t)(event->data))->key             = xbt_strdup(key);
+  ((startLink_t)(event->data))->size            = size;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
 
@@ -452,17 +434,17 @@ void new_pajeStartLinkWithSize (double timestamp, container_t container, type_t
 void new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer,
                       const char *value, const char *key)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_EndLink;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_EndLink;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_endLink_t, 1);
-  ((endLink_t)(event->data))->type = type;
-  ((endLink_t)(event->data))->container = container;
+  paje_event_t event                        = xbt_new0(s_paje_event_t, 1);
+  event->event_type                         = PAJE_EndLink;
+  event->timestamp                          = timestamp;
+  event->print                              = active_writer.print_EndLink;
+  event->free                               = &free_paje_event;
+  event->data                               = xbt_new0(s_endLink_t, 1);
+  ((endLink_t)(event->data))->type          = type;
+  ((endLink_t)(event->data))->container     = container;
   ((endLink_t)(event->data))->destContainer = destContainer;
-  ((endLink_t)(event->data))->value = xbt_strdup(value);
-  ((endLink_t)(event->data))->key = xbt_strdup(key);
+  ((endLink_t)(event->data))->value         = xbt_strdup(value);
+  ((endLink_t)(event->data))->key           = xbt_strdup(key);
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
 
@@ -471,15 +453,15 @@ void new_pajeEndLink (double timestamp, container_t container, type_t type, cont
 
 void new_pajeNewEvent (double timestamp, container_t container, type_t type, val_t value)
 {
-  paje_event_t event = xbt_new0(s_paje_event_t, 1);
-  event->event_type = PAJE_NewEvent;
-  event->timestamp = timestamp;
-  event->print = active_writer.print_NewEvent;
-  event->free free_paje_event;
-  event->data = xbt_new0(s_newEvent_t, 1);
-  ((newEvent_t)(event->data))->type = type;
+  paje_event_t event                     = xbt_new0(s_paje_event_t, 1);
+  event->event_type                      = PAJE_NewEvent;
+  event->timestamp                       = timestamp;
+  event->print                           = active_writer.print_NewEvent;
+  event->free                            = &free_paje_event;
+  event->data                            = xbt_new0(s_newEvent_t, 1);
+  ((newEvent_t)(event->data))->type      = type;
   ((newEvent_t)(event->data))->container = container;
-  ((newEvent_t)(event->data))->value = value;
+  ((newEvent_t)(event->data))->value     = value;
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);