Added function prototypes in maxmin_private, minor bug corrections in

[simgrid.git] / src / surf / surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 6452c47..51dbd5f 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -12,9 +12,22 @@
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
-#include "surf/surf_parse.h"
+#include "surf/surfxml_parse_private.h"
 
 #define NO_MAX_DURATION -1.0
+#define SG_TCP_CTE_GAMMA 20000.0
+
+extern const char *surf_action_state_names[6];
+
+typedef enum {
+  SURF_NETWORK_LINK_ON = 1,    /* Ready        */
+  SURF_NETWORK_LINK_OFF = 0    /* Running      */
+} e_surf_network_link_state_t;
+
+typedef enum {
+  SURF_NETWORK_LINK_SHARED = 1,
+  SURF_NETWORK_LINK_FATPIPE = 0
+} e_surf_network_link_sharing_policy_t;
 
 typedef struct surf_resource_private {
   int (*resource_used) (void *resource_id);
@@ -31,17 +44,43 @@ typedef struct surf_resource_private {
 /* #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)))) */
 
+extern int use_sdp_solver;
+extern int use_lagrange_solver;
+
 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);
+
 /* Generic functions common to all ressources */
 e_surf_action_state_t surf_action_get_state(surf_action_t action);
+double surf_action_get_start_time(surf_action_t action);
+double surf_action_get_finish_time(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);
 void surf_action_set_data(surf_action_t action,
                          void *data);
+FILE * surf_fopen(const char *name, const char *mode);
 
 extern lmm_system_t maxmin_system;
 extern tmgr_history_t history;
+extern xbt_dynar_t surf_path;
+
+
+/*
+ * 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);
 
 #endif                         /* _SURF_SURF_PRIVATE_H */