new paje event declared on header of trace file, tesh's updated

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8014 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/msg/tracing/categories.tesh b/examples/msg/tracing/categories.tesh
index 13f8aaa..3030027 100644 (file)
--- a/examples/msg/tracing/categories.tesh
+++ b/examples/msg/tracing/categories.tesh
@@ -192,6 +192,12 @@ $ $SG_TEST_EXENV cat$EXEEXT ${srcdir:=.}/tracing/../categories.trace
 > %       Key string 
 > %       Volume string 
 > %EndEventDef
+> %EventDef PajeNewEvent 27 
+> %       Time date 
+> %       EntityType string 
+> %       Container string 
+> %       Value string 
+> %EndEventDef
 > 0 PLATFORM 0 platform
 > 0 HOST PLATFORM HOST
 > 0 LINK PLATFORM LINK

diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh
index b5ca080..2e9c8e2 100644 (file)
--- a/examples/msg/tracing/ms.tesh
+++ b/examples/msg/tracing/ms.tesh
@@ -192,6 +192,12 @@ $ $SG_TEST_EXENV cat$EXEEXT ${srcdir:=.}/tracing/../ms.trace
 > %       Key string 
 > %       Volume string 
 > %EndEventDef
+> %EventDef PajeNewEvent 27 
+> %       Time date 
+> %       EntityType string 
+> %       Container string 
+> %       Value string 
+> %EndEventDef
 > 0 PLATFORM 0 platform
 > 0 HOST PLATFORM HOST
 > 0 LINK PLATFORM LINK

diff --git a/src/instr/paje.c b/src/instr/paje.c
index 5253b57..b86e138 100644 (file)
--- a/src/instr/paje.c
+++ b/src/instr/paje.c
@@ -38,6 +38,7 @@ static int pajeAddVariableId = 23;
 static int pajeSubVariableId = 24;
 static int pajeDefineVariableTypeId = 25;
 static int pajeStartLinkWithVolumeId = 26;
+static int pajeNewEventId = 27;
 
 #define TRACE_LINE_SIZE 1000
 
@@ -245,6 +246,12 @@ void TRACE_paje_create_header(void) {
 %%       SourceContainer string \n\
 %%       Key string \n\
 %%       Volume string \n\
+%%EndEventDef\n\
+%%EventDef PajeNewEvent %d \n\
+%%       Time date \n\
+%%       EntityType string \n\
+%%       Container string \n\
+%%       Value string \n\
 %%EndEventDef\n",
       pajeDefineContainerTypeId, pajeDefineStateTypeId, pajeDefineEntityValueId,
       pajeDefineEventTypeId, pajeDefineLinkTypeId, pajeCreateContainerId,
@@ -259,7 +266,8 @@ void TRACE_paje_create_header(void) {
       pajeAddVariableId,
       pajeSubVariableId,
       pajeDefineVariableTypeId,
-      pajeStartLinkWithVolumeId);
+      pajeStartLinkWithVolumeId,
+      pajeNewEventId);
 }
 
 /* internal to this file */
@@ -457,4 +465,9 @@ void pajeSubVariable (double time, const char *entityType, const char *container
   fprintf(tracing_file, "%s\n", line);
 }
 
+void pajeNewEvent (double time, const char *entityType, const char *container, const char *value)
+{
+  fprintf(tracing_file, "%d %.15lf %s %s %s\n", pajeNewEventId, time, entityType, container, value);
+}
+
 #endif

diff --git a/src/instr/private.h b/src/instr/private.h
index 113ec5a..52ec5bc 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -54,6 +54,7 @@ void pajeDefineVariableType(const char *alias, const char *containerType, const
 void pajeSetVariable (double time, const char *entityType, const char *container, const char *value);
 void pajeAddVariable (double time, const char *entityType, const char *container, const char *value);
 void pajeSubVariable (double time, const char *entityType, const char *container, const char *value);
+void pajeNewEvent (double time, const char *entityType, const char *container, const char *value);
 
 /* from general.c */
 char *TRACE_paje_msg_container (m_task_t task, char *host, char *output, int len);