From ed6bd30ac5daed76350028710ea131a106fcef03 Mon Sep 17 00:00:00 2001 From: Takishipp Date: Tue, 4 Apr 2017 12:04:05 +0200 Subject: [PATCH] s_val is changed to a class --- src/instr/instr_private.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index c9b9a11cca..4c56b8d215 100644 --- 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,6 +103,7 @@ typedef struct s_container { xbt_dict_t children; }s_container_t; + class paje_event; typedef paje_event *paje_event_t; @@ -255,11 +262,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, -- 2.20.1