X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/940de22d7f2af82d58be3e886e6bc22608b4d8ec..9adb31255b20101096e6c7ac09e6641c3cb82557:/src/kernel/activity/CommImpl.hpp diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp index 849f605785..e4eded95b1 100644 --- a/src/kernel/activity/CommImpl.hpp +++ b/src/kernel/activity/CommImpl.hpp @@ -1,12 +1,13 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ -#ifndef SIMIX_SYNCHRO_COMM_HPP -#define SIMIX_SYNCHRO_COMM_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_COMM_HPP +#define SIMGRID_KERNEL_ACTIVITY_COMM_HPP #include "src/kernel/activity/ActivityImpl.hpp" +#include "src/simix/ActorImpl.hpp" #include "surf/surf.hpp" enum e_smx_comm_type_t { SIMIX_COMM_SEND, SIMIX_COMM_RECEIVE, SIMIX_COMM_READY, SIMIX_COMM_DONE }; @@ -45,11 +46,11 @@ expectations of the other side, too. See */ void (*copy_data_fun)(smx_activity_t, void*, size_t) = nullptr; /* Surf action data */ - simgrid::kernel::resource::Action* surfAction_ = nullptr; /* The Surf communication action encapsulated */ - simgrid::kernel::resource::Action* src_timeout = nullptr; /* Surf's actions to instrument the timeouts */ - simgrid::kernel::resource::Action* dst_timeout = nullptr; /* Surf's actions to instrument the timeouts */ - smx_actor_t src_proc = nullptr; - smx_actor_t dst_proc = nullptr; + resource::Action* surfAction_ = nullptr; /* The Surf communication action encapsulated */ + resource::Action* src_timeout = nullptr; /* Surf's actions to instrument the timeouts */ + resource::Action* dst_timeout = nullptr; /* Surf's actions to instrument the timeouts */ + actor::ActorImplPtr src_proc = nullptr; + actor::ActorImplPtr dst_proc = nullptr; double rate = 0.0; double task_size = 0.0;