X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41f6e93622ccf2e2c09dd0fd75ef6ad4f458e80b..83ade874cb34c7f3afbc9f7a782e097cbb7209bf:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index e808d3fb51..730bcc7250 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -1,34 +1,109 @@
-/* Authors: Arnaud Legrand                                                  */
+/* Copyright (c) 2004-2015. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #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 "src/instr/instr_private.h"
+#include "surf/surfxml_parse_values.h"
+
+#define NO_MAX_DURATION -1.0
+
+SG_BEGIN_DECL()
+
+XBT_PUBLIC_DATA(xbt_dict_t) watched_hosts_lib;
+
+extern XBT_PRIVATE const char *surf_action_state_names[6];
+
+/** @ingroup SURF_interface
+ * @brief Possible update mechanisms
+ */
+typedef enum {
+  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;
+
+/* Generic functions common to all models */
+
+XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
+
+extern XBT_PRIVATE tmgr_fes_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;
+
+XBT_PUBLIC(void) routing_model_create(void *loopback);
+XBT_PUBLIC(void) routing_exit(void);
+XBT_PUBLIC(void) storage_register_callbacks(void);
+
+XBT_PRIVATE void routing_new_cluster(sg_platf_cluster_cbarg_t cluster);
+
+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_netcard_t src, sg_netcard_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_DATA(int) surfxml_bufferstack_size;
 
-typedef struct surf_resource_private {
-  /* Share the resources to the actions and return in hom much time
-      the next action may terminate */
-  xbt_heap_float_t(*share_resources) (xbt_heap_float_t now);	
-  /* Update the actions' state */
-  void (*update_actions_state) (xbt_heap_float_t now, xbt_heap_float_t delta);
-  void (*update_resource_state) (void *id,tmgr_trace_event_t event_type, xbt_maxmin_float_t value);
-} s_surf_resource_private_t;
+/********** Tracing **********/
+/* from surf_instr.c */
+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);
 
-/* #define pub2priv(r) ((surf_resource_private_t) ((char *)(r) -(sizeof(struct surf_resource_private_part)))) */
-/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_resource_private_part)))) */
+/********** Instr. **********/
 
-/* Generic functions common to all ressources */
-e_surf_action_state_t surf_action_get_state(surf_action_t action);
-void surf_action_free(surf_action_t * action);
-void surf_action_change_state(surf_action_t action, e_surf_action_state_t state);
+XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS);
+XBT_PRIVATE void sg_instr_new_router(sg_platf_router_cbarg_t router);
+XBT_PRIVATE void sg_instr_new_host(sg_platf_host_cbarg_t host);
+XBT_PRIVATE void sg_instr_AS_end(void);
 
-extern xbt_dynar_t resource_list;
-extern lmm_system_t maxmin_system;
-extern tmgr_history_t history;
+SG_END_DECL()
 
-#endif				/* _SURF_SURF_PRIVATE_H */
+#endif                          /* _SURF_SURF_PRIVATE_H */