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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index feae32af67..cfa4f8afd3 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -1,10 +1,8 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
-
 #ifndef _SURF_SURF_PRIVATE_H
 #define _SURF_SURF_PRIVATE_H
 
@@ -12,52 +10,117 @@
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
-#include "surf/surf_parse.h"
+#include "surf/surfxml_parse_private.h"
+#include "surf/random_mgr.h"
+#include "instr/private.h"
 
 #define NO_MAX_DURATION -1.0
 
-typedef enum {
-  SURF_NETWORK_LINK_ON = 1,	/* Ready        */
-  SURF_NETWORK_LINK_OFF = 0	/* Running      */
-} e_surf_network_link_state_t;
+/* user-visible parameters */
+extern double sg_tcp_gamma;
+extern double sg_latency_factor;
+extern double sg_bandwidth_factor;
+extern double sg_weight_S_parameter;
+extern int sg_maxmin_selective_update;
+extern int sg_network_fullduplex;
+#ifdef HAVE_GTNETS
+  extern double sg_gtnets_jitter;
+  extern int sg_gtnets_jitter_seed;
+#endif
+
+
+extern const char *surf_action_state_names[6];
 
-typedef struct surf_resource_private {
+typedef struct surf_model_private {
   int (*resource_used) (void *resource_id);
-  /* Share the resources to the actions and return in hom much time
+  /* Share the resources to the actions and return in how much time
      the next action may terminate */
   double (*share_resources) (double now);
   /* Update the actions' state */
   void (*update_actions_state) (double now, double delta);
   void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
-				 double value);
+                                 double value, double time);
   void (*finalize) (void);
-} s_surf_resource_private_t;
-
-/* #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)))) */
+} s_surf_model_private_t;
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
-				      size_t offset);
-double generic_maxmin_share_resources2(xbt_swag_t running_actions,
-				       size_t offset,
-				       lmm_system_t sys);
+                                      size_t offset,
+                                      lmm_system_t sys,
+                                      void (*solve) (lmm_system_t));
 
-/* Generic functions common to all ressources */
-e_surf_action_state_t surf_action_get_state(surf_action_t action);
+/* Generic functions common to all models */
+e_surf_action_state_t surf_action_state_get(surf_action_t action); /* cannot declare inline since we use a pointer to it */
+double surf_action_get_start_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
+double surf_action_get_finish_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
 void surf_action_free(surf_action_t * action);
-void surf_action_change_state(surf_action_t action,
-			      e_surf_action_state_t state);
-void surf_action_set_data(surf_action_t action,
-			  void *data);
+void surf_action_state_set(surf_action_t action,
+                              e_surf_action_state_t state);
+void surf_action_data_set(surf_action_t action, void *data); /* cannot declare inline since we use a pointer to it */
 FILE *surf_fopen(const char *name, const char *mode);
 
-static _XBT_INLINE void surf_double_update(double *variable, double value) 
-{
-  *variable -= value;
-  if(*variable< 0.00001) *variable = 0.0;
-}
-extern lmm_system_t maxmin_system;
 extern tmgr_history_t history;
 extern xbt_dynar_t surf_path;
 
-#endif				/* _SURF_SURF_PRIVATE_H */
+void surf_config_init(int *argc, char **argv);
+void surf_config_finalize(void);
+void surf_config(const char *name, va_list pa);
+
+
+/*
+ * 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.
+ */
+const char *__surf_get_initial_path(void);
+
+/* The __surf_is_absolute_file_path() returns 1 if
+ * file_path is a absolute file path, in the other
+ * case the function returns 0.
+ */
+int __surf_is_absolute_file_path(const char *file_path);
+
+/*
+ * One link routing list
+ */
+typedef struct {
+	int src_id;
+	int dst_id;
+	void *link_ptr;
+}s_onelink, *s_onelink_t;
+
+
+/*
+ * Routing logic
+ */
+struct s_routing {
+  const char *name;
+  xbt_dict_t host_id; /* char* -> int* */
+  xbt_dynar_t (*get_route)(int src, int dst);
+  xbt_dict_t (*get_onelink_routes)(void);
+  int (*is_router)(int id);
+  void (*finalize)(void);
+  int host_count;
+  int router_count;
+};
+XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
+
+/*
+ * generic methods to create resources bypassing the parser
+ * FIXME : better if added to the routing model instead
+ */
+XBT_PUBLIC(void) routing_add_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action);
+XBT_PUBLIC(void) routing_add_host(char* host_id);
+XBT_PUBLIC(void) routing_set_routes(void);
+
+/*
+ * Resource protected methods
+ */
+xbt_dict_t surf_resource_properties(const void *resource);
+
+XBT_PUBLIC(void) surfxml_bufferstack_push(int new);
+XBT_PUBLIC(void) surfxml_bufferstack_pop(int new);
+XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
+
+
+#endif /* _SURF_SURF_PRIVATE_H */