X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c57842fe897f53b46f0be3da87f7c996674be7d6..fa222c38f9b796be07ab4351ffc810a61a8fd705:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 2b56b6dce8..722dbbc962 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,13 +7,11 @@ #ifndef INSTR_PRIVATE_H_ #define INSTR_PRIVATE_H_ -#include "instr/instr.h" +#include "simgrid/instr.h" #include "instr/instr_interface.h" #include "internal_config.h" #include "simgrid_config.h" -#ifdef HAVE_TRACING - SG_BEGIN_DECL() /* Need to define function drand48 for Windows */ @@ -264,9 +262,6 @@ XBT_PUBLIC(void) new_pajeStartLinkWithSize (double timestamp, container_t contai 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); @@ -286,6 +281,7 @@ int TRACE_basic (void); int TRACE_display_sizes (void); char *TRACE_get_comment (void); char *TRACE_get_comment_file (void); +int TRACE_precision (void); char *TRACE_get_filename(void); char *TRACE_get_viva_uncat_conf (void); char *TRACE_get_viva_cat_conf (void); @@ -312,7 +308,7 @@ void TRACE_surf_link_set_utilization(const char *resource, 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; @@ -466,8 +462,6 @@ typedef struct s_instr_extra_data { SG_END_DECL() -#endif /* HAVE_TRACING */ - #ifdef HAVE_JEDULE #include "instr/jedule/jedule_sd_binding.h" #endif