X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/e47900c5182c4b1c34a1670babcce033748cc473..01d46f8470e36e1823d897496e0d915770bc867b:/process.cpp?ds=inline diff --git a/process.cpp b/process.cpp index 722013f..6aceea4 100644 --- a/process.cpp +++ b/process.cpp @@ -58,7 +58,7 @@ process::process(int argc, char* argv[]) pneigh.reserve(neigh.size()); for (unsigned i = 0 ; i < neigh.size() ; i++) { neighbor* ptr = &neigh[i]; - m_host_t host = MSG_get_host_by_name(ptr->get_name()); + msg_host_t host = MSG_get_host_by_name(ptr->get_name()); pneigh.push_back(ptr); rev_neigh.insert(std::make_pair(host, ptr)); } @@ -256,8 +256,8 @@ void process::compute_loop() idle_duration += MSG_get_clock() - idle_since_date; ++comp_iter; double flops = opt::comp_cost(real_load); - m_task_t task = MSG_task_create("computation", flops, 0.0, NULL); - MSG_task_set_category(task, TRACE_CAT_COMP); + msg_task_t task = MSG_task_create("computation", flops, 0.0, NULL); + // MSG_task_set_category(task, TRACE_CAT_COMP); XBT_DEBUG("compute %g flop%s", flops, ESSE(flops)); MSG_task_execute(task); add_comp_amount(flops); @@ -465,7 +465,7 @@ void process::data_close(neighbor& nb) void process::ctrl_receive(double timeout) { message* msg; - m_host_t from; + msg_host_t from; XBT_DEBUG("%sblocking receive on ctrl (%g)", "\0non-" + !timeout, timeout); while (ctrl_close_pending && comm.ctrl_recv(msg, from, timeout)) { @@ -479,7 +479,7 @@ void process::ctrl_receive(double timeout) void process::data_receive(double timeout) { message* msg; - m_host_t from; + msg_host_t from; XBT_DEBUG("%sblocking receive on data (%g)", "\0non-" + !timeout, timeout); while (data_close_pending && comm.data_recv(msg, from, timeout)) { @@ -490,7 +490,7 @@ void process::data_receive(double timeout) } } -void process::handle_message(message* msg, m_host_t from) +void process::handle_message(message* msg, msg_host_t from) { switch (msg->get_type()) { case message::CTRL: {