From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 10 Nov 2010 10:22:36 +0000 (+0000)
Subject: new event to declare a variable type associated with a color
X-Git-Tag: v3_5~309
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/eb458edefa0962215cc62c304bc44588308aecc4

new event to declare a variable type associated with a color

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

diff --git a/src/instr/paje.c b/src/instr/paje.c
index 9a9e98b331..d2d211cd1c 100644
--- a/src/instr/paje.c
+++ b/src/instr/paje.c
@@ -32,7 +32,7 @@ static int pajeEndLinkId = 13;
 #define UNUSED005 18
 static int pajePushStateId = 19;
 #define UNUSED001 20
-#define UNUSED002 21
+static int pajeDefineVariableTypeWithColorId = 21;
 static int pajeSetVariableId = 22;
 static int pajeAddVariableId = 23;
 static int pajeSubVariableId = 24;
@@ -155,6 +155,12 @@ void TRACE_paje_create_header(void)
 %%       ContainerType string \n\
 %%       Name string \n\
 %%EndEventDef \n\
+%%EventDef PajeDefineVariableType %d \n\
+%%       Alias string \n\
+%%       ContainerType string \n\
+%%       Name string \n\
+%%       Color color \n\
+%%EndEventDef \n\
 %%EventDef PajeStartLink %d \n\
 %%       Time date \n\
 %%       EntityType string \n\
@@ -169,7 +175,7 @@ void TRACE_paje_create_header(void)
 %%       EntityType string \n\
 %%       Container string \n\
 %%       Value string \n\
-%%EndEventDef\n", pajeDefineContainerTypeId, pajeDefineStateTypeId, pajeDefineEntityValueId, pajeDefineEventTypeId, pajeDefineLinkTypeId, pajeCreateContainerId, pajeDestroyContainerId, pajeSetStateId, pajePopStateId, pajeStartLinkId, pajeEndLinkId, pajePushStateId, pajeSetVariableId, pajeAddVariableId, pajeSubVariableId, pajeDefineVariableTypeId, pajeStartLinkWithVolumeId, pajeNewEventId);
+%%EndEventDef\n", pajeDefineContainerTypeId, pajeDefineStateTypeId, pajeDefineEntityValueId, pajeDefineEventTypeId, pajeDefineLinkTypeId, pajeCreateContainerId, pajeDestroyContainerId, pajeSetStateId, pajePopStateId, pajeStartLinkId, pajeEndLinkId, pajePushStateId, pajeSetVariableId, pajeAddVariableId, pajeSubVariableId, pajeDefineVariableTypeId, pajeDefineVariableTypeWithColorId, pajeStartLinkWithVolumeId, pajeNewEventId);
 }
 
 /* internal to this file */
@@ -314,6 +320,13 @@ void pajeDefineVariableType(const char *alias, const char *containerType,
           containerType, name);
 }
 
+void pajeDefineVariableTypeWithColor(const char *alias, const char *containerType,
+                            const char *name, const char *color)
+{
+  fprintf(tracing_file, "%d %s %s %s \"%s\"\n", pajeDefineVariableTypeWithColorId, alias,
+          containerType, name, color);
+}
+
 void pajeSetVariable(double time, const char *entityType,
                      const char *container, const char *value)
 {
diff --git a/src/instr/private.h b/src/instr/private.h
index 97436e13c1..e13b084d63 100644
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -63,6 +63,8 @@ void pajeEndLink(double time, const char *entityType,
                  const char *destContainer, const char *key);
 void pajeDefineVariableType(const char *alias, const char *containerType,
                             const char *name);
+void pajeDefineVariableTypeWithColor(const char *alias, const char *containerType,
+                            const char *name, const char *color);
 void pajeSetVariable(double time, const char *entityType,
                      const char *container, const char *value);
 void pajeAddVariable(double time, const char *entityType,