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]
/
src
/
msg
/
msg_vm.cpp
diff --git
a/src/msg/msg_vm.cpp
b/src/msg/msg_vm.cpp
index
4b360b7
..
2e11d89
100644
(file)
--- a/
src/msg/msg_vm.cpp
+++ b/
src/msg/msg_vm.cpp
@@
-180,7
+180,7
@@
msg_vm_t MSG_vm_create(msg_host_t pm, const char *name,
{
/* For the moment, intensity_rate is the percentage against the migration
* bandwidth */
- double host_speed = MSG_
get_hos
t_speed(pm);
+ double host_speed = MSG_
host_ge
t_speed(pm);
double update_speed = ((double)dp_intensity/100) * mig_netspeed;
msg_vm_t vm = MSG_vm_create_core(pm, name);
@@
-196,7
+196,7
@@
msg_vm_t MSG_vm_create(msg_host_t pm, const char *name,
params.mig_speed = (double)mig_netspeed * 1024 * 1024; // mig_speed
//XBT_INFO("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f",params.dp_rate, params.mig_speed, dp_intensity, update_speed, host_speed);
- vm->set
_p
arameters(¶ms);
+ vm->set
P
arameters(¶ms);
return vm;
}
@@
-359,7
+359,7
@@
static int migration_rx_fun(int argc, char *argv[])
struct migration_session *ms = (migration_session *) MSG_process_get_data(MSG_process_self());
s_vm_params_t params;
- ms->vm->
get_
parameters(¶ms);
+ ms->vm->parameters(¶ms);
int need_exit = 0;
@@
-610,17
+610,17
@@
static sg_size_t send_migration_data(msg_vm_t vm, msg_host_t src_pm, msg_host_t
} else if (ret == MSG_TIMEOUT) {
sg_size_t remaining = (sg_size_t)MSG_task_get_remaining_communication(task);
sent = size - remaining;
- XBT_
INFO
("timeout (%lf s) in sending_migration_data, remaining %llu bytes of %llu",
+ XBT_
VERB
("timeout (%lf s) in sending_migration_data, remaining %llu bytes of %llu",
timeout, remaining, size);
}
/* FIXME: why try-and-catch is used here? */
if(ret == MSG_HOST_FAILURE){
- //XBT_
INFO
("SRC host failed during migration of %s (stage %d)", sg_host_name(vm), stage);
+ //XBT_
DEBUG
("SRC host failed during migration of %s (stage %d)", sg_host_name(vm), stage);
MSG_task_destroy(task);
THROWF(host_error, 0, "SRC host failed during migration of %s (stage %d)", sg_host_get_name(vm), stage);
}else if(ret == MSG_TRANSFER_FAILURE){
- //XBT_
INFO
("DST host failed during migration of %s (stage %d)", sg_host_name(vm), stage);
+ //XBT_
DEBUG
("DST host failed during migration of %s (stage %d)", sg_host_name(vm), stage);
MSG_task_destroy(task);
THROWF(host_error, 0, "DST host failed during migration of %s (stage %d)", sg_host_get_name(vm), stage);
}
@@
-688,7
+688,7
@@
static int migration_tx_fun(int argc, char *argv[])
(migration_session *) MSG_process_get_data(MSG_process_self());
s_vm_params_t params;
- ms->vm->
get_
parameters(¶ms);
+ ms->vm->parameters(¶ms);
const sg_size_t ramsize = params.ramsize;
const sg_size_t devsize = params.devsize;
const int skip_stage1 = params.skip_stage1;
@@
-726,13
+726,13
@@
static int migration_tx_fun(int argc, char *argv[])
/* At stage 1, we do not need timeout. We have to send all the memory
* pages even though the duration of this tranfer exceeds the timeout
* value. */
- XBT_
INFO
("Stage 1: Gonna send %llu", ramsize);
+ XBT_
VERB
("Stage 1: Gonna send %llu", ramsize);
sg_size_t sent = send_migration_data(ms->vm, ms->src_pm, ms->dst_pm, ramsize, ms->mbox, 1, 0, mig_speed, -1);
remaining_size -= sent;
computed_during_stage1 = lookup_computed_flop_counts(ms->vm, 1, 0);
if (sent < ramsize) {
- XBT_
INFO
("mig-stage1: timeout, force moving to stage 3");
+ XBT_
VERB
("mig-stage1: timeout, force moving to stage 3");
skip_stage2 = 1;
} else if (sent > ramsize)
XBT_CRITICAL("bug");
@@
-747,7
+747,7
@@
static int migration_tx_fun(int argc, char *argv[])
double clock_post_send = MSG_get_clock();
mig_timeout -= (clock_post_send - clock_prev_send);
if (mig_timeout < 0) {
- XBT_
INFO
("The duration of stage 1 exceeds the timeout value (%lf > %lf), skip stage 2",
+ XBT_
VERB
("The duration of stage 1 exceeds the timeout value (%lf > %lf), skip stage 2",
(clock_post_send - clock_prev_send), MIGRATION_TIMEOUT_DO_NOT_HARDCODE_ME);
skip_stage2 = 1;
}
@@
-815,7
+815,7
@@
static int migration_tx_fun(int argc, char *argv[])
} else if (sent < updated_size) {
/* When timeout happens, we move to stage 3. The size of memory pages
* updated before timeout must be added to the remaining size. */
- XBT_
INFO
("mig-stage2.%d: timeout, force moving to stage 3. sent %llu / %llu, eta %lf",
+ XBT_
VERB
("mig-stage2.%d: timeout, force moving to stage 3. sent %llu / %llu, eta %lf",
stage2_round, sent, updated_size, (clock_post_send - clock_prev_send));
remaining_size -= sent;
@@
-899,12
+899,12
@@
static int do_migration(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm)
if(ret == MSG_HOST_FAILURE){
// Note that since the communication failed, the owner did not change and the task should be destroyed on the other side.
// Hence, just throw the execption
- XBT_
INFO
("SRC crashes, throw an exception (m-control)");
+ XBT_
ERROR
("SRC crashes, throw an exception (m-control)");
//MSG_process_kill(tx_process); // Adrien, I made a merge on Nov 28th 2014, I'm not sure whether this line is required or not
return -1;
}
else if((ret == MSG_TRANSFER_FAILURE) || (ret == MSG_TIMEOUT)){ // MSG_TIMEOUT here means that MSG_host_is_avail() returned false.
- XBT_
INFO
("DST crashes, throw an exception (m-control)");
+ XBT_
ERROR
("DST crashes, throw an exception (m-control)");
return -2;
}