X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0748addf6f2e71e61e6ae97e7da38fc82143e558..acbb75da93aabcc72d26ea4a40de0055264bf24c:/src/instr/private.h

diff --git a/src/instr/private.h b/src/instr/private.h
index f37f03e75f..a2b9663779 100644
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -1,14 +1,8 @@
-/*
- * 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_
@@ -25,6 +19,7 @@ extern int trace_mask; /* declared in interface.c */
 #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_VOLUME     ((TRACE_VOLUME)&trace_mask)
 
 #include "instr/instr.h"
 #include "msg/msg.h"
@@ -53,6 +48,7 @@ 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);
@@ -75,6 +71,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);
@@ -86,7 +84,8 @@ void TRACE_msg_task_put_end (void);
 
 /* declaration of instrumentation functions from msg_process_instr.c */
 void __TRACE_msg_process_init (void);
-int __TRACE_msg_process_location (m_process_t process);
+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 +94,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);