From 7b980def32cd726e07193e679c3e97e0db47d91e Mon Sep 17 00:00:00 2001 From: Takahiro Hirofuchi Date: Wed, 4 Jun 2014 19:23:42 +0200 Subject: [PATCH 1/1] fix spell and remove trailing space --- examples/msg/cloud/master_worker_vm.tesh | 8 ++++---- examples/msg/cloud/simple_vm.tesh | 4 ++-- src/msg/msg_vm.c | 26 ++++++++++++------------ src/simix/smx_vm.c | 8 ++++---- src/surf/vm_workstation_hl13.cpp | 10 ++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/msg/cloud/master_worker_vm.tesh b/examples/msg/cloud/master_worker_vm.tesh index 6c443c3af5..a19cdce707 100644 --- a/examples/msg/cloud/master_worker_vm.tesh +++ b/examples/msg/cloud/master_worker_vm.tesh @@ -46,7 +46,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/master_worker_vm$EXEEXT --log=no_loc ${srcdir:=.}/ > [Intel:__pr_mig_tx:VM00(Intel-Intel):(7) 1097.307521] [msg_vm/WARNING] use the default max_downtime value 30ms > [Intel:__pr_mig_tx:VM00(Intel-Intel):(7) 1097.307521] [msg_vm/INFO] mig-stage1: remaining_size 1073741824.000000 > [VM01:WRK03:(5) 1097.380336] [msg_test/INFO] WRK03 executed task(Task03) -> [Intel:__pr_mig_tx:VM00(Intel-Intel):(7) 1099.463824] [msg_vm/INFO] actual banwdidth 474.886827 (MB/s), threshold 14938647.898422 +> [Intel:__pr_mig_tx:VM00(Intel-Intel):(7) 1099.463824] [msg_vm/INFO] actual bandwidth 474.886827 (MB/s), threshold 14938647.898422 > [Intel:__pr_mig_tx:VM00(Intel-Intel):(7) 1099.463824] [msg_vm/INFO] mig-stage 2:0 updated_size 0.000000 computed_during_stage1 0.000000 dp_rate 0.000000 dp_cap 0.000000 > [Intel:__pr_mig_tx:VM00(Intel-Intel):(7) 1099.463824] [msg_vm/INFO] mig-stage2.0: remaining_size 0.000000 (< threshold 14938647.898422) > [Intel:__pr_mig_tx:VM00(Intel-Intel):(7) 1099.463824] [msg_vm/INFO] mig-stage3: remaining_size 0.000000 @@ -54,7 +54,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/master_worker_vm$EXEEXT --log=no_loc ${srcdir:=.}/ > [Intel:__pr_mig_rx:VM00(Intel-Intel):(6) 1099.464019] [msg_vm/INFO] set affinity(0x0000@Intel) for VM00 > [Provost:__pr_mig_tx:VM01(Provost-Intel):(11) 1100.382717] [msg_vm/WARNING] use the default max_downtime value 30ms > [Provost:__pr_mig_tx:VM01(Provost-Intel):(11) 1100.382717] [msg_vm/INFO] mig-stage1: remaining_size 1073741824.000000 -> [Provost:__pr_mig_tx:VM01(Provost-Intel):(11) 3564.234309] [msg_vm/INFO] actual banwdidth 0.415609 (MB/s), threshold 13073.942775 +> [Provost:__pr_mig_tx:VM01(Provost-Intel):(11) 3564.234309] [msg_vm/INFO] actual bandwidth 0.415609 (MB/s), threshold 13073.942775 > [Provost:__pr_mig_tx:VM01(Provost-Intel):(11) 3564.234309] [msg_vm/INFO] mig-stage 2:0 updated_size 0.000000 computed_during_stage1 0.000000 dp_rate 0.000000 dp_cap 0.000000 > [Provost:__pr_mig_tx:VM01(Provost-Intel):(11) 3564.234309] [msg_vm/INFO] mig-stage2.0: remaining_size 0.000000 (< threshold 13073.942775) > [Provost:__pr_mig_tx:VM01(Provost-Intel):(11) 3564.234309] [msg_vm/INFO] mig-stage3: remaining_size 0.000000 @@ -63,7 +63,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/master_worker_vm$EXEEXT --log=no_loc ${srcdir:=.}/ > [Jacquelin:master:(1) 3567.161124] [msg_test/INFO] # Migrate all VMs to PM(Provost) > [Intel:__pr_mig_tx:VM00(Intel-Provost):(15) 3567.161124] [msg_vm/WARNING] use the default max_downtime value 30ms > [Intel:__pr_mig_tx:VM00(Intel-Provost):(15) 3567.161124] [msg_vm/INFO] mig-stage1: remaining_size 1073741824.000000 -> [Intel:__pr_mig_tx:VM00(Intel-Provost):(15) 6031.012716] [msg_vm/INFO] actual banwdidth 0.415609 (MB/s), threshold 13073.942775 +> [Intel:__pr_mig_tx:VM00(Intel-Provost):(15) 6031.012716] [msg_vm/INFO] actual bandwidth 0.415609 (MB/s), threshold 13073.942775 > [Intel:__pr_mig_tx:VM00(Intel-Provost):(15) 6031.012716] [msg_vm/INFO] mig-stage 2:0 updated_size 0.000000 computed_during_stage1 0.000000 dp_rate 0.000000 dp_cap 0.000000 > [Intel:__pr_mig_tx:VM00(Intel-Provost):(15) 6031.012716] [msg_vm/INFO] mig-stage2.0: remaining_size 0.000000 (< threshold 13073.942775) > [Intel:__pr_mig_tx:VM00(Intel-Provost):(15) 6031.012716] [msg_vm/INFO] mig-stage3: remaining_size 0.000000 @@ -71,7 +71,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/master_worker_vm$EXEEXT --log=no_loc ${srcdir:=.}/ > [Provost:__pr_mig_rx:VM00(Intel-Provost):(14) 6033.020833] [msg_vm/INFO] set affinity(0x0000@Provost) for VM00 > [Intel:__pr_mig_tx:VM01(Intel-Provost):(19) 6034.900487] [msg_vm/WARNING] use the default max_downtime value 30ms > [Intel:__pr_mig_tx:VM01(Intel-Provost):(19) 6034.900487] [msg_vm/INFO] mig-stage1: remaining_size 1073741824.000000 -> [Intel:__pr_mig_tx:VM01(Intel-Provost):(19) 8498.752079] [msg_vm/INFO] actual banwdidth 0.415609 (MB/s), threshold 13073.942775 +> [Intel:__pr_mig_tx:VM01(Intel-Provost):(19) 8498.752079] [msg_vm/INFO] actual bandwidth 0.415609 (MB/s), threshold 13073.942775 > [Intel:__pr_mig_tx:VM01(Intel-Provost):(19) 8498.752079] [msg_vm/INFO] mig-stage 2:0 updated_size 0.000000 computed_during_stage1 0.000000 dp_rate 0.000000 dp_cap 0.000000 > [Intel:__pr_mig_tx:VM01(Intel-Provost):(19) 8498.752079] [msg_vm/INFO] mig-stage2.0: remaining_size 0.000000 (< threshold 13073.942775) > [Intel:__pr_mig_tx:VM01(Intel-Provost):(19) 8498.752079] [msg_vm/INFO] mig-stage3: remaining_size 0.000000 diff --git a/examples/msg/cloud/simple_vm.tesh b/examples/msg/cloud/simple_vm.tesh index 12d0ad2fc1..4e722aa194 100644 --- a/examples/msg/cloud/simple_vm.tesh +++ b/examples/msg/cloud/simple_vm.tesh @@ -67,7 +67,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/simple_vm$EXEEXT --log=no_loc ${srcdir:=.}/simple_ > [PM0:__pr_mig_tx:VM0(PM0-PM1):(38) 49.010000] [msg_vm/WARNING] use the default max_downtime value 30ms > [PM0:__pr_mig_tx:VM0(PM0-PM1):(38) 49.010000] [msg_vm/INFO] mig-stage1: remaining_size 1073741824.000000 > [PM2:comm_rx:(36) 49.293296] [msg_test/INFO] VM0:comm_tx to PM2:comm_rx => 0.293296 sec -> [PM0:__pr_mig_tx:VM0(PM0-PM1):(38) 142.200526] [msg_vm/INFO] actual banwdidth 10.988241 (MB/s), threshold 345660.187833 +> [PM0:__pr_mig_tx:VM0(PM0-PM1):(38) 142.200526] [msg_vm/INFO] actual bandwidth 10.988241 (MB/s), threshold 345660.187833 > [PM0:__pr_mig_tx:VM0(PM0-PM1):(38) 142.200526] [msg_vm/INFO] mig-stage 2:0 updated_size 0.000000 computed_during_stage1 0.000000 dp_rate 0.000000 dp_cap 0.000000 > [PM0:__pr_mig_tx:VM0(PM0-PM1):(38) 142.200526] [msg_vm/INFO] mig-stage2.0: remaining_size 0.000000 (< threshold 345660.187833) > [PM0:__pr_mig_tx:VM0(PM0-PM1):(38) 142.200526] [msg_vm/INFO] mig-stage3: remaining_size 0.000000 @@ -75,7 +75,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/simple_vm$EXEEXT --log=no_loc ${srcdir:=.}/simple_ > [PM1:__pr_mig_rx:VM0(PM0-PM1):(37) 142.330626] [msg_vm/INFO] set affinity(0x0000@PM1) for VM0 > [PM1:__pr_mig_tx:VM0(PM1-PM0):(42) 142.470726] [msg_vm/WARNING] use the default max_downtime value 30ms > [PM1:__pr_mig_tx:VM0(PM1-PM0):(42) 142.470726] [msg_vm/INFO] mig-stage1: remaining_size 1073741824.000000 -> [PM1:__pr_mig_tx:VM0(PM1-PM0):(42) 235.584654] [msg_vm/INFO] actual banwdidth 10.997281 (MB/s), threshold 345944.536891 +> [PM1:__pr_mig_tx:VM0(PM1-PM0):(42) 235.584654] [msg_vm/INFO] actual bandwidth 10.997281 (MB/s), threshold 345944.536891 > [PM1:__pr_mig_tx:VM0(PM1-PM0):(42) 235.584654] [msg_vm/INFO] mig-stage 2:0 updated_size 0.000000 computed_during_stage1 0.000000 dp_rate 0.000000 dp_cap 0.000000 > [PM1:__pr_mig_tx:VM0(PM1-PM0):(42) 235.584654] [msg_vm/INFO] mig-stage2.0: remaining_size 0.000000 (< threshold 345944.536891) > [PM1:__pr_mig_tx:VM0(PM1-PM0):(42) 235.584654] [msg_vm/INFO] mig-stage3: remaining_size 0.000000 diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c index 7972de267b..f3b703ea4b 100644 --- a/src/msg/msg_vm.c +++ b/src/msg/msg_vm.c @@ -103,7 +103,7 @@ static inline int __MSG_vm_is_state(msg_vm_t vm, e_surf_vm_state_t state) return simcall_vm_get_state(vm) == state; } -/** @brief Returns whether the given VM has just reated, not running. +/** @brief Returns whether the given VM has just created, not running. * @ingroup msg_VMs */ int MSG_vm_is_created(msg_vm_t vm) @@ -180,7 +180,7 @@ msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char *name, * bandwidth */ double host_speed = MSG_get_host_speed(ind_pm); double update_speed = ((double)dp_intensity/100) * mig_netspeed; - + msg_vm_t vm = MSG_vm_create_core(ind_pm, name); s_ws_params_t params; memset(¶ms, 0, sizeof(params)); @@ -294,7 +294,7 @@ void MSG_vm_shutdown(msg_vm_t vm) /* We have two mailboxes. mbox is used to transfer migration data between - * source and destiantion PMs. mbox_ctl is used to detect the completion of a + * source and destination PMs. mbox_ctl is used to detect the completion of a * migration. The names of these mailboxes must not conflict with others. */ static inline char *get_mig_mbox_src_dst(const char *vm_name, const char *src_pm_name, const char *dst_pm_name) { @@ -456,7 +456,7 @@ static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remai double computed = dp->prev_remaining - remaining; double duration = clock - dp->prev_clock; - XBT_DEBUG("%s@%s: computated %f ops (remaining %f -> %f) in %f secs (%f -> %f)", + XBT_DEBUG("%s@%s: computed %f ops (remaining %f -> %f) in %f secs (%f -> %f)", key, sg_host_name(vm), computed, dp->prev_remaining, remaining, duration, dp->prev_clock, clock); return computed; @@ -472,7 +472,7 @@ static double lookup_computed_flop_counts(msg_vm_t vm, int stage_for_fancy_debug dirty_page_t dp = NULL; xbt_dict_foreach(priv->dp_objs, cursor, key, dp) { double remaining = MSG_task_get_remaining_computation(dp->task); - + double clock = MSG_get_clock(); // total += calc_updated_pages(key, vm, dp, remaining, clock); @@ -531,7 +531,7 @@ void MSG_host_del_task(msg_host_t host, msg_task_t task) xbt_assert(dp->task == task); /* If we are in the middle of dirty page tracking, we record how much - * computaion has been done until now, and keep the information for the + * computation has been done until now, and keep the information for the * lookup_() function that will called soon. */ if (priv->dp_enabled) { double remaining = MSG_task_get_remaining_computation(task); @@ -560,7 +560,7 @@ static int deferred_exec_fun(int argc, char *argv[]) double prio = atof(prio_str); msg_task_t task = MSG_task_create("__task_deferred", computaion, 0, NULL); - // XBT_INFO("exec deferred %f", computaion); + // XBT_INFO("exec deferred %f", computation); /* dpt is the results of the VM activity */ MSG_task_set_priority(task, prio); @@ -971,7 +971,7 @@ static int migration_tx_fun(int argc, char *argv[]) double clock_post_send = MSG_get_clock(); double bandwidth = ramsize / (clock_post_send - clock_prev_send); threshold = get_threshold_value(bandwidth, max_downtime); - XBT_INFO("actual banwdidth %f (MB/s), threshold %f", bandwidth / 1024 / 1024, threshold); + XBT_INFO("actual bandwidth %f (MB/s), threshold %f", bandwidth / 1024 / 1024, threshold); } @@ -1153,8 +1153,8 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t new_pm) /** @brief Immediately suspend the execution of all processes within the given VM. * @ingroup msg_VMs * - * This function stops the exection of the VM. All the processes on this VM - * will pause. The state of the VM is perserved. We can later resume it again. + * This function stops the execution of the VM. All the processes on this VM + * will pause. The state of the VM is preserved. We can later resume it again. * * No suspension cost occurs. */ @@ -1188,8 +1188,8 @@ void MSG_vm_resume(msg_vm_t vm) /** @brief Immediately save the execution of all processes within the given VM. * @ingroup msg_VMs * - * This function stops the exection of the VM. All the processes on this VM - * will pause. The state of the VM is perserved. We can later resume it again. + * This function stops the execution of the VM. All the processes on this VM + * will pause. The state of the VM is preserved. We can later resume it again. * * FIXME: No suspension cost occurs. If you want to simulate this too, you want to * use a \ref MSG_file_write() before or after, depending on the exact semantic @@ -1250,7 +1250,7 @@ msg_host_t MSG_vm_get_pm(msg_vm_t vm) * * There are some solutions for this problem. One option is to update the bound * of the dummy CPU action automatically. It should be the sum of all tasks on - * the VM. But, this solution might be costy, because we have to scan all tasks + * the VM. But, this solution might be costly, because we have to scan all tasks * on the VM in share_resource() or we have to trap both the start and end of * task execution. * diff --git a/src/simix/smx_vm.c b/src/simix/smx_vm.c index 091e92ac80..1de4dc785b 100644 --- a/src/simix/smx_vm.c +++ b/src/simix/smx_vm.c @@ -121,7 +121,7 @@ int SIMIX_pre_vm_get_state(smx_simcall_t simcall, smx_host_t ind_vm) /** - * \brief Function to migrate a SIMIX VM host. + * \brief Function to migrate a SIMIX VM host. * * \param host the vm host to migrate (a smx_host_t) */ @@ -199,7 +199,7 @@ void SIMIX_pre_vm_set_affinity(smx_simcall_t simcall, smx_host_t ind_vm, smx_hos /** - * \brief Function to suspend a SIMIX VM host. This function stops the exection of the + * \brief Function to suspend a SIMIX VM host. This function stops the execution of the * VM. All the processes on this VM will pause. The state of the VM is * preserved on memory. We can later resume it again. * @@ -241,7 +241,7 @@ void SIMIX_pre_vm_suspend(smx_simcall_t simcall, smx_host_t ind_vm) /** * \brief Function to resume a SIMIX VM host. This function restart the execution of the - * VM. All the processes on this VM will run again. + * VM. All the processes on this VM will run again. * * \param host the vm host to resume (a smx_host_t) */ @@ -305,7 +305,7 @@ void SIMIX_pre_vm_save(smx_simcall_t simcall, smx_host_t ind_vm) /** * \brief Function to restore a SIMIX VM host. This function restart the execution of the - * VM. All the processes on this VM will run again. + * VM. All the processes on this VM will run again. * * \param host the vm host to restore (a smx_host_t) */ diff --git a/src/surf/vm_workstation_hl13.cpp b/src/surf/vm_workstation_hl13.cpp index da4b1f2424..73baddfe4b 100644 --- a/src/surf/vm_workstation_hl13.cpp +++ b/src/surf/vm_workstation_hl13.cpp @@ -228,7 +228,7 @@ WorkstationVMHL13::WorkstationVMHL13(WorkstationVMModelPtr model, const char* na p_storage = NULL; /* Currently, a VM uses the network resource of its physical host. In - * host_lib, this network resource object is refered from two different keys. + * host_lib, this network resource object is referred from two different keys. * When deregistering the reference that points the network resource object * from the VM name, we have to make sure that the system does not call the * free callback for the network resource object. The network resource object @@ -272,8 +272,8 @@ WorkstationVMHL13::WorkstationVMHL13(WorkstationVMModelPtr model, const char* na } /* - * A physical host does not disapper in the current SimGrid code, but a VM may - * disapper during a simulation. + * A physical host does not disappear in the current SimGrid code, but a VM may + * disappear during a simulation. */ WorkstationVMHL13::~WorkstationVMHL13() { @@ -293,7 +293,7 @@ WorkstationVMHL13::~WorkstationVMHL13() xbt_lib_unset(host_lib, getName(), ROUTING_HOST_LEVEL, 0); xbt_lib_unset(host_lib, getName(), SURF_WKS_LEVEL, 0); - /* TODO: comment out when VM stroage is implemented. */ + /* TODO: comment out when VM storage is implemented. */ // xbt_lib_unset(host_lib, name, SURF_STORAGE_LEVEL, 0); @@ -439,7 +439,7 @@ void WorkstationVMHL13::setAffinity(CpuPtr cpu, unsigned long mask){ } /* - * A surf level object will be useless in the upper layer. Returing the + * A surf level object will be useless in the upper layer. Returning the * dict_elm of the host. **/ surf_resource_t WorkstationVMHL13::getPm() -- 2.20.1