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
I forgot to update my tree before commiting (once again), and got conflicts as punishment
[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
e6dcfaa
..
1fce177
100644
(file)
--- a/
src/gras/Virtu/sg_emul.c
+++ b/
src/gras/Virtu/sg_emul.c
@@
-23,8
+23,8
@@
void gras_cpu_burn(double flops)
smx_action_t execution;
if (flops > 0){
smx_action_t execution;
if (flops > 0){
- execution =
SIMIX_req
_host_execute("task", SIMIX_host_self(), flops, 1);
-
SIMIX_req
_host_execution_wait(execution);
+ execution =
simcall
_host_execute("task", SIMIX_host_self(), flops, 1);
+
simcall
_host_execution_wait(execution);
}
}
}
}
@@
-41,15
+41,14
@@
static unsigned int locbufsize;
void gras_emul_init(void)
{
if (!benchmark_set) {
void gras_emul_init(void)
{
if (!benchmark_set) {
- benchmark_set = xbt_dict_new
(
);
+ benchmark_set = xbt_dict_new
_homogeneous(xbt_free_f
);
timer = xbt_os_timer_new();
}
}
void gras_emul_exit(void)
{
timer = xbt_os_timer_new();
}
}
void gras_emul_exit(void)
{
- if (locbuf)
- free(locbuf);
+ free(locbuf);
xbt_dict_free(&benchmark_set);
xbt_os_timer_free(timer);
}
xbt_dict_free(&benchmark_set);
xbt_os_timer_free(timer);
}
@@
-62,7
+61,7
@@
static void store_in_dict(xbt_dict_t dict, const char *key, double value)
ir = xbt_dict_get_or_null(dict, key);
if (!ir) {
ir = xbt_new0(double, 1);
ir = xbt_dict_get_or_null(dict, key);
if (!ir) {
ir = xbt_new0(double, 1);
- xbt_dict_set(dict, key, ir,
xbt_free_f
);
+ xbt_dict_set(dict, key, ir,
NULL
);
}
*ir = value;
}
}
*ir = value;
}
@@
-76,7
+75,7
@@
static double get_from_dict(xbt_dict_t dict, const char *key)
int gras_bench_always_begin(const char *location, int line)
{
int gras_bench_always_begin(const char *location, int line)
{
- xbt_assert
0
(!benchmarking, "Already benchmarking");
+ xbt_assert(!benchmarking, "Already benchmarking");
benchmarking = 1;
if (!timer)
benchmarking = 1;
if (!timer)
@@
-86,7
+85,7
@@
int gras_bench_always_begin(const char *location, int line)
int gras_bench_always_end(void)
{
int gras_bench_always_end(void)
{
- xbt_assert
0
(benchmarking, "Not benchmarking yet");
+ xbt_assert(benchmarking, "Not benchmarking yet");
benchmarking = 0;
xbt_os_timer_stop(timer);
duration = xbt_os_timer_elapsed(timer);
benchmarking = 0;
xbt_os_timer_stop(timer);
duration = xbt_os_timer_elapsed(timer);
@@
-99,7
+98,7
@@
int gras_bench_always_end(void)
int gras_bench_once_begin(const char *location, int line)
{
double *ir = NULL;
int gras_bench_once_begin(const char *location, int line)
{
double *ir = NULL;
- xbt_assert
0
(!benchmarking, "Already benchmarking");
+ xbt_assert(!benchmarking, "Already benchmarking");
benchmarking = 1;
if (!locbuf || locbufsize < strlen(location) + 64) {
benchmarking = 1;
if (!locbuf || locbufsize < strlen(location) + 64) {
@@
-122,7
+121,7
@@
int gras_bench_once_begin(const char *location, int line)
int gras_bench_once_end(void)
{
int gras_bench_once_end(void)
{
- xbt_assert
0
(benchmarking, "Not benchmarking yet");
+ xbt_assert(benchmarking, "Not benchmarking yet");
benchmarking = 0;
if (duration > 0) {
xbt_os_timer_stop(timer);
benchmarking = 0;
if (duration > 0) {
xbt_os_timer_stop(timer);