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
[mc] Move stacks_areas code in mcer_ignore
[simgrid.git]
/
src
/
simix
/
smx_host.c
diff --git
a/src/simix/smx_host.c
b/src/simix/smx_host.c
index
30043b0
..
20e7abb
100644
(file)
--- a/
src/simix/smx_host.c
+++ b/
src/simix/smx_host.c
@@
-9,6
+9,7
@@
#include "xbt/log.h"
#include "xbt/dict.h"
#include "mc/mc.h"
#include "xbt/log.h"
#include "xbt/dict.h"
#include "mc/mc.h"
+#include "mc/mc_replay.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
@@
-363,7
+364,7
@@
void SIMIX_host_autorestart(smx_host_t host)
}
smx_synchro_t SIMIX_host_execute(const char *name,
}
smx_synchro_t SIMIX_host_execute(const char *name,
- smx_host_t host, double
computation
_amount, double priority, double bound, unsigned long affinity_mask){
+ smx_host_t host, double
flops
_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
smx_synchro_t synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
/* alloc structures and initialize */
smx_synchro_t synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
@@
-371,15
+372,12
@@
smx_synchro_t SIMIX_host_execute(const char *name,
synchro->name = xbt_strdup(name);
synchro->state = SIMIX_RUNNING;
synchro->execution.host = host;
synchro->name = xbt_strdup(name);
synchro->state = SIMIX_RUNNING;
synchro->execution.host = host;
-
-#ifdef HAVE_TRACING
synchro->category = NULL;
synchro->category = NULL;
-#endif
/* set surf's action */
/* set surf's action */
- if (!MC_is_active()) {
+ if (!MC_is_active()
&& !MC_record_replay_is_active()
) {
- synchro->execution.surf_exec = surf_workstation_execute(host,
computation
_amount);
+ synchro->execution.surf_exec = surf_workstation_execute(host,
flops
_amount);
surf_action_set_data(synchro->execution.surf_exec, synchro);
surf_action_set_priority(synchro->execution.surf_exec, priority);
surf_action_set_data(synchro->execution.surf_exec, synchro);
surf_action_set_priority(synchro->execution.surf_exec, priority);
@@
-405,7
+403,7
@@
smx_synchro_t SIMIX_host_execute(const char *name,
smx_synchro_t SIMIX_host_parallel_execute(const char *name,
int host_nb, smx_host_t *host_list,
smx_synchro_t SIMIX_host_parallel_execute(const char *name,
int host_nb, smx_host_t *host_list,
- double *
computation_amount, double *communication
_amount,
+ double *
flops_amount, double *bytes
_amount,
double amount, double rate){
void **workstation_list = NULL;
double amount, double rate){
void **workstation_list = NULL;
@@
-417,10
+415,7
@@
smx_synchro_t SIMIX_host_parallel_execute(const char *name,
synchro->name = xbt_strdup(name);
synchro->state = SIMIX_RUNNING;
synchro->execution.host = NULL; /* FIXME: do we need the list of hosts? */
synchro->name = xbt_strdup(name);
synchro->state = SIMIX_RUNNING;
synchro->execution.host = NULL; /* FIXME: do we need the list of hosts? */
-
-#ifdef HAVE_TRACING
synchro->category = NULL;
synchro->category = NULL;
-#endif
/* set surf's synchro */
workstation_list = xbt_new0(void *, host_nb);
/* set surf's synchro */
workstation_list = xbt_new0(void *, host_nb);
@@
-441,10
+436,10
@@
smx_synchro_t SIMIX_host_parallel_execute(const char *name,
}
/* set surf's synchro */
}
/* set surf's synchro */
- if (!MC_is_active()) {
+ if (!MC_is_active()
&& !MC_record_replay_is_active()
) {
synchro->execution.surf_exec =
surf_workstation_model_execute_parallel_task((surf_workstation_model_t)surf_workstation_model,
synchro->execution.surf_exec =
surf_workstation_model_execute_parallel_task((surf_workstation_model_t)surf_workstation_model,
- host_nb, workstation_list,
computation_amount, communication
_amount, rate);
+ host_nb, workstation_list,
flops_amount, bytes
_amount, rate);
surf_action_set_data(synchro->execution.surf_exec, synchro);
}
surf_action_set_data(synchro->execution.surf_exec, synchro);
}
@@
-515,7
+510,7
@@
void simcall_HANDLER_host_execution_wait(smx_simcall_t simcall, smx_synchro_t sy
simcall->issuer->waiting_synchro = synchro;
/* set surf's synchro */
simcall->issuer->waiting_synchro = synchro;
/* set surf's synchro */
- if (MC_is_active()) {
+ if (MC_is_active()
|| MC_record_replay_is_active()
) {
synchro->state = SIMIX_DONE;
SIMIX_execution_finish(synchro);
return;
synchro->state = SIMIX_DONE;
SIMIX_execution_finish(synchro);
return;
@@
-610,7
+605,6
@@
void SIMIX_post_host_execute(smx_synchro_t synchro)
}
}
-#ifdef HAVE_TRACING
void SIMIX_set_category(smx_synchro_t synchro, const char *category)
{
if (synchro->state != SIMIX_RUNNING) return;
void SIMIX_set_category(smx_synchro_t synchro, const char *category)
{
if (synchro->state != SIMIX_RUNNING) return;
@@
-620,7
+614,6
@@
void SIMIX_set_category(smx_synchro_t synchro, const char *category)
surf_action_set_category(synchro->comm.surf_comm, category);
}
}
surf_action_set_category(synchro->comm.surf_comm, category);
}
}
-#endif
/**
* \brief Function to get the parameters of the given the SIMIX host.
/**
* \brief Function to get the parameters of the given the SIMIX host.