new function to generate a paje start link with a volume parameter

details:
- the volume parameter is the amount of data associated with the link
- it will be used in different tracing situations of simgrid (msg process comm, task comm, smpi, ...)

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

diff --git a/src/instr/paje.c b/src/instr/paje.c
index 06ac5a3..7a7710e 100644 (file)
--- a/src/instr/paje.c
+++ b/src/instr/paje.c
@@ -43,6 +43,7 @@ static int pajeSetVariableId = 22;
 static int pajeAddVariableId = 23;
 static int pajeSubVariableId = 24;
 static int pajeDefineVariableTypeId = 25;
 static int pajeAddVariableId = 23;
 static int pajeSubVariableId = 24;
 static int pajeDefineVariableTypeId = 25;

+static int pajeStartLinkWithVolumeId = 26;

 
 #define TRACE_LINE_SIZE 1000
 
 
 #define TRACE_LINE_SIZE 1000
 


@@ -241,7 +242,16 @@ void TRACE_paje_create_header(void) {
 %%       Alias string \n\
 %%       ContainerType string \n\
 %%       Name string \n\
 %%       Alias string \n\
 %%       ContainerType string \n\
 %%       Name string \n\

-%%EndEventDef \n",
+%%EndEventDef \n\
+%%EventDef PajeStartLink %d \n\
+%%       Time date \n\
+%%       EntityType string \n\
+%%       Container string \n\
+%%       Value string \n\
+%%       SourceContainer string \n\
+%%       Key string \n\
+%%       Volume string \n\
+%%EndEventDef\n",

       pajeDefineContainerTypeId, pajeDefineStateTypeId, pajeDefineEntityValueId,
       pajeDefineEventTypeId, pajeDefineLinkTypeId, pajeCreateContainerId,
       pajeDestroyContainerId, pajeSetStateId, pajeSetStateWithHostId,
       pajeDefineContainerTypeId, pajeDefineStateTypeId, pajeDefineEntityValueId,
       pajeDefineEventTypeId, pajeDefineLinkTypeId, pajeCreateContainerId,
       pajeDestroyContainerId, pajeSetStateId, pajeSetStateWithHostId,


@@ -254,7 +264,8 @@ void TRACE_paje_create_header(void) {
       pajeSetVariableId,
       pajeAddVariableId,
       pajeSubVariableId,
       pajeSetVariableId,
       pajeAddVariableId,
       pajeSubVariableId,

-      pajeDefineVariableTypeId);
+      pajeDefineVariableTypeId,
+      pajeStartLinkWithVolumeId);

 }
 
 /* internal to this file */
 }
 
 /* internal to this file */


@@ -412,6 +423,14 @@ void pajeStartLinkWithBandwidthLatency (double time, const char *entityType, con
   fprintf (tracing_file, "%s %f %f\n", line, bw, lat);
 }
 
   fprintf (tracing_file, "%s %f %f\n", line, bw, lat);
 }
 

+void pajeStartLinkWithVolume (double time, const char *entityType, const char *container, const char *value,
+    const char *sourceContainer, const char *key, double volume)
+{
+  char line[TRACE_LINE_SIZE];
+  __pajeStartLink (line, TRACE_LINE_SIZE, pajeStartLinkWithVolumeId, time, entityType, container, value, sourceContainer, key);
+  fprintf (tracing_file, "%s %f\n", line, volume);
+}
+

 void pajeEndLink (double time, const char *entityType, const char *container, const char *value,
     const char *destContainer, const char *key)
 {
 void pajeEndLink (double time, const char *entityType, const char *container, const char *value,
     const char *destContainer, const char *key)
 {

diff --git a/src/instr/private.h b/src/instr/private.h
index 78605f7..2a5310b 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -53,6 +53,7 @@ void pajePushStateWithBandwidthUsed (double time, const char *entityType, const
 void pajePopState (double time, const char *entityType, const char *container);
 void pajeStartLink (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key);
 void pajeStartLinkWithBandwidthLatency (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key, double bw, double lat);
 void pajePopState (double time, const char *entityType, const char *container);
 void pajeStartLink (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key);
 void pajeStartLinkWithBandwidthLatency (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key, double bw, double lat);

+void pajeStartLinkWithVolume (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key, double volume);

 void pajeEndLink (double time, const char *entityType, const char *container, const char *value, const char *destContainer, const char *key);
 void pajeDefineVariableType(const char *alias, const char *containerType, const char *name);
 void pajeSetVariable (double time, const char *entityType, const char *container, const char *value);
 void pajeEndLink (double time, const char *entityType, const char *container, const char *value, const char *destContainer, const char *key);
 void pajeDefineVariableType(const char *alias, const char *containerType, const char *name);
 void pajeSetVariable (double time, const char *entityType, const char *container, const char *value);