-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "instr/instr_private.h"
+#include "xbt/virtu.h" /* sg_cmdline */
#ifdef HAVE_TRACING
container_t container;
type_t type;
val_t value;
+ int size;
}s_pushState_t;
typedef struct s_popState *popState_t;
container_t sourceContainer;
char *value;
char *key;
+ int size;
}s_startLink_t;
typedef struct s_endLink *endLink_t;
/* output generator version */
fprintf (tracing_file, "#This file was generated using SimGrid-%d.%d.%d\n", SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, SIMGRID_VERSION_PATCH);
+ fprintf (tracing_file, "#[");
+ unsigned int cpt;
+ char *str;
+ xbt_dynar_foreach (xbt_cmdline, cpt, str){
+ fprintf(tracing_file, "%s ",str);
+ }
+ fprintf (tracing_file, "]\n");
/* output one line comment */
dump_comment (TRACE_get_comment());
dump_comment_file (TRACE_get_comment_file());
/* output header */
- TRACE_header(TRACE_basic());
+ TRACE_header(TRACE_basic(),TRACE_display_sizes());
buffer = xbt_dynar_new (sizeof(paje_event_t), NULL);
}
buffer = xbt_dynar_new (sizeof(paje_event_t), NULL);
}else{
paje_event_t event;
- while (!xbt_dynar_is_empty(buffer)){
- double head_timestamp = (*(paje_event_t*)xbt_dynar_get_ptr(buffer, 0))->timestamp;
+ unsigned int cursor;
+ xbt_dynar_foreach(buffer, cursor, event) {
+ double head_timestamp = event->timestamp;
if (head_timestamp > TRACE_last_timestamp_to_dump){
break;
}
- xbt_dynar_remove_at (buffer, 0, &event);
event->print (event);
event->free (event);
}
+ xbt_dynar_remove_n_at(buffer, cursor, 0);
}
XBT_DEBUG("%s: ends", __FUNCTION__);
}
static void print_pajePushState(paje_event_t event)
{
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
- if (event->timestamp == 0){
- fprintf(tracing_file, "%d 0 %s %s %s\n",
- (int)event->event_type,
- ((pushState_t)event->data)->type->id,
- ((pushState_t)event->data)->container->id,
- ((pushState_t)event->data)->value->id);
+ if (!TRACE_display_sizes()){
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s\n",
+ (int)event->event_type,
+ ((pushState_t)event->data)->type->id,
+ ((pushState_t)event->data)->container->id,
+ ((pushState_t)event->data)->value->id);
+ }else{
+ fprintf(tracing_file, "%d %lf %s %s %s\n",
+ (int)event->event_type,
+ event->timestamp,
+ ((pushState_t)event->data)->type->id,
+ ((pushState_t)event->data)->container->id,
+ ((pushState_t)event->data)->value->id);
+ }
}else{
- fprintf(tracing_file, "%d %lf %s %s %s\n",
- (int)event->event_type,
- event->timestamp,
- ((pushState_t)event->data)->type->id,
- ((pushState_t)event->data)->container->id,
- ((pushState_t)event->data)->value->id);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s %d\n",
+ (int)event->event_type,
+ ((pushState_t)event->data)->type->id,
+ ((pushState_t)event->data)->container->id,
+ ((pushState_t)event->data)->value->id,
+ ((pushState_t)event->data)->size);
+ }else{
+ fprintf(tracing_file, "%d %lf %s %s %s %d\n",
+ (int)event->event_type,
+ event->timestamp,
+ ((pushState_t)event->data)->type->id,
+ ((pushState_t)event->data)->container->id,
+ ((pushState_t)event->data)->value->id,
+ ((pushState_t)event->data)->size);
+ }
+
}
}
static void print_pajeStartLink(paje_event_t event)
{
+ if (!TRACE_display_sizes()){
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
+ (int)event->event_type,
+ ((startLink_t)event->data)->type->id,
+ ((startLink_t)event->data)->container->id,
+ ((startLink_t)event->data)->value,
+ ((startLink_t)event->data)->sourceContainer->id,
+ ((startLink_t)event->data)->key);
+ }else {
+ fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
+ (int)event->event_type,
+ event->timestamp,
+ ((startLink_t)event->data)->type->id,
+ ((startLink_t)event->data)->container->id,
+ ((startLink_t)event->data)->value,
+ ((startLink_t)event->data)->sourceContainer->id,
+ ((startLink_t)event->data)->key);
+ }
+ }else{
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
- if (event->timestamp == 0){
- fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
- (int)event->event_type,
- ((startLink_t)event->data)->type->id,
- ((startLink_t)event->data)->container->id,
- ((startLink_t)event->data)->value,
- ((startLink_t)event->data)->sourceContainer->id,
- ((startLink_t)event->data)->key);
- }else {
- fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
- (int)event->event_type,
- event->timestamp,
- ((startLink_t)event->data)->type->id,
- ((startLink_t)event->data)->container->id,
- ((startLink_t)event->data)->value,
- ((startLink_t)event->data)->sourceContainer->id,
- ((startLink_t)event->data)->key);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s %s %s %d\n",
+ (int)event->event_type,
+ ((startLink_t)event->data)->type->id,
+ ((startLink_t)event->data)->container->id,
+ ((startLink_t)event->data)->value,
+ ((startLink_t)event->data)->sourceContainer->id,
+ ((startLink_t)event->data)->key,
+ ((startLink_t)event->data)->size);
+ }else {
+ fprintf(tracing_file, "%d %lf %s %s %s %s %s %d\n",
+ (int)event->event_type,
+ event->timestamp,
+ ((startLink_t)event->data)->type->id,
+ ((startLink_t)event->data)->container->id,
+ ((startLink_t)event->data)->value,
+ ((startLink_t)event->data)->sourceContainer->id,
+ ((startLink_t)event->data)->key,
+ ((startLink_t)event->data)->size);
+ }
}
}
((pushState_t)(event->data))->type = type;
((pushState_t)(event->data))->container = container;
((pushState_t)(event->data))->value = value;
+ ((pushState_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_pajePushStateWithSize (double timestamp, container_t container, type_t type, val_t value, int size)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_PushState;
+ event->timestamp = timestamp;
+ event->print = print_pajePushState;
+ 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))->size = size;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
((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)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_StartLink;
+ event->timestamp = timestamp;
+ event->print = print_pajeStartLink;
+ 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;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);