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
Catch up with lastest API breakage (xbt_ex_free)
[simgrid.git]
/
src
/
gras
/
Virtu
/
sg_emul.c
diff --git
a/src/gras/Virtu/sg_emul.c
b/src/gras/Virtu/sg_emul.c
index
e2255f4
..
5884278
100644
(file)
--- a/
src/gras/Virtu/sg_emul.c
+++ b/
src/gras/Virtu/sg_emul.c
@@
-13,6
+13,7
@@
#include "xbt/xbt_portability.h" /* timers */
#include "xbt/dict.h"
#include "xbt/xbt_portability.h" /* timers */
#include "xbt/dict.h"
+#include "xbt/ex.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(emul,gras,"Emulation support");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(emul,gras,"Emulation support");
@@
-43,9
+44,9
@@
void gras_emul_exit(void) {
static void store_in_dict(xbt_dict_t dict, const char *key, double value)
{
static void store_in_dict(xbt_dict_t dict, const char *key, double value)
{
- double *ir
= NULL
;
+ double *ir;
-
xbt_dict_get(dict, key, (void *) &ir
);
+
ir = xbt_dict_get_or_null(dict, key
);
if (!ir) {
ir = xbt_new0(double,1);
xbt_dict_set(dict, key, ir, free);
if (!ir) {
ir = xbt_new0(double,1);
xbt_dict_set(dict, key, ir, free);
@@
-53,11
+54,8
@@
static void store_in_dict(xbt_dict_t dict, const char *key, double value)
*ir = value;
}
*ir = value;
}
-static double get_from_dict(xbt_dict_t dict, const char *key)
-{
- double *ir = NULL;
-
- xbt_dict_get(dict, key, (void *) &ir);
+static double get_from_dict(xbt_dict_t dict, const char *key) {
+ double *ir = xbt_dict_get(dict, key);
return *ir;
}
return *ir;
}
@@
-86,8
+84,7
@@
int gras_bench_always_end(void)
return 0;
}
return 0;
}
-int gras_bench_once_begin(const char *location,int line)
-{
+int gras_bench_once_begin(const char *location,int line) {
double *ir = NULL;
xbt_assert0(!benchmarking,"Already benchmarking");
benchmarking = 1;
double *ir = NULL;
xbt_assert0(!benchmarking,"Already benchmarking");
benchmarking = 1;
@@
-98,7
+95,7
@@
int gras_bench_once_begin(const char *location,int line)
}
sprintf(locbuf,"%s:%d",location, line);
}
sprintf(locbuf,"%s:%d",location, line);
-
xbt_dict_get(benchmark_set, locbuf, (void *) &ir
);
+
ir = xbt_dict_get_or_null(benchmark_set, locbuf
);
if(!ir) {
DEBUG1("%s",locbuf);
duration = 1;
if(!ir) {
DEBUG1("%s",locbuf);
duration = 1;