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
/
surf
/
trace_mgr_private.h
diff --git
a/src/surf/trace_mgr_private.h
b/src/surf/trace_mgr_private.h
index
65d1bb7
..
1911def
100644
(file)
--- a/
src/surf/trace_mgr_private.h
+++ b/
src/surf/trace_mgr_private.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004, 2007, 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2004, 2007, 2009
-2010, 2012
. 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
@@
-31,15
+31,15
@@
typedef struct probabilist_event_generator {
double next_value;
union {
struct {
double next_value;
union {
struct {
- double
alpha
;
- double
beta
;
+ double
min
;
+ double
max
;
} s_uniform_parameters;
struct {
} s_uniform_parameters;
struct {
- double
lambda
;
+ double
rate
;
} s_exponential_parameters;
struct {
} s_exponential_parameters;
struct {
- double
lambda
;
- double
k
;
+ double
scale
;
+ double
shape
;
} s_weibull_parameters;
};
} s_probabilist_event_generator_t;
} s_weibull_parameters;
};
} s_probabilist_event_generator_t;
@@
-52,6
+52,7
@@
typedef struct tmgr_trace {
} s_list;
struct {
probabilist_event_generator_t event_generator[2];
} s_list;
struct {
probabilist_event_generator_t event_generator[2];
+ int is_state_trace;
int next_event;
} s_probabilist;
};
int next_event;
} s_probabilist;
};