X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..c82adb6ec2917d3ec0657dab7e5d1d053759accd:/src/instr/instr_trace.cpp diff --git a/src/instr/instr_trace.cpp b/src/instr/instr_trace.cpp index 15c01584ca..71125499fd 100644 --- a/src/instr/instr_trace.cpp +++ b/src/instr/instr_trace.cpp @@ -18,25 +18,23 @@ 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 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); @@ -44,12 +42,14 @@ 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,7 +60,8 @@ 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){ @@ -133,9 +134,9 @@ void new_pajeDefineContainerType(type_t type) event->event_type = PAJE_DefineContainerType; event->timestamp = 0; event->print = active_writer.print_DefineContainerType; - event->free = free_paje_event; + event->free = &free_paje_event; event->data = xbt_new0(s_defineContainerType_t, 1); - ((defineContainerType_t)(event->data))->type = type; + (static_cast(event->data))->type = type; XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type); @@ -150,9 +151,9 @@ void new_pajeDefineVariableType(type_t type) event->event_type = PAJE_DefineVariableType; event->timestamp = 0; event->print = active_writer.print_DefineVariableType; - event->free = free_paje_event; + event->free = &free_paje_event; event->data = xbt_new0(s_defineVariableType_t, 1); - ((defineVariableType_t)(event->data))->type = type; + (static_cast(event->data))->type = type; XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type); @@ -167,9 +168,9 @@ void new_pajeDefineStateType(type_t type) event->event_type = PAJE_DefineStateType; event->timestamp = 0; event->print = active_writer.print_DefineStateType; - event->free = free_paje_event; + event->free = &free_paje_event; event->data = xbt_new0(s_defineStateType_t, 1); - ((defineStateType_t)(event->data))->type = type; + (static_cast(event->data))->type = type; XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type); @@ -184,9 +185,9 @@ void new_pajeDefineEventType(type_t type) event->event_type = PAJE_DefineEventType; event->timestamp = 0; event->print = active_writer.print_DefineEventType; - event->free = free_paje_event; + event->free = &free_paje_event; event->data = xbt_new0(s_defineEventType_t, 1); - ((defineEventType_t)(event->data))->type = type; + (static_cast(event->data))->type = type; XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type); @@ -201,11 +202,11 @@ void new_pajeDefineLinkType(type_t type, type_t source, type_t dest) event->event_type = PAJE_DefineLinkType; event->timestamp = 0; event->print = active_writer.print_DefineLinkType; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(event->data))->source = source; + (static_cast(event->data))->dest = dest; XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type); @@ -220,9 +221,9 @@ void new_pajeDefineEntityValue (val_t value) event->event_type = PAJE_DefineEntityValue; event->timestamp = 0; event->print = active_writer.print_DefineEntityValue; - event->free = free_paje_event; + event->free = &free_paje_event; event->data = xbt_new0(s_defineEntityValue_t, 1); - ((defineEntityValue_t)(event->data))->value = value; + (static_cast(event->data))->value = value; XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type); @@ -237,9 +238,9 @@ void new_pajeCreateContainer (container_t container) event->event_type = PAJE_CreateContainer; event->timestamp = SIMIX_get_clock(); event->print = active_writer.print_CreateContainer; - event->free = free_paje_event; + event->free = &free_paje_event; event->data = xbt_new0(s_createContainer_t, 1); - ((createContainer_t)(event->data))->container = container; + (static_cast(event->data))->container = container; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -254,9 +255,9 @@ void new_pajeDestroyContainer (container_t container) event->event_type = PAJE_DestroyContainer; event->timestamp = SIMIX_get_clock(); event->print = active_writer.print_DestroyContainer; - event->free = free_paje_event; + event->free = &free_paje_event; event->data = xbt_new0(s_destroyContainer_t, 1); - ((destroyContainer_t)(event->data))->container = container; + (static_cast(event->data))->container = container; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -271,11 +272,11 @@ void new_pajeSetVariable (double timestamp, container_t container, type_t type, event->event_type = PAJE_SetVariable; event->timestamp = timestamp; event->print = active_writer.print_SetVariable; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(event->data))->container = container; + (static_cast(event->data))->value = value; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -289,11 +290,11 @@ void new_pajeAddVariable (double timestamp, container_t container, type_t type, event->event_type = PAJE_AddVariable; event->timestamp = timestamp; event->print = active_writer.print_AddVariable; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(event->data))->container = container; + (static_cast(event->data))->value = value; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -306,11 +307,11 @@ void new_pajeSubVariable (double timestamp, container_t container, type_t type, event->event_type = PAJE_SubVariable; event->timestamp = timestamp; event->print = active_writer.print_SubVariable; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(event->data))->container = container; + (static_cast(event->data))->value = value; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -323,21 +324,21 @@ void new_pajeSetState (double timestamp, container_t container, type_t type, val event->event_type = PAJE_SetState; event->timestamp = timestamp; event->print = active_writer.print_SetState; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(event->data))->container = container; + (static_cast(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(); - ((setState_t)(event->data))->filename = loc->filename; - ((setState_t)(event->data))->linenumber = loc->linenumber; + (static_cast(event->data))->filename = loc->filename; + (static_cast(event->data))->linenumber = loc->linenumber; } #endif - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, static_cast(event->event_type), event->timestamp); insert_into_buffer (event); } @@ -349,22 +350,22 @@ void new_pajePushStateWithExtra (double timestamp, container_t container, type_t event->event_type = PAJE_PushState; event->timestamp = timestamp; event->print = active_writer.print_PushState; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(event->data))->container = container; + (static_cast(event->data))->value = value; + (static_cast(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(); - ((pushState_t)(event->data))->filename = loc->filename; - ((pushState_t)(event->data))->linenumber = loc->linenumber; + (static_cast(event->data))->filename = loc->filename; + (static_cast(event->data))->linenumber = loc->linenumber; } #endif - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, static_cast(event->event_type), event->timestamp); insert_into_buffer (event); } @@ -381,10 +382,10 @@ void new_pajePopState (double timestamp, container_t container, type_t type) event->event_type = PAJE_PopState; event->timestamp = timestamp; event->print = active_writer.print_PopState; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(event->data))->container = container; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -398,36 +399,16 @@ void new_pajeResetState (double timestamp, container_t container, type_t type) event->event_type = PAJE_ResetState; event->timestamp = timestamp; event->print = active_writer.print_ResetState; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(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) -{ - 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); -} - void new_pajeStartLinkWithSize (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key, int size) { @@ -435,20 +416,27 @@ void new_pajeStartLinkWithSize (double timestamp, container_t container, type_t event->event_type = PAJE_StartLink; event->timestamp = timestamp; event->print = active_writer.print_StartLink; - event->free = free_paje_event; + 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; + (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; 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) { @@ -456,13 +444,13 @@ void new_pajeEndLink (double timestamp, container_t container, type_t type, cont event->event_type = PAJE_EndLink; event->timestamp = timestamp; event->print = active_writer.print_EndLink; - event->free = free_paje_event; + 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); + (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); XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -475,11 +463,11 @@ void new_pajeNewEvent (double timestamp, container_t container, type_t type, val event->event_type = PAJE_NewEvent; event->timestamp = timestamp; event->print = active_writer.print_NewEvent; - event->free = free_paje_event; + 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; + (static_cast(event->data))->type = type; + (static_cast(event->data))->container = container; + (static_cast(event->data))->value = value; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);