X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/69b85c9e1af02bcf07222b50ffbe83781b6027b2..eff2324504a9161166f095f4fe512a122da6854e:/src/instr/private.h?ds=sidebyside

diff --git a/src/instr/private.h b/src/instr/private.h
index 8c3d72e384..89b16ee2fe 100644
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -1,30 +1,25 @@
-/*
- * private.h
- *
- *  Created on: Nov 23, 2009
- *      Author: Lucas Schnorr
- *     License: 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.
- *
- *     Copyright (c) 2009 The SimGrid team.
- */
+/* Copyright (c) 2010. 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. */
 
 #ifndef INSTR_PRIVATE_H_
 #define INSTR_PRIVATE_H_
 
-#include "instr/tracing_config.h"
+#include "simgrid_config.h"
 
 #ifdef HAVE_TRACING
 
 extern int tracing_active; /* declared in paje.c */
-extern int trace_mask; /* declared in interface.c */
 
 #define IS_TRACING			  (tracing_active)
 #define IS_TRACED(n)          (n->category)
-#define IS_TRACING_TASKS      ((TRACE_TASK)&trace_mask)
-#define IS_TRACING_PLATFORM   ((TRACE_PLATFORM)&trace_mask)
-#define IS_TRACING_PROCESSES  ((TRACE_PROCESS)&trace_mask)
+#define IS_TRACING_TASKS      (_TRACE_msg_task_enabled())
+#define IS_TRACING_PLATFORM   (_TRACE_platform_enabled())
+#define IS_TRACING_PROCESSES  (_TRACE_msg_process_enabled())
+#define IS_TRACING_VOLUME     (_TRACE_msg_volume_enabled())
+#define IS_TRACING_SMPI       (_TRACE_smpi_enabled())
 
 #include "instr/instr.h"
 #include "msg/msg.h"
@@ -53,11 +48,13 @@ void pajePushStateWithBandwidthUsed (double time, const char *entityType, const
 void pajePopState (double time, const char *entityType, const char *container);
 void pajeStartLink (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key);
 void pajeStartLinkWithBandwidthLatency (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key, double bw, double lat);
+void pajeStartLinkWithVolume (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key, double volume);
 void pajeEndLink (double time, const char *entityType, const char *container, const char *value, const char *destContainer, const char *key);
 void pajeDefineVariableType(const char *alias, const char *containerType, const char *name);
 void pajeSetVariable (double time, const char *entityType, const char *container, const char *value);
 void pajeAddVariable (double time, const char *entityType, const char *container, const char *value);
 void pajeSubVariable (double time, const char *entityType, const char *container, const char *value);
+void pajeNewEvent (double time, const char *entityType, const char *container, const char *value);
 
 /* from general.c */
 char *TRACE_paje_msg_container (m_task_t task, char *host, char *output, int len);
@@ -75,6 +72,8 @@ void __TRACE_current_category_set (m_task_t task);
 void __TRACE_current_category_unset (void);
 char *__TRACE_current_category_get (smx_process_t proc);
 void __TRACE_task_location (m_task_t task);
+void __TRACE_task_location_present (m_task_t task);
+void __TRACE_task_location_not_present (m_task_t task);
 void TRACE_msg_task_create (m_task_t task);
 void TRACE_msg_task_execute_start (m_task_t task);
 void TRACE_msg_task_execute_end (m_task_t task);
@@ -87,6 +86,7 @@ void TRACE_msg_task_put_end (void);
 /* declaration of instrumentation functions from msg_process_instr.c */
 void __TRACE_msg_process_init (void);
 void __TRACE_msg_process_location (m_process_t process);
+void __TRACE_msg_process_present (m_process_t process);
 void TRACE_msg_process_change_host (m_process_t process, m_host_t old_host, m_host_t new_host);
 void TRACE_msg_process_kill (m_process_t process);
 void TRACE_msg_process_suspend (m_process_t process);
@@ -95,6 +95,10 @@ void TRACE_msg_process_sleep_in (m_process_t process); //called from msg/gos.c
 void TRACE_msg_process_sleep_out (m_process_t process);
 void TRACE_msg_process_end (m_process_t process);
 
+/* declaration of instrumentation functions from msg_volume.c */
+void __TRACE_msg_volume_start (m_task_t task);
+void __TRACE_msg_volume_finish (m_task_t task);
+
 /* from smx.c */
 void TRACE_smx_action_execute (smx_action_t act);
 void TRACE_smx_action_communicate (smx_action_t act, smx_process_t proc);
@@ -109,15 +113,15 @@ void __TRACE_surf_set_resource_variable (double date, const char *variable, cons
 void TRACE_surf_host_declaration (char *name, double power);
 void TRACE_surf_host_set_power (double date, char *resource, double power);
 void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
+void TRACE_surf_host_define_id (const char *name, int host_id);
+void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h);
 void TRACE_surf_link_declaration (char *name, double bw, double lat);
 void TRACE_surf_link_set_bandwidth (double date, char *resource, double bandwidth);
 void TRACE_surf_link_set_latency (double date, char *resource, double latency);
 void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
-void TRACE_surf_routing_full_parse_end (char *link_name, int src, int dst);
-void TRACE_surf_missing_link (void);
-void TRACE_surf_define_host_id (const char *name, int host_id);
+void TRACE_surf_link_save_endpoints (char *link_name, int src, int dst);
+void TRACE_surf_link_missing (void);
 void TRACE_msg_clean (void);
-void TRACE_surf_vivaldi_parse_host (char *host, double x, double y, double h);
 
 //for tracing gtnets
 void TRACE_surf_gtnets_communicate (void *action, int src, int dst);
@@ -125,6 +129,16 @@ int TRACE_surf_gtnets_get_src (void *action);
 int TRACE_surf_gtnets_get_dst (void *action);
 void TRACE_surf_gtnets_destroy (void *action);
 
+/* from instr_config.c */
+int _TRACE_smpi_enabled (void);
+int _TRACE_platform_enabled (void);
+int _TRACE_msg_task_enabled (void);
+int _TRACE_msg_process_enabled (void);
+int _TRACE_msg_volume_enabled (void);
+char *_TRACE_filename (void);
+void TRACE_global_init(int *argc, char **argv);
+
+
 #endif
 
 #endif /* PRIVATE_H_ */