X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9df6a0ce7023e4e22d83bb6c50f27bd21fab329..ed6bd30ac5daed76350028710ea131a106fcef03:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index fb51e5b66b..4c56b8d215 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -67,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,
@@ -88,7 +93,7 @@ typedef enum {
 
 typedef struct s_container *container_t;
 typedef struct s_container {
-  sg_netcard_t netcard;
+  sg_netpoint_t netpoint;
   char *name;     /* Unique name of this container */
   char *id;       /* Unique id of this container */
   type_t type;    /* Type of this container */
@@ -98,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 {
@@ -240,8 +252,6 @@ extern XBT_PRIVATE double TRACE_last_timestamp_to_dump;
 XBT_PRIVATE void TRACE_header(int basic, int size);
 
 /* from paje.c */
-XBT_PRIVATE void TRACE_init();
-XBT_PRIVATE void TRACE_finalize();
 XBT_PRIVATE void TRACE_paje_init();
 XBT_PRIVATE void TRACE_paje_start();
 XBT_PRIVATE void TRACE_paje_end();
@@ -252,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,
@@ -457,8 +471,4 @@ typedef struct s_instr_extra_data {
 
 SG_END_DECL()
 
-#if HAVE_JEDULE
-#include "simgrid/jedule/jedule_sd_binding.h"
 #endif
-
-#endif /* INSTR_PRIVATE_H_ */