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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
simgrid
/
datatypes.h
diff --git
a/include/simgrid/datatypes.h
b/include/simgrid/datatypes.h
index
94e1d6e
..
035a6af
100644
(file)
--- a/
include/simgrid/datatypes.h
+++ b/
include/simgrid/datatypes.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2013-201
5
. 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
@@
-7,14
+7,16
@@
#ifndef SIMGRID_DATATYPES_H_
#define SIMGRID_DATATYPES_H_
#ifndef SIMGRID_DATATYPES_H_
#define SIMGRID_DATATYPES_H_
-typedef struct ws_params {
+#include <simgrid/forward.h>
+
+typedef struct vm_params {
int ncpus;
sg_size_t ramsize;
int overcommit;
/* The size of other states than memory pages, which is out-of-scope of dirty
* page tracking. */
int ncpus;
sg_size_t ramsize;
int overcommit;
/* The size of other states than memory pages, which is out-of-scope of dirty
* page tracking. */
-
long
devsize;
+
sg_size_t
devsize;
int skip_stage1;
int skip_stage2;
double max_downtime;
int skip_stage1;
int skip_stage2;
double max_downtime;
@@
-22,11
+24,8
@@
typedef struct ws_params {
double dp_rate;
double dp_cap; /* bytes per 1 flop execution */
double dp_rate;
double dp_cap; /* bytes per 1 flop execution */
- double xfer_cpu_overhead;
- double dpt_cpu_overhead;
-
/* set migration speed */
double mig_speed;
/* set migration speed */
double mig_speed;
-} s_
ws_params_t, *ws
_params_t;
+} s_
vm_params_t, *vm
_params_t;
#endif /* SIMGRID_DATATYPES_H_ */
#endif /* SIMGRID_DATATYPES_H_ */