X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c82adb6ec2917d3ec0657dab7e5d1d053759accd..fb81c8bcd9bf351c3a575908adfa783b0b375e10:/src/instr/instr_trace.cpp diff --git a/src/instr/instr_trace.cpp b/src/instr/instr_trace.cpp index 71125499fd..0580aa2ac1 100644 --- a/src/instr/instr_trace.cpp +++ b/src/instr/instr_trace.cpp @@ -26,15 +26,13 @@ std::vector buffer; void dump_comment (const char *comment) { - if (!strlen(comment)) - return; + if (!strlen(comment)) return; fprintf (tracing_file, "# %s\n", comment); } void dump_comment_file (const char *filename) { - if (!strlen(filename)) - return; + if (!strlen(filename)) return; FILE *file = fopen (filename, "r"); if (!file){ THROWF (system_error, 1, "Comment file %s could not be opened for reading.", filename); @@ -42,14 +40,12 @@ void dump_comment_file (const char *filename) while (!feof(file)){ char c; c = fgetc(file); - if (feof(file)) - break; + if (feof(file)) break; fprintf (tracing_file, "# "); while (c != '\n'){ fprintf (tracing_file, "%c", c); c = fgetc(file); - if (feof(file)) - break; + if (feof(file)) break; } fprintf (tracing_file, "\n"); } @@ -60,8 +56,7 @@ double TRACE_last_timestamp_to_dump = 0; //dumps the trace file until the timestamp TRACE_last_timestamp_to_dump void TRACE_paje_dump_buffer (int force) { - if (!TRACE_is_enabled()) - return; + if (!TRACE_is_enabled()) return; XBT_DEBUG("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump); if (force){ for (auto event :buffer){ @@ -130,13 +125,13 @@ 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; + 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); - (static_cast(event->data))->type = type; + 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); @@ -147,13 +142,13 @@ 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; + 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); - (static_cast(event->data))->type = type; + 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); @@ -164,13 +159,13 @@ 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; + 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); - (static_cast(event->data))->type = type; + 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); @@ -181,13 +176,13 @@ 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; + 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); - (static_cast(event->data))->type = type; + 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); @@ -198,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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->source = source; - (static_cast(event->data))->dest = dest; + 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; XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type); @@ -217,13 +212,13 @@ 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; + 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); - (static_cast(event->data))->value = value; + 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); @@ -234,13 +229,13 @@ 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; + 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); - (static_cast(event->data))->container = container; + 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); @@ -251,13 +246,13 @@ 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; + 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); - (static_cast(event->data))->container = container; + 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); @@ -268,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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; - (static_cast(event->data))->value = value; + 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; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -286,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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; - (static_cast(event->data))->value = value; + 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; 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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; - (static_cast(event->data))->value = value; + 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; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -320,25 +315,25 @@ 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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; - (static_cast(event->data))->value = value; + 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; #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); - (static_cast(event->data))->filename = loc->filename; - (static_cast(event->data))->linenumber = loc->linenumber; + ((setState_t)(event->data))->filename = loc->filename; + ((setState_t)(event->data))->linenumber = loc->linenumber; } #endif - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, static_cast(event->event_type), event->timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); insert_into_buffer (event); } @@ -346,26 +341,26 @@ 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; - (static_cast(event->data))->value = value; - (static_cast(event->data))->extra = 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); + ((pushState_t)(event->data))->type = type; + ((pushState_t)(event->data))->container = container; + ((pushState_t)(event->data))->value = value; + ((pushState_t)(event->data))->extra = extra; #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); - (static_cast(event->data))->filename = loc->filename; - (static_cast(event->data))->linenumber = loc->linenumber; + ((pushState_t)(event->data))->filename = loc->filename; + ((pushState_t)(event->data))->linenumber = loc->linenumber; } #endif - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, static_cast(event->event_type), event->timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); insert_into_buffer (event); } @@ -378,14 +373,14 @@ 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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; + 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); @@ -395,62 +390,61 @@ 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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; + 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); insert_into_buffer (event); } +void new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, + const char *value, const char *key) +{ + 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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; - (static_cast(event->data))->sourceContainer = sourceContainer; - (static_cast(event->data))->value = xbt_strdup(value); - (static_cast(event->data))->key = xbt_strdup(key); - (static_cast(event->data))->size = size; + 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; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); insert_into_buffer (event); } -void new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, - const char *value, const char *key) -{ - new_pajeStartLinkWithSize(timestamp, container, type, sourceContainer, value, key, -1); -} - - 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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; - (static_cast(event->data))->destContainer = destContainer; - (static_cast(event->data))->value = xbt_strdup(value); - (static_cast(event->data))->key = xbt_strdup(key); + 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); XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -459,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; + 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); - (static_cast(event->data))->type = type; - (static_cast(event->data))->container = container; - (static_cast(event->data))->value = value; + 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; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);