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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
include
/
surf
/
surf_resource_lmm.h
diff --git
a/src/include/surf/surf_resource_lmm.h
b/src/include/surf/surf_resource_lmm.h
index
992f70d
..
b0d7e33
100644
(file)
--- a/
src/include/surf/surf_resource_lmm.h
+++ b/
src/include/surf/surf_resource_lmm.h
@@
-1,5
+1,5
@@
-/* Copyright (c) 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2009
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,7
+11,7
@@
#include "surf/trace_mgr.h"
#include "surf/surf_resource.h"
#include "surf/trace_mgr.h"
#include "surf/surf_resource.h"
-
+#ifdef TOMATO
static XBT_INLINE
surf_resource_lmm_t surf_resource_lmm_new(size_t childsize,
/* for superclass */
static XBT_INLINE
surf_resource_lmm_t surf_resource_lmm_new(size_t childsize,
/* for superclass */
@@
-28,7
+28,7
@@
static XBT_INLINE
surf_resource_lmm_t res =
(surf_resource_lmm_t) surf_resource_new(childsize, model, name,
surf_resource_lmm_t res =
(surf_resource_lmm_t) surf_resource_new(childsize, model, name,
- props);
+ props
, NULL
);
res->constraint = lmm_constraint_new(system, res, constraint_value);
res->state_current = state_init;
res->constraint = lmm_constraint_new(system, res, constraint_value);
res->state_current = state_init;
@@
-43,7
+43,7
@@
static XBT_INLINE
tmgr_history_add_trace(history, metric_trace, 0.0, 0, res);
return res;
}
tmgr_history_add_trace(history, metric_trace, 0.0, 0, res);
return res;
}
-
+#endif
static XBT_INLINE e_surf_resource_state_t surf_resource_lmm_get_state(void
*r)
static XBT_INLINE e_surf_resource_state_t surf_resource_lmm_get_state(void
*r)