X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/665b37c47175d0abd08d1252180d4d37bf9a342a..70fa17187e0b928ff89cb8663426edbf6b74601a:/src/msg/msg_task.cpp diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index a8b0c6b5ee..814282ba9f 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -1,12 +1,12 @@ -/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. 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" +#include "msg_private.hpp" +#include "src/simix/smx_private.hpp" + +extern "C" { /** @addtogroup m_task_management * @@ -58,22 +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->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; @@ -278,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(); } @@ -317,3 +304,4 @@ void MSG_task_set_bound(msg_task_t task, double bound) if (task->simdata->compute) simcall_execution_set_bound(task->simdata->compute, task->simdata->bound); } +}