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
No more dead code + bug fix.
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
f1206eb
..
2ff094e
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-20,14
+20,22
@@
lmm_system_t maxmin_system = NULL;
xbt_dynar_t surf_path = NULL;
double generic_maxmin_share_resources(xbt_swag_t running_actions,
xbt_dynar_t surf_path = NULL;
double generic_maxmin_share_resources(xbt_swag_t running_actions,
- size_t offset)
+ size_t offset)
+{
+ return generic_maxmin_share_resources2(running_actions, offset,
+ maxmin_system);
+}
+
+double generic_maxmin_share_resources2(xbt_swag_t running_actions,
+ size_t offset,
+ lmm_system_t sys)
{
surf_action_t action = NULL;
double min = -1;
double value = -1;
#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset))))
{
surf_action_t action = NULL;
double min = -1;
double value = -1;
#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset))))
- lmm_solve(
maxmin_system
);
+ lmm_solve(
sys
);
xbt_swag_foreach(action, running_actions) {
value = lmm_variable_getvalue(VARIABLE(action));
xbt_swag_foreach(action, running_actions) {
value = lmm_variable_getvalue(VARIABLE(action));
@@
-155,6
+163,8
@@
FILE *surf_fopen(const char *name, const char *mode)
char* path = NULL;
FILE *file = NULL;
char* path = NULL;
FILE *file = NULL;
+ xbt_assert1((name!=NULL), "Need a real file name, not \"%s\"\n",name);
+
xbt_assert0(surf_path,"surf_init has to be called before using surf_fopen");
if(!path_name) path_name=xbt_new0(char,strlen(name)+1);
xbt_assert0(surf_path,"surf_init has to be called before using surf_fopen");
if(!path_name) path_name=xbt_new0(char,strlen(name)+1);