X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d876f901f44194d3e67936fd054b192a6b7f097..1b75ebf09b4d1b81533d140a9437efffeb9e6a0c:/src/msg/msg_task.cpp diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index bb76800766..130eab765b 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -19,6 +19,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg, "Logging specific to MSG (task)"); +void simdata_task::reportMultipleUse() const +{ + if (msg_global->debug_multiple_use){ + XBT_ERROR("This task is already used in there:"); + // TODO, backtrace + XBT_ERROR(""); + XBT_ERROR("And you try to reuse it from here:"); + xbt_backtrace_display_current(); + } else { + xbt_die("This task is still being used somewhere else. You cannot send it now. Go fix your code!" + "(use --cfg=msg/debug-multiple-use:on to get the backtrace of the other process)"); + } +} + /********************************* Task **************************************/ /** \ingroup m_task_management * \brief Creates a new #msg_task_t. @@ -37,7 +51,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg, "Logging specific to MSG (task)") msg_task_t MSG_task_create(const char *name, double flop_amount, double message_size, void *data) { msg_task_t task = xbt_new(s_msg_task_t, 1); - simdata_task_t simdata = xbt_new(s_simdata_task_t, 1); + simdata_task_t simdata = new s_simdata_task_t(); task->simdata = simdata; /* Task structure */ @@ -54,7 +68,6 @@ msg_task_t MSG_task_create(const char *name, double flop_amount, double message_ 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; @@ -147,7 +160,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 ((simdata_task_t) task->simdata)->sender; + return (static_cast (task->simdata)->sender); } /** \ingroup m_task_management @@ -158,7 +171,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 ((simdata_task_t) task->simdata)->source; + return (static_cast (task->simdata)->source); } /** \ingroup m_task_management @@ -206,16 +219,8 @@ msg_error_t MSG_task_destroy(msg_task_t task) xbt_free(task->name); - if (task->simdata->compute) - task->simdata->compute->unref(); - - /* parallel tasks only */ - xbt_free(task->simdata->host_list); - - xbt_dict_free(&task->simdata->affinity_mask_db); - /* free main structures */ - xbt_free(task->simdata); + delete task->simdata; xbt_free(task); return MSG_OK; @@ -235,9 +240,7 @@ msg_error_t MSG_task_cancel(msg_task_t task) else if (task->simdata->comm) { simdata_task_t simdata = task->simdata; simcall_comm_cancel(simdata->comm); - if (msg_global->debug_multiple_use && simdata->isused!=0) - xbt_ex_free(*(xbt_ex_t*)simdata->isused); - simdata->isused = 0; + simdata->setNotUsed(); } return MSG_OK; } @@ -322,88 +325,10 @@ void MSG_task_set_bound(msg_task_t task, double bound) xbt_assert(task, "Invalid parameter"); xbt_assert(task->simdata, "Invalid parameter"); - if (bound == 0) + if (bound < 1e-12) /* close enough to 0 without any floating precision surprise */ XBT_INFO("bound == 0 means no capping (i.e., unlimited)."); task->simdata->bound = bound; if (task->simdata->compute) 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((unsigned long)(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); - } -}