XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_trace, instr, "tracing event system");
-FILE *tracing_file = NULL;
+FILE *tracing_file = nullptr;
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};
-xbt_dynar_t buffer = NULL;
+std::vector<paje_event_t> 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);
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");
}
fclose(file);
}
-void TRACE_init()
-{
- buffer = xbt_dynar_new(sizeof(paje_event_t), NULL);
-}
-
-void TRACE_finalize()
-{
- xbt_dynar_free(&buffer);
-}
-
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){
- paje_event_t event;
- unsigned int i;
- xbt_dynar_foreach(buffer, i, event){
+ for (auto event :buffer){
event->print (event);
event->free (event);
}
- xbt_dynar_free (&buffer);
- buffer = xbt_dynar_new (sizeof(paje_event_t), NULL);
+ buffer.clear();
}else{
- paje_event_t event;
- unsigned int cursor;
- xbt_dynar_foreach(buffer, cursor, event) {
+ std::vector<paje_event_t>::iterator i = buffer.begin();
+ for (auto event :buffer){
double head_timestamp = event->timestamp;
- if (head_timestamp > TRACE_last_timestamp_to_dump){
+ if (head_timestamp > TRACE_last_timestamp_to_dump)
break;
- }
event->print (event);
event->free (event);
+ ++i;
}
- xbt_dynar_remove_n_at(buffer, cursor, 0);
+ buffer.erase(buffer.begin(), i);
}
XBT_DEBUG("%s: ends", __FUNCTION__);
}
return;
}
- XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%lu)",
- __FUNCTION__, (int)tbi->event_type, tbi->timestamp, xbt_dynar_length(buffer));
-
- unsigned int i;
- for (i = xbt_dynar_length(buffer); i > 0; i--) {
- paje_event_t e1 = *(paje_event_t*)xbt_dynar_get_ptr(buffer, i - 1);
+ XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%zu)",
+ __FUNCTION__, (int)tbi->event_type, tbi->timestamp, buffer.size());
+ std::vector<paje_event_t>::reverse_iterator i;
+ for (i = buffer.rbegin(); i != buffer.rend(); ++i) {
+ paje_event_t e1 = *i;
if (e1->timestamp <= tbi->timestamp)
break;
}
- xbt_dynar_insert_at(buffer, i, &tbi);
- if (i == 0)
+ buffer.insert(i.base(), tbi);
+ if (i == buffer.rend())
XBT_DEBUG("%s: inserted at beginning", __FUNCTION__);
else
- XBT_DEBUG("%s: inserted at%s %u", __FUNCTION__, (i == xbt_dynar_length(buffer) - 1 ? " end, pos =" : ""), i);
+ XBT_DEBUG("%s: inserted at%s %zd", __FUNCTION__, (i == buffer.rbegin()) ? " end" :"pos =",
+ std::distance(buffer.rend(),i));
}
static void free_paje_event (paje_event_t event)
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<defineContainerType_t>(event->data))->type = type;
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_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<defineVariableType_t>(event->data))->type = type;
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_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<defineStateType_t>(event->data))->type = type;
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_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<defineEventType_t>(event->data))->type = type;
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
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<defineLinkType_t>(event->data))->type = type;
+ (static_cast<defineLinkType_t>(event->data))->source = source;
+ (static_cast<defineLinkType_t>(event->data))->dest = dest;
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
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<defineEntityValue_t>(event->data))->value = value;
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event->event_type);
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<createContainer_t>(event->data))->container = container;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
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<destroyContainer_t>(event->data))->container = container;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
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<setVariable_t>(event->data))->type = type;
+ (static_cast<setVariable_t>(event->data))->container = container;
+ (static_cast<setVariable_t>(event->data))->value = value;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
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<addVariable_t>(event->data))->type = type;
+ (static_cast<addVariable_t>(event->data))->container = container;
+ (static_cast<addVariable_t>(event->data))->value = value;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
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<subVariable_t>(event->data))->type = type;
+ (static_cast<subVariable_t>(event->data))->container = container;
+ (static_cast<subVariable_t>(event->data))->value = value;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
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<setState_t>(event->data))->type = type;
+ (static_cast<setState_t>(event->data))->container = container;
+ (static_cast<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();
- ((setState_t)(event->data))->filename = loc->filename;
- ((setState_t)(event->data))->linenumber = loc->linenumber;
+ (static_cast<setState_t>(event->data))->filename = loc->filename;
+ (static_cast<setState_t>(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<int>(event->event_type), event->timestamp);
insert_into_buffer (event);
}
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<pushState_t>(event->data))->type = type;
+ (static_cast<pushState_t>(event->data))->container = container;
+ (static_cast<pushState_t>(event->data))->value = value;
+ (static_cast<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();
- ((pushState_t)(event->data))->filename = loc->filename;
- ((pushState_t)(event->data))->linenumber = loc->linenumber;
+ (static_cast<pushState_t>(event->data))->filename = loc->filename;
+ (static_cast<pushState_t>(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<int>(event->event_type), event->timestamp);
insert_into_buffer (event);
}
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<popState_t>(event->data))->type = type;
+ (static_cast<popState_t>(event->data))->container = container;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
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<resetState_t>(event->data))->type = type;
+ (static_cast<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)
-{
- 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)
{
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<startLink_t>(event->data))->type = type;
+ (static_cast<startLink_t>(event->data))->container = container;
+ (static_cast<startLink_t>(event->data))->sourceContainer = sourceContainer;
+ (static_cast<startLink_t>(event->data))->value = xbt_strdup(value);
+ (static_cast<startLink_t>(event->data))->key = xbt_strdup(key);
+ (static_cast<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)
{
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<endLink_t>(event->data))->type = type;
+ (static_cast<endLink_t>(event->data))->container = container;
+ (static_cast<endLink_t>(event->data))->destContainer = destContainer;
+ (static_cast<endLink_t>(event->data))->value = xbt_strdup(value);
+ (static_cast<endLink_t>(event->data))->key = xbt_strdup(key);
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
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<newEvent_t>(event->data))->type = type;
+ (static_cast<newEvent_t>(event->data))->container = container;
+ (static_cast<newEvent_t>(event->data))->value = value;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
