X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9932a0c0d2c44e34633c97a827b2b04d615cb4e9..816b54d0e4710f20e98556126ba1017bf41dc6c5:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 1f4b694c29..127043230c 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,9 +7,11 @@
 #ifndef INSTR_PRIVATE_H_
 #define INSTR_PRIVATE_H_
 
+#include <xbt/base.h>
+
 #include "simgrid/instr.h"
 #include "instr/instr_interface.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "simgrid_config.h"
 
 SG_BEGIN_DECL()
@@ -24,7 +26,6 @@ SG_BEGIN_DECL()
 
 #include "xbt/graph.h"
 #include "xbt/dict.h"
-#include "simgrid/platf.h"
 
 typedef enum {
   PAJE_DefineContainerType,
@@ -87,7 +88,7 @@ typedef enum {
 
 typedef struct s_container *container_t;
 typedef struct s_container {
-  sg_routing_edge_t net_elm;
+  sg_netcard_t netcard;
   char *name;     /* Unique name of this container */
   char *id;       /* Unique id of this container */
   type_t type;    /* Type of this container */
@@ -174,6 +175,8 @@ typedef struct s_setState {
   container_t container;
   type_t type;
   val_t value;
+  const char* filename;
+  int linenumber;
 }s_setState_t;
 
 typedef struct s_pushState *pushState_t;
@@ -182,6 +185,8 @@ typedef struct s_pushState {
   type_t type;
   val_t value;
   int size;
+  const char* filename;
+  int linenumber;
   void* extra;
 }s_pushState_t;
 
@@ -224,23 +229,23 @@ typedef struct s_newEvent {
   val_t value;
 }s_newEvent_t;
 
-extern xbt_dict_t created_categories;
-extern xbt_dict_t declared_marks;
-extern xbt_dict_t user_host_variables;
-extern xbt_dict_t user_vm_variables;
-extern xbt_dict_t user_link_variables;
-extern double TRACE_last_timestamp_to_dump;
+extern XBT_PRIVATE xbt_dict_t created_categories;
+extern XBT_PRIVATE xbt_dict_t declared_marks;
+extern XBT_PRIVATE xbt_dict_t user_host_variables;
+extern XBT_PRIVATE xbt_dict_t user_vm_variables;
+extern XBT_PRIVATE xbt_dict_t user_link_variables;
+extern XBT_PRIVATE double TRACE_last_timestamp_to_dump;
 
 /* instr_paje_header.c */
-void TRACE_header(int basic, int size);
+XBT_PRIVATE void TRACE_header(int basic, int size);
 
 /* from paje.c */
-void TRACE_init(void);
-void TRACE_finalize(void);
-void TRACE_paje_init(void);
-void TRACE_paje_start(void);
-void TRACE_paje_end(void);
-void TRACE_paje_dump_buffer (int force);
+XBT_PRIVATE void TRACE_init(void);
+XBT_PRIVATE void TRACE_finalize(void);
+XBT_PRIVATE void TRACE_paje_init(void);
+XBT_PRIVATE void TRACE_paje_start(void);
+XBT_PRIVATE void TRACE_paje_end(void);
+XBT_PRIVATE void TRACE_paje_dump_buffer (int force);
 XBT_PUBLIC(void) new_pajeDefineContainerType(type_t type);
 XBT_PUBLIC(void) new_pajeDefineVariableType(type_t type);
 XBT_PUBLIC(void) new_pajeDefineStateType(type_t type);
@@ -254,70 +259,66 @@ XBT_PUBLIC(void) new_pajeAddVariable (double timestamp, container_t container, t
 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, void* extra);
+XBT_PUBLIC(void) new_pajePushStateWithExtra (double timestamp, container_t container, type_t type, val_t value,
+                                             void* extra);
 XBT_PUBLIC(void) new_pajePopState (double timestamp, container_t container, type_t type);
 XBT_PUBLIC(void) new_pajeResetState (double timestamp, container_t container, type_t type);
-XBT_PUBLIC(void) new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key);
-XBT_PUBLIC(void) new_pajeStartLinkWithSize (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key, int size);
-XBT_PUBLIC(void) new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer, const char *value, const char *key);
+XBT_PUBLIC(void) new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer,
+                                    const char *value, const char *key);
+XBT_PUBLIC(void) new_pajeStartLinkWithSize (double timestamp, container_t container, type_t type,
+                                            container_t sourceContainer, const char *value, const char *key, int size);
+XBT_PUBLIC(void) new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer,
+                                  const char *value, const char *key);
 XBT_PUBLIC(void) new_pajeNewEvent (double timestamp, container_t container, type_t type, val_t value);
 
-//for tracing gtnets
-void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst);
-
 /* from instr_config.c */
-int TRACE_needs_platform (void);
-int TRACE_is_enabled(void);
-int TRACE_platform(void);
-int TRACE_platform_topology(void);
-int TRACE_is_configured(void);
-int TRACE_categorized (void);
-int TRACE_uncategorized (void);
-int TRACE_msg_process_is_enabled(void);
-int TRACE_msg_vm_is_enabled(void);
-int TRACE_buffer (void);
-int TRACE_disable_link(void);
-int TRACE_disable_power(void);
-int TRACE_onelink_only (void);
-int TRACE_disable_destroy (void);
-int TRACE_basic (void);
-int TRACE_display_sizes (void);
-char *TRACE_get_comment (void);
-char *TRACE_get_comment_file (void);
-char *TRACE_get_filename(void);
-char *TRACE_get_viva_uncat_conf (void);
-char *TRACE_get_viva_cat_conf (void);
-void TRACE_generate_viva_uncat_conf (void);
-void TRACE_generate_viva_cat_conf (void);
-void instr_pause_tracing (void);
-void instr_resume_tracing (void);
+XBT_PRIVATE bool TRACE_needs_platform (void);
+XBT_PRIVATE bool TRACE_is_enabled(void);
+XBT_PRIVATE bool TRACE_platform(void);
+XBT_PRIVATE bool TRACE_platform_topology(void);
+XBT_PRIVATE bool TRACE_is_configured(void);
+XBT_PRIVATE bool TRACE_categorized (void);
+XBT_PRIVATE bool TRACE_uncategorized (void);
+XBT_PRIVATE bool TRACE_msg_process_is_enabled(void);
+XBT_PRIVATE bool TRACE_msg_vm_is_enabled(void);
+XBT_PRIVATE bool TRACE_buffer (void);
+XBT_PRIVATE bool TRACE_disable_link(void);
+XBT_PRIVATE bool TRACE_disable_speed(void);
+XBT_PRIVATE bool TRACE_onelink_only (void);
+XBT_PRIVATE bool TRACE_disable_destroy (void);
+XBT_PRIVATE bool TRACE_basic (void);
+XBT_PRIVATE bool TRACE_display_sizes (void);
+XBT_PRIVATE char *TRACE_get_comment (void);
+XBT_PRIVATE char *TRACE_get_comment_file (void);
+XBT_PRIVATE int TRACE_precision (void);
+XBT_PRIVATE char *TRACE_get_filename(void);
+XBT_PRIVATE char *TRACE_get_viva_uncat_conf (void);
+XBT_PRIVATE char *TRACE_get_viva_cat_conf (void);
+XBT_PRIVATE void TRACE_generate_viva_uncat_conf (void);
+XBT_PRIVATE void TRACE_generate_viva_cat_conf (void);
+XBT_PRIVATE void instr_pause_tracing (void);
+XBT_PRIVATE void instr_resume_tracing (void);
 
 /* Public functions used in SMPI */
-XBT_PUBLIC(int) TRACE_smpi_is_enabled(void);
-XBT_PUBLIC(int) TRACE_smpi_is_grouped(void);
-XBT_PUBLIC(int) TRACE_smpi_is_computing(void);
-XBT_PUBLIC(int) TRACE_smpi_is_sleeping(void);
-XBT_PUBLIC(int) TRACE_smpi_view_internals(void);
+XBT_PUBLIC(bool) TRACE_smpi_is_enabled(void);
+XBT_PUBLIC(bool) TRACE_smpi_is_grouped(void);
+XBT_PUBLIC(bool) TRACE_smpi_is_computing(void);
+XBT_PUBLIC(bool) TRACE_smpi_is_sleeping(void);
+XBT_PUBLIC(bool) TRACE_smpi_view_internals(void);
 
 /* from resource_utilization.c */
-void TRACE_surf_host_set_utilization(const char *resource,
-                                     const char *category,
-                                     double value,
-                                     double now,
+XBT_PRIVATE void TRACE_surf_host_set_utilization(const char *resource, const char *category, double value, double now,
                                      double delta);
-void TRACE_surf_link_set_utilization(const char *resource,
-                                     const char *category,
-                                     double value,
-                                     double now,
+XBT_PRIVATE void TRACE_surf_link_set_utilization(const char *resource,const char *category, double value, double now,
                                      double delta);
-void TRACE_surf_resource_utilization_alloc(void);
+XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc(void);
 
 /* instr_paje.c */
-extern xbt_dict_t trivaNodeTypes;
-extern xbt_dict_t trivaEdgeTypes;
-long long int instr_new_paje_id (void);
-void PJ_container_alloc (void);
-void PJ_container_release (void);
+extern XBT_PRIVATE xbt_dict_t trivaNodeTypes;
+extern XBT_PRIVATE xbt_dict_t trivaEdgeTypes;
+XBT_PRIVATE long long int instr_new_paje_id (void);
+XBT_PRIVATE void PJ_container_alloc (void);
+XBT_PRIVATE void PJ_container_release (void);
 XBT_PUBLIC(container_t) PJ_container_new (const char *name, e_container_types kind, container_t father);
 XBT_PUBLIC(container_t) PJ_container_get (const char *name);
 XBT_PUBLIC(container_t) PJ_container_get_or_null (const char *name);
@@ -328,58 +329,55 @@ XBT_PUBLIC(void) PJ_container_free_all (void);
 XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
 
 /* instr_paje_types.c */
-void PJ_type_alloc (void);
-void PJ_type_release (void);
+XBT_PRIVATE void PJ_type_alloc (void);
+XBT_PRIVATE void PJ_type_release (void);
 XBT_PUBLIC(type_t)  PJ_type_get_root (void);
-type_t PJ_type_container_new (const char *name, type_t father);
-type_t PJ_type_event_new (const char *name, type_t father);
-type_t PJ_type_variable_new (const char *name, const char *color, type_t father);
+XBT_PRIVATE type_t PJ_type_container_new (const char *name, type_t father);
+XBT_PRIVATE type_t PJ_type_event_new (const char *name, type_t father);
 type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest);
-type_t PJ_type_state_new (const char *name, type_t father);
+XBT_PRIVATE XBT_PRIVATE type_t PJ_type_variable_new (const char *name, const char *color, type_t father);
+XBT_PRIVATE type_t PJ_type_state_new (const char *name, type_t father);
 XBT_PUBLIC(type_t)  PJ_type_get (const char *name, const type_t father);
 XBT_PUBLIC(type_t)  PJ_type_get_or_null (const char *name, type_t father);
-void PJ_type_free (type_t type);
 void PJ_type_free_all (void);
+XBT_PRIVATE XBT_PRIVATE void PJ_type_free (type_t type);
 
 /* instr_paje_values.c */
 XBT_PUBLIC(val_t)  PJ_value_new (const char *name, const char *color, type_t father);
 XBT_PUBLIC(val_t)  PJ_value_get_or_new (const char *name, const char *color, type_t father);
 XBT_PUBLIC(val_t)  PJ_value_get (const char *name, const type_t father);
-void PJ_value_free (val_t value);
-
-void print_pajeDefineContainerType(paje_event_t event);
-void print_pajeDefineVariableType(paje_event_t event);
-void print_pajeDefineStateType(paje_event_t event);
-void print_pajeDefineEventType(paje_event_t event);
-void print_pajeDefineLinkType(paje_event_t event);
-void print_pajeDefineEntityValue (paje_event_t event);
-void print_pajeCreateContainer(paje_event_t event);
-void print_pajeDestroyContainer(paje_event_t event);
-void print_pajeSetVariable(paje_event_t event);
-void print_pajeAddVariable(paje_event_t event);
-void print_pajeSubVariable(paje_event_t event);
-void print_pajeSetState(paje_event_t event);
-void print_pajePushState(paje_event_t event);
-void print_pajePopState(paje_event_t event);
-void print_pajeResetState(paje_event_t event);
-void print_pajeStartLink(paje_event_t event);
-void print_pajeEndLink(paje_event_t event);
-void print_pajeNewEvent (paje_event_t event);
-
-void print_TIPushState(paje_event_t event);
-void print_TICreateContainer(paje_event_t event);
-void print_TIDestroyContainer(paje_event_t event);
-void TRACE_TI_start(void);
-void TRACE_TI_end(void);
-void TRACE_TI_init(void);
-
-void print_NULL (paje_event_t event);
-void TRACE_paje_dump_buffer (int force);
-void dump_comment_file (const char *filename);
-void dump_comment (const char *comment);
-
-
-
+XBT_PRIVATE void PJ_value_free (val_t value);
+
+XBT_PRIVATE void print_pajeDefineContainerType(paje_event_t event);
+XBT_PRIVATE void print_pajeDefineVariableType(paje_event_t event);
+XBT_PRIVATE void print_pajeDefineStateType(paje_event_t event);
+XBT_PRIVATE void print_pajeDefineEventType(paje_event_t event);
+XBT_PRIVATE void print_pajeDefineLinkType(paje_event_t event);
+XBT_PRIVATE void print_pajeDefineEntityValue (paje_event_t event);
+XBT_PRIVATE void print_pajeCreateContainer(paje_event_t event);
+XBT_PRIVATE void print_pajeDestroyContainer(paje_event_t event);
+XBT_PRIVATE void print_pajeSetVariable(paje_event_t event);
+XBT_PRIVATE void print_pajeAddVariable(paje_event_t event);
+XBT_PRIVATE void print_pajeSubVariable(paje_event_t event);
+XBT_PRIVATE void print_pajeSetState(paje_event_t event);
+XBT_PRIVATE void print_pajePushState(paje_event_t event);
+XBT_PRIVATE void print_pajePopState(paje_event_t event);
+XBT_PRIVATE void print_pajeResetState(paje_event_t event);
+XBT_PRIVATE void print_pajeStartLink(paje_event_t event);
+XBT_PRIVATE void print_pajeEndLink(paje_event_t event);
+XBT_PRIVATE void print_pajeNewEvent (paje_event_t event);
+
+XBT_PRIVATE void print_TIPushState(paje_event_t event);
+XBT_PRIVATE void print_TICreateContainer(paje_event_t event);
+XBT_PRIVATE void print_TIDestroyContainer(paje_event_t event);
+XBT_PRIVATE void TRACE_TI_start(void);
+XBT_PRIVATE void TRACE_TI_end(void);
+XBT_PRIVATE void TRACE_TI_init(void);
+
+XBT_PRIVATE void print_NULL (paje_event_t event);
+XBT_PRIVATE void TRACE_paje_dump_buffer (int force);
+XBT_PRIVATE void dump_comment_file (const char *filename);
+XBT_PRIVATE void dump_comment (const char *comment);
 
 typedef struct instr_trace_writer {
   void (*print_DefineContainerType) (paje_event_t event);
@@ -402,12 +400,9 @@ typedef struct instr_trace_writer {
   void (*print_NewEvent) (paje_event_t event);
 } s_instr_trace_writer_t;
 
-
-
 struct s_instr_extra_data;
 typedef struct s_instr_extra_data *instr_extra_data;
 
-
 typedef enum{
   TRACING_INIT,
   TRACING_FINALIZE,
@@ -444,8 +439,6 @@ typedef enum{
   TRACING_EXSCAN
 } e_caller_type ;
 
-
-
 typedef struct s_instr_extra_data {
   e_caller_type type;
   int send_size;
@@ -464,8 +457,8 @@ typedef struct s_instr_extra_data {
 
 SG_END_DECL()
 
-#ifdef HAVE_JEDULE
-#include "instr/jedule/jedule_sd_binding.h"
+#if HAVE_JEDULE
+#include "simgrid/jedule/jedule_sd_binding.h"
 #endif
 
 #endif /* INSTR_PRIVATE_H_ */