X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0fe1137efda109ff1a402ab5f8317d3ec3a676dc..36fa571a13985879dc627c70ecc2340af606aa42:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index da772b5103..0e594097fe 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. 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. */
@@ -7,16 +6,9 @@
 #ifndef _SURF_SURF_PRIVATE_H
 #define _SURF_SURF_PRIVATE_H
 
-#include <xbt/base.h>
-
 #include "surf/surf.h"
 #include "surf/maxmin.h"
-#include "surf/trace_mgr.h"
-#include "xbt/log.h"
-#include "surf/surfxml_parse.h"
-#include "surf/random_mgr.h"
-#include "instr/instr_private.h"
-#include "surf/surfxml_parse_values.h"
+#include "src/surf/trace_mgr.hpp"
 
 #define NO_MAX_DURATION -1.0
 
@@ -30,8 +22,11 @@ extern XBT_PRIVATE const char *surf_action_state_names[6];
  * @brief Possible update mechanisms
  */
 typedef enum {
-  UM_FULL,      /**< [TODO] */
-  UM_LAZY,      /**< [TODO] */
+  UM_FULL,      /**< Full update mechanism: the remaining time of every action is recomputed at each step */
+  UM_LAZY,      /**< Lazy update mechanism: only the modified actions get recomputed.
+                     It may be slower than full if your system is tightly coupled to the point where every action
+                     gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for
+                     a simple full update.  */
   UM_UNDEFINED  /**< Mechanism not defined */
 } e_UM_t;
 
@@ -39,62 +34,23 @@ typedef enum {
 
 XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
 
-extern XBT_PRIVATE tmgr_history_t history;
-
 /* The __surf_is_absolute_file_path() returns 1 if
  * file_path is a absolute file path, in the other
  * case the function returns 0.
  */
 XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path);
 
-/**
- * Routing logic
- */
-
-typedef struct s_model_type {
-  const char *name;
-  const char *desc;
-  AS_t (*create) ();
-  void (*end) (AS_t as);
-} s_routing_model_description_t, *routing_model_description_t;
-
-/* This enum used in the routing structure helps knowing in which situation we are. */
-typedef enum {
-  SURF_ROUTING_NULL = 0,   /**< Undefined type                                   */
-  SURF_ROUTING_BASE,       /**< Base case: use simple link lists for routing     */
-  SURF_ROUTING_RECURSIVE   /**< Recursive case: also return gateway informations */
-} e_surf_routing_hierarchy_t;
+extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
 
-XBT_PUBLIC(void) routing_model_create(void *loopback);
-XBT_PUBLIC(void) routing_exit(void);
-XBT_PUBLIC(void) storage_register_callbacks(void);
 
-/* ***************************************** */
-/* TUTORIAL: New TAG                         */
-XBT_PUBLIC(void) gpu_register_callbacks(void);
-/* ***************************************** */
-
-XBT_PUBLIC(void) routing_register_callbacks(void);
-XBT_PUBLIC(void) generic_free_route(sg_platf_route_cbarg_t route); // FIXME rename to routing_route_free
- // FIXME: make previous function private to routing again?
-
-
-XBT_PUBLIC(void) routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
-                              xbt_dynar_t * route, double *latency);
-
-XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc);
-/**
- * Resource protected methods
- */
-XBT_PUBLIC(void) surfxml_bufferstack_push(int _new);
-XBT_PUBLIC(void) surfxml_bufferstack_pop(int _new);
-XBT_PUBLIC(void) parse_after_config(void);
+XBT_PUBLIC(void) storage_register_callbacks();
 
-XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
+XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t rc);
+XBT_PRIVATE void parse_after_config();
 
 /********** Tracing **********/
 /* from surf_instr.c */
-void TRACE_surf_host_set_power(double date, const char *resource, double power);
+void TRACE_surf_host_set_speed(double date, const char *resource, double power);
 void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth);
 
 SG_END_DECL()