X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b0e0e1b73c15e423659c0844e0a5b67e7c0bed0..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/msg/msg_task.cpp diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index dee434524c..42a69af2f3 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -1,13 +1,12 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "msg_private.h" #include "src/simix/smx_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" + +SG_BEGIN_DECL() /** @addtogroup m_task_management * @@ -59,23 +58,9 @@ msg_task_t MSG_task_create(const char *name, double flop_amount, double message_ task->data = data; /* Simulator Data */ - simdata->compute = nullptr; - simdata->comm = nullptr; simdata->bytes_amount = message_size; simdata->flops_amount = flop_amount; - simdata->sender = nullptr; - simdata->receiver = nullptr; - simdata->source = nullptr; - simdata->priority = 1.0; - simdata->bound = 0; - simdata->affinity_mask_db = xbt_dict_new_homogeneous(nullptr); - simdata->rate = -1.0; - simdata->isused = 0; - - simdata->host_nb = 0; - simdata->host_list = nullptr; - simdata->flops_parallel_amount = nullptr; - simdata->bytes_parallel_amount = nullptr; + TRACE_msg_task_create(task); return task; @@ -102,7 +87,6 @@ msg_task_t MSG_parallel_task_create(const char *name, int host_nb, const msg_hos { msg_task_t task = MSG_task_create(name, 0, 0, data); simdata_task_t simdata = task->simdata; - int i; /* Simulator Data specific to parallel tasks */ simdata->host_nb = host_nb; @@ -110,7 +94,7 @@ msg_task_t MSG_parallel_task_create(const char *name, int host_nb, const msg_hos simdata->flops_parallel_amount = flops_amount; simdata->bytes_parallel_amount = bytes_amount; - for (i = 0; i < host_nb; i++) + for (int i = 0; i < host_nb; i++) simdata->host_list[i] = host_list[i]; return task; @@ -123,7 +107,6 @@ msg_task_t MSG_parallel_task_create(const char *name, int host_nb, const msg_hos */ void *MSG_task_get_data(msg_task_t task) { - xbt_assert((task != nullptr), "Invalid parameter"); return (task->data); } @@ -134,7 +117,6 @@ void *MSG_task_get_data(msg_task_t task) */ void MSG_task_set_data(msg_task_t task, void *data) { - xbt_assert((task != nullptr), "Invalid parameter"); task->data = data; } @@ -160,8 +142,7 @@ void MSG_task_set_copy_callback(void (*callback) (msg_task_t task, msg_process_t */ msg_process_t MSG_task_get_sender(msg_task_t task) { - xbt_assert(task, "Invalid parameters"); - return (static_cast (task->simdata)->sender); + return task->simdata->sender; } /** \ingroup m_task_management @@ -171,8 +152,7 @@ msg_process_t MSG_task_get_sender(msg_task_t task) */ msg_host_t MSG_task_get_source(msg_task_t task) { - xbt_assert(task, "Invalid parameters"); - return (static_cast (task->simdata)->source); + return task->simdata->source; } /** \ingroup m_task_management @@ -182,7 +162,6 @@ msg_host_t MSG_task_get_source(msg_task_t task) */ const char *MSG_task_get_name(msg_task_t task) { - xbt_assert(task, "Invalid parameters"); return task->name; } @@ -193,7 +172,6 @@ const char *MSG_task_get_name(msg_task_t task) */ void MSG_task_set_name(msg_task_t task, const char *name) { - xbt_assert(task, "Invalid parameters"); task->name = xbt_strdup(name); } @@ -210,8 +188,6 @@ void MSG_task_set_name(msg_task_t task, const char *name) */ msg_error_t MSG_task_destroy(msg_task_t task) { - xbt_assert((task != nullptr), "Invalid parameter"); - if (task->simdata->isused) { /* the task is being sent or executed: cancel it first */ MSG_task_cancel(task); @@ -289,7 +265,7 @@ void MSG_task_set_bytes_amount(msg_task_t task, double data_size) */ double MSG_task_get_remaining_communication(msg_task_t task) { - XBT_DEBUG("calling simcall_communication_get_remains(%p)", task->simdata->comm); + XBT_DEBUG("calling simcall_communication_get_remains(%p)", task->simdata->comm.get()); return task->simdata->comm->remains(); } @@ -308,11 +284,9 @@ double MSG_task_get_bytes_amount(msg_task_t task) */ void MSG_task_set_priority(msg_task_t task, double priority) { - xbt_assert((task != nullptr) && (task->simdata != nullptr), "Invalid parameter"); task->simdata->priority = 1 / priority; if (task->simdata->compute) - simcall_execution_set_priority(task->simdata->compute, - task->simdata->priority); + simcall_execution_set_priority(task->simdata->compute, task->simdata->priority); } /** \ingroup m_task_management @@ -323,9 +297,6 @@ void MSG_task_set_priority(msg_task_t task, double priority) */ void MSG_task_set_bound(msg_task_t task, double bound) { - xbt_assert(task, "Invalid parameter"); - xbt_assert(task->simdata, "Invalid parameter"); - if (bound < 1e-12) /* close enough to 0 without any floating precision surprise */ XBT_INFO("bound == 0 means no capping (i.e., unlimited)."); @@ -334,75 +305,4 @@ void MSG_task_set_bound(msg_task_t task, double bound) simcall_execution_set_bound(task->simdata->compute, task->simdata->bound); } -/** \ingroup m_task_management - * \brief Changes the CPU affinity of a computation task. - * - * When pinning the given task to the first CPU core of the given host, use 0x01 for the mask value. Each bit of the - * mask value corresponds to each CPU core. See taskset(1) on Linux. - * - * \param task a target task - * \param host the host having a multi-core CPU - * \param mask the bit mask of a new CPU affinity setting for the task - * - * Usage: - * 0. Define a host with multiple cores. - * \ - * - * 1. Pin a given task to the first CPU core of a host. - * MSG_task_set_affinity(task, pm0, 0x01); - * - * 2. Pin a given task to the third CPU core of a host. Turn on the third bit of the mask. - * MSG_task_set_affinity(task, pm0, 0x04); // 0x04 == 100B - * - * 3. Pin a given VM to the first CPU core of a host. - * MSG_vm_set_affinity(vm, pm0, 0x01); - * - * See examples/msg/cloud/multicore.c for more information. - * - * Note: - * 1. The current code does not allow an affinity of a task to multiple cores. - * The mask value 0x03 (i.e., a given task will be executed on the first core or the second core) is not allowed. - * The mask value 0x01 or 0x02 works. See cpu_cas01.c for details. - * - * 2. It is recommended to first compare simulation results in both the Lazy and Full calculation modes - * (using --cfg=cpu/optim:Full or not). Fix cpu_cas01.c if you find wrong results in the Lazy mode. - */ -void MSG_task_set_affinity(msg_task_t task, msg_host_t host, unsigned long mask) -{ - xbt_assert(task, "Invalid parameter"); - xbt_assert(task->simdata, "Invalid parameter"); - - if (mask == 0) { - /* 0 means clear */ - /* We need remove_ext() not throwing exception. */ - void *ret = xbt_dict_get_or_null_ext(task->simdata->affinity_mask_db, (char *) host, sizeof(msg_host_t)); - if (ret != nullptr) - xbt_dict_remove_ext(task->simdata->affinity_mask_db, (char *) host, sizeof(host)); - } else - xbt_dict_set_ext(task->simdata->affinity_mask_db, (char *) host, sizeof(host), (void *)(uintptr_t) mask, nullptr); - - /* We set affinity data of this task. If the task is being executed, we actually change the affinity setting of the - * task. Otherwise, this change will be applied when the task is executed. */ - if (!task->simdata->compute) { - /* task is not yet executed */ - XBT_INFO("set affinity(0x%04lx@%s) for %s (not active now)", mask, MSG_host_get_name(host), - MSG_task_get_name(task)); - return; - } - - simgrid::simix::Exec *compute = task->simdata->compute; - msg_host_t host_now = compute->host; // simix_private.h is necessary - if (host_now != host) { - /* task is not yet executed on this host */ - XBT_INFO("set affinity(0x%04lx@%s) for %s (not active now)", mask, MSG_host_get_name(host), - MSG_task_get_name(task)); - return; - } - - /* task is being executed on this host. so change the affinity now */ - /* check it works. remove me if it works. */ - xbt_assert(static_cast((uintptr_t) xbt_dict_get_or_null_ext(task->simdata->affinity_mask_db, - (char*)(host), sizeof(msg_host_t))) == mask); - XBT_INFO("set affinity(0x%04lx@%s) for %s", mask, MSG_host_get_name(host), MSG_task_get_name(task)); - simcall_execution_set_affinity(task->simdata->compute, host, mask); -} +SG_END_DECL()