A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[From Arnaud Giersch] Fix memory leak when MSG_create_environment() or
[simgrid.git]
/
src
/
surf
/
surf_private.h
diff --git
a/src/surf/surf_private.h
b/src/surf/surf_private.h
index
8c70cd3
..
e1c110e
100644
(file)
--- a/
src/surf/surf_private.h
+++ b/
src/surf/surf_private.h
@@
-1,6
+1,5
@@
-/* $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. */
/* 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. */
@@
-14,9
+13,21
@@
#include "xbt/log.h"
#include "surf/surfxml_parse_private.h"
#include "surf/random_mgr.h"
#include "xbt/log.h"
#include "surf/surfxml_parse_private.h"
#include "surf/random_mgr.h"
+#include "instr/private.h"
#define NO_MAX_DURATION -1.0
#define NO_MAX_DURATION -1.0
+
+/* user-visible parameters */
extern double sg_tcp_gamma;
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;
+#ifdef HAVE_GTNETS
+ extern double sg_gtnets_jitter;
+ extern int sg_gtnets_jitter_seed;
+#endif
+
extern const char *surf_action_state_names[6];
extern const char *surf_action_state_names[6];
@@
-37,25
+48,19
@@
typedef struct surf_model_private {
void (*finalize) (void);
} s_surf_model_private_t;
void (*finalize) (void);
} s_surf_model_private_t;
-/* #define pub2priv(r) ((surf_model_private_t) ((char *)(r) -(sizeof(struct surf_model_private_part)))) */
-/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_model_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,
lmm_system_t sys,
void (*solve) (lmm_system_t));
/* Generic functions common to all models */
double generic_maxmin_share_resources(xbt_swag_t running_actions,
size_t offset,
lmm_system_t sys,
void (*solve) (lmm_system_t));
/* Generic functions common to all models */
-e_surf_action_state_t surf_action_state_get(surf_action_t action);
-double surf_action_get_start_time(surf_action_t action);
-double surf_action_get_finish_time(surf_action_t action);
+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_state_set(surf_action_t action,
e_surf_action_state_t state);
void surf_action_free(surf_action_t * action);
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);
+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);
extern tmgr_history_t history;
FILE *surf_fopen(const char *name, const char *mode);
extern tmgr_history_t history;
@@
-80,16
+85,28
@@
const char *__surf_get_initial_path(void);
*/
int __surf_is_absolute_file_path(const char *file_path);
*/
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* */
/*
* 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_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;
void (*finalize)(void);
int host_count;
+ int router_count;
};
XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
};
XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
@@
-97,6
+114,11
@@
XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
/*
* Resource protected methods
*/
/*
* Resource protected methods
*/
-XBT_PUBLIC(xbt_dict_t) surf_resource_properties(const void *resource);
+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 */
#endif /* _SURF_SURF_PRIVATE_H */