-/*
- * 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
#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"
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);
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);
/* 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);
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);
void __TRACE_surf_check_variable_set_to_zero (double now, const char *variable, const char *resource);
void __TRACE_surf_update_action_state_resource (double now, double delta, const char *type, const char *name, double value);
void __TRACE_surf_set_resource_variable (double date, const char *variable, const char *resource, double value);
-void TRACE_surf_update_action_state (void *surf_action, smx_action_t smx_action, double value, const char *stateValue, double now, double delta);
-void TRACE_surf_update_action_state_net_resource (const char *name, smx_action_t smx_action, double value, double now, double delta);
-void TRACE_surf_update_action_state_cpu_resource (const char *name, smx_action_t smx_action, double value, double now, double delta);
-void TRACE_surf_net_link_new (char *name, double bw, double lat);
-void TRACE_surf_cpu_new (char *name, double power);
-void TRACE_surf_cpu_set_power (double date, char *resource, double power);
+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_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_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
+void TRACE_surf_link_save_endpoints (char *link_name, int src, int dst);
+void TRACE_surf_link_missing (void);
void TRACE_msg_clean (void);
//for tracing gtnets
