s_newEvent is changed to a class

[simgrid.git] / src / instr / instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index b6c49e6..ad5df54 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -66,13 +66,19 @@ typedef struct s_type {
   xbt_dict_t values; //valid for all types except variable and container
 }s_type_t;
 
-typedef struct s_val *val_t;
-typedef struct s_val {
+class s_val;
+
+typedef s_val *val_t;
+
+class s_val {
+  public:
   char *id;
   char *name;
   char *color;
   type_t father;
-}s_val_t;
+};
+
+typedef s_val s_val_t;
 
 typedef enum {
   INSTR_HOST,
@@ -97,14 +103,21 @@ typedef struct s_container {
   xbt_dict_t children;
 }s_container_t;
 
-typedef struct paje_event *paje_event_t;
-typedef struct paje_event {
+
+class paje_event;
+
+typedef paje_event *paje_event_t;
+
+class paje_event {
+  public:
   double timestamp;
   e_event_type event_type;
   void (*print) (paje_event_t event);
   void (*free) (paje_event_t event);
   void *data;
-} s_paje_event_t;
+};
+
+typedef paje_event s_paje_event_t;
 
 typedef struct s_defineContainerType *defineContainerType_t;
 typedef struct s_defineContainerType {
@@ -221,12 +234,18 @@ typedef struct s_endLink {
   char *key;
 }s_endLink_t;
 
-typedef struct s_newEvent *newEvent_t;
-typedef struct s_newEvent {
+class s_newEvent;
+
+typedef s_newEvent *newEvent_t;
+
+class s_newEvent {
+  public:
   container_t container;
   type_t type;
   val_t value;
-}s_newEvent_t;
+};
+
+typedef s_newEvent s_newEvent_t;
 
 extern XBT_PRIVATE xbt_dict_t created_categories;
 extern XBT_PRIVATE xbt_dict_t declared_marks;
@@ -249,11 +268,15 @@ XBT_PUBLIC(void) new_pajeDefineStateType(type_t type);
 XBT_PUBLIC(void) new_pajeDefineEventType(type_t type);
 XBT_PUBLIC(void) new_pajeDefineLinkType(type_t type, type_t source, type_t dest);
 XBT_PUBLIC(void) new_pajeDefineEntityValue (val_t type);
+
+// Container 
 XBT_PUBLIC(void) new_pajeCreateContainer (container_t container);
 XBT_PUBLIC(void) new_pajeDestroyContainer (container_t container);
+
 XBT_PUBLIC(void) new_pajeSetVariable (double timestamp, container_t container, type_t type, double value);
 XBT_PUBLIC(void) new_pajeAddVariable (double timestamp, container_t container, type_t type, double value);
 XBT_PUBLIC(void) new_pajeSubVariable (double timestamp, container_t container, type_t type, double value);
+
 XBT_PUBLIC(void) new_pajeSetState (double timestamp, container_t container, type_t type, val_t value);
 XBT_PUBLIC(void) new_pajePushState (double timestamp, container_t container, type_t type, val_t value);
 XBT_PUBLIC(void) new_pajePushStateWithExtra (double timestamp, container_t container, type_t type, val_t value,