X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72723ea8d7fa1a09ed87e2c2f84e6467519a4354..da79d68ac67b62a07a3df69b8f1371874714ba90:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 4a43c922e0..7d7a121737 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -17,7 +17,6 @@ #include "simgrid/datatypes.h" #include "simgrid/forward.h" - #ifdef __cplusplus namespace simgrid { @@ -35,7 +34,6 @@ class Action; typedef simgrid::surf::Model surf_Model; typedef simgrid::surf::CpuModel surf_CpuModel; -typedef simgrid::surf::Cpu surf_Cpu; typedef simgrid::surf::HostModel surf_HostModel; typedef simgrid::surf::NetworkModel surf_NetworkModel; typedef simgrid::surf::StorageModel surf_StorageModel; @@ -46,12 +44,10 @@ typedef simgrid::surf::Action surf_Action; typedef struct surf_Model surf_Model; typedef struct surf_CpuModel surf_CpuModel; -typedef struct surf_Cpu surf_Cpu; typedef struct surf_HostModel surf_HostModel; typedef struct surf_NetworkModel surf_NetworkModel; typedef struct surf_StorageModel surf_StorageModel; typedef struct surf_Resource surf_Resource; -typedef struct surf_Host surf_Host; typedef struct surf_Action surf_Action; #endif @@ -61,7 +57,6 @@ SG_BEGIN_DECL() /* user-visible parameters */ extern XBT_PRIVATE double sg_tcp_gamma; -extern XBT_PRIVATE double sg_sender_gap; extern XBT_PRIVATE double sg_latency_factor; extern XBT_PRIVATE double sg_bandwidth_factor; extern XBT_PRIVATE double sg_weight_S_parameter; @@ -374,11 +369,6 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_host_model_description[]; */ XBT_PUBLIC(void) surf_vm_model_init_HL13(); -/** \ingroup SURF_simulation - * \brief List of hosts for which one want to be notified if they ever restart. - */ -XBT_PUBLIC_DATA(xbt_dict_t) watched_hosts_lib; - /*** SURF Globals **************************/ /** \ingroup SURF_simulation @@ -428,15 +418,9 @@ XBT_PUBLIC(double) surf_get_clock(); */ XBT_PUBLIC(void) surf_exit(); -/* Prototypes of the functions that handle the properties */ -XBT_PUBLIC_DATA(xbt_dict_t) current_property_set;// the prop set for the currently parsed element (also used in SIMIX) - /* surf parse file related (public because called from a test suite) */ XBT_PUBLIC(void) parse_platform_file(const char *file); -/* For the trace and trace:connect tag (store their content till the end of the parsing) */ -XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list; - /* * Returns the initial path. On Windows the initial path is the current directory for the current process in the other * case the function returns "./" that represents the current directory on Unix/Linux platforms. @@ -446,8 +430,6 @@ const char *__surf_get_initial_path(); /********** Tracing **********/ /* from surf_instr.c */ void TRACE_surf_action(surf_action_t surf_action, const char *category); -void TRACE_surf_alloc(); -void TRACE_surf_release(); /* instr_routing.c */ void instr_routing_define_callbacks ();