X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f536df44e36ac12984106ae7c0e2784e45b30d6..81953284938d59f29f3ddd1ff09672a8c22e9106:/src/instr/instr_private.hpp diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index f4ada976c6..75690784bf 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -47,7 +47,6 @@ public: std::vector* recvcounts = nullptr; std::string send_type = ""; std::string recv_type = ""; - ; // NoOpTI: init, finalize, test, wait, barrier explicit TIData(std::string name) : name_(name){}; @@ -177,6 +176,8 @@ public: } } +XBT_PRIVATE std::string instr_pid(s4u_Actor* proc); + extern "C" { extern XBT_PRIVATE std::set created_categories; @@ -201,20 +202,15 @@ XBT_PRIVATE bool TRACE_platform_topology(); XBT_PRIVATE bool TRACE_is_configured(); XBT_PRIVATE bool TRACE_categorized(); XBT_PRIVATE bool TRACE_uncategorized(); -XBT_PRIVATE bool TRACE_msg_process_is_enabled(); +XBT_PRIVATE bool TRACE_actor_is_enabled(); XBT_PRIVATE bool TRACE_msg_vm_is_enabled(); XBT_PRIVATE bool TRACE_buffer(); XBT_PRIVATE bool TRACE_disable_link(); XBT_PRIVATE bool TRACE_disable_speed(); -XBT_PRIVATE bool TRACE_onelink_only(); XBT_PRIVATE bool TRACE_disable_destroy(); XBT_PRIVATE bool TRACE_basic(); XBT_PRIVATE bool TRACE_display_sizes(); XBT_PRIVATE int TRACE_precision(); -XBT_PRIVATE void TRACE_generate_viva_uncat_conf(); -XBT_PRIVATE void TRACE_generate_viva_cat_conf(); -XBT_PRIVATE void instr_pause_tracing(); -XBT_PRIVATE void instr_resume_tracing(); /* Public functions used in SMPI */ XBT_PUBLIC(bool) TRACE_smpi_is_enabled(); @@ -228,7 +224,6 @@ XBT_PRIVATE void TRACE_surf_host_set_utilization(const char* resource, const cha double delta); XBT_PRIVATE void TRACE_surf_link_set_utilization(const char* resource, const char* category, double value, double now, double delta); -XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc(); /* instr_paje.c */ extern XBT_PRIVATE std::set trivaNodeTypes; @@ -259,7 +254,5 @@ extern instr_fmt_type_t instr_fmt_type; XBT_PRIVATE std::string TRACE_get_comment(); XBT_PRIVATE std::string TRACE_get_comment_file(); XBT_PRIVATE std::string TRACE_get_filename(); -XBT_PRIVATE std::string TRACE_get_viva_uncat_conf(); -XBT_PRIVATE std::string TRACE_get_viva_cat_conf(); #endif