X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1847d1441271d076b3de449c8853031ea208ce8f..c5418e2f161ecfa4af596fb3d25e8ac696935af3:/src/instr/instr_paje_trace.cpp

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 6e9df5552f..84c6059dea 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -192,7 +192,7 @@ void TRACE_paje_end() {
   XBT_DEBUG("Filename %s is closed", filename);
 }
 
-void DefineContainerEvent(type_t type)
+void DefineContainerEvent(Type* type)
 {
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineContainerType);
   //print it
@@ -210,9 +210,7 @@ void DefineContainerEvent(type_t type)
   //--
 }
 
-
-
-void LogVariableTypeDefinition(type_t type)
+void LogVariableTypeDefinition(Type* type)
 {
 
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineVariableType);
@@ -233,8 +231,7 @@ if (instr_fmt_type == instr_fmt_paje) {
   }
 }
 
-
-void LogStateTypeDefinition(type_t type)
+void LogStateTypeDefinition(Type* type)
 {
   //print it
 if (instr_fmt_type == instr_fmt_paje) {
@@ -250,8 +247,7 @@ if (instr_fmt_type == instr_fmt_paje) {
   }
 }
 
-
-void LogDefineEventType(type_t type)
+void LogDefineEventType(Type* type)
 {
   //print it
   if (instr_fmt_type == instr_fmt_paje) {
@@ -267,7 +263,7 @@ void LogDefineEventType(type_t type)
   }
 }
 
-void LogLinkTypeDefinition(type_t type, type_t source, type_t dest)
+void LogLinkTypeDefinition(Type* type, Type* source, Type* dest)
 {
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineLinkType);
   //print it
@@ -284,7 +280,7 @@ if (instr_fmt_type == instr_fmt_paje) {
   }
 }
 
-void LogEntityValue(value* val)
+void LogEntityValue(Value* val)
 {
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineEntityValue);
   //print it
@@ -383,7 +379,7 @@ if (instr_fmt_type == instr_fmt_paje) {
 }
 
 
-SetVariableEvent::SetVariableEvent (double timestamp, container_t container, type_t type, double value)
+SetVariableEvent::SetVariableEvent (double timestamp, container_t container, Type* type, double value)
 {
   this->event_type                         = PAJE_SetVariable;
   this->timestamp                          = timestamp;
@@ -411,7 +407,7 @@ void SetVariableEvent::print() {
   }
 }
 
-AddVariableEvent::AddVariableEvent (double timestamp, container_t container, type_t type, double value)
+AddVariableEvent::AddVariableEvent (double timestamp, container_t container, Type* type, double value)
 {
   this->event_type                         = PAJE_AddVariable;
   this->timestamp                          = timestamp;
@@ -439,7 +435,7 @@ void AddVariableEvent::print() {
   }
 }
 
-SubVariableEvent::SubVariableEvent (double timestamp, container_t container, type_t type, double value)
+SubVariableEvent::SubVariableEvent (double timestamp, container_t container, Type* type, double value)
 {
   this->event_type                         = PAJE_SubVariable;
   this->timestamp                          = timestamp;
@@ -467,7 +463,7 @@ void SubVariableEvent::print() {
   }
 }
 
-SetStateEvent::SetStateEvent(double timestamp, container_t container, type_t type, value* val)
+SetStateEvent::SetStateEvent(double timestamp, container_t container, Type* type, Value* val)
 {
   this->event_type                      = PAJE_SetState;
   this->timestamp                       = timestamp;
@@ -509,7 +505,7 @@ void SetStateEvent::print() {
   }
 }
 
-PushStateEvent::PushStateEvent(double timestamp, container_t container, type_t type, value* val, void* extra)
+PushStateEvent::PushStateEvent(double timestamp, container_t container, Type* type, Value* val, void* extra)
 {
   this->event_type                  = PAJE_PushState;
   this->timestamp                   = timestamp;
@@ -531,7 +527,7 @@ PushStateEvent::PushStateEvent(double timestamp, container_t container, type_t t
   insert_into_buffer (this);
 }
 
-PushStateEvent::PushStateEvent(double timestamp, container_t container, type_t type, value* val)
+PushStateEvent::PushStateEvent(double timestamp, container_t container, Type* type, Value* val)
     : PushStateEvent(timestamp, container, type, val, nullptr)
 {}
 void PushStateEvent::print() {
@@ -699,7 +695,7 @@ void PushStateEvent::print() {
 }
 
 
-PopStateEvent::PopStateEvent (double timestamp, container_t container, type_t type)
+PopStateEvent::PopStateEvent (double timestamp, container_t container, Type* type)
 {
   this->event_type                      = PAJE_PopState;
   this->timestamp                       = timestamp;
@@ -726,7 +722,7 @@ void PopStateEvent::print() {
   }
 }
 
-ResetStateEvent::ResetStateEvent (double timestamp, container_t container, type_t type)
+ResetStateEvent::ResetStateEvent (double timestamp, container_t container, Type* type)
 {
   this->event_type                        = PAJE_ResetState;
   this->timestamp                         = timestamp;
@@ -760,11 +756,11 @@ StartLinkEvent::~StartLinkEvent()
   free(key);
 }
 StartLinkEvent::StartLinkEvent (double timestamp, container_t container,
-    type_t type, container_t sourceContainer, const char *value, const char *key)
+    Type* type, container_t sourceContainer, const char *value, const char *key)
   : StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1)
 {}
 
-StartLinkEvent::StartLinkEvent (double timestamp, container_t container, type_t type, container_t sourceContainer,
+StartLinkEvent::StartLinkEvent (double timestamp, container_t container, Type* type, container_t sourceContainer,
                                 const char *value, const char *key, int size)
 {
   event_type                             = PAJE_StartLink;
@@ -802,7 +798,7 @@ void StartLinkEvent::print() {
   }
 }
 
-EndLinkEvent::EndLinkEvent (double timestamp, container_t container, type_t type, container_t destContainer,
+EndLinkEvent::EndLinkEvent (double timestamp, container_t container, Type* type, container_t destContainer,
                       const char *value, const char *key)
 {
   this->event_type                         = PAJE_EndLink;
@@ -839,7 +835,7 @@ void EndLinkEvent::print() {
   }
 }
 
-NewEvent::NewEvent(double timestamp, container_t container, type_t type, value* val)
+NewEvent::NewEvent(double timestamp, container_t container, Type* type, Value* val)
 {
   this->event_type                      = PAJE_NewEvent;
   this->timestamp                       = timestamp;