X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55ad634bd982190cbb65891936938b68aca89829..29c54250185627bc66380a283f2289dcdd4d6353:/src/kernel/activity/CommImpl.hpp diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp index 7c0691aece..e9485d664a 100644 --- a/src/kernel/activity/CommImpl.hpp +++ b/src/kernel/activity/CommImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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. */ @@ -17,7 +17,7 @@ namespace activity { class XBT_PUBLIC CommImpl : public ActivityImpl_T { ~CommImpl() override; - void cleanupSurf(); + void cleanup_surf(); double rate_ = 0.0; double size_ = 0.0; @@ -26,9 +26,11 @@ class XBT_PUBLIC CommImpl : public ActivityImpl_T { MailboxImpl* mbox_ = nullptr; /* Rendez-vous where the comm is queued */ public: - enum class Type { SEND = 0, RECEIVE, READY, DONE }; + enum class Type { SEND, RECEIVE }; + + CommImpl(Type type) : type_(type) {} + CommImpl(s4u::Host* from, s4u::Host* to, double bytes); - CommImpl& set_type(CommImpl::Type type); CommImpl& set_size(double size); CommImpl& set_src_buff(unsigned char* buff, size_t size); CommImpl& set_dst_buff(unsigned char* buff, size_t* size); @@ -49,7 +51,7 @@ public: void post() override; void finish() override; - CommImpl::Type type_; /* Type of the communication (SEND or RECEIVE) */ + const CommImpl::Type type_; /* Type of the communication (SEND or RECEIVE) */ #if SIMGRID_HAVE_MC MailboxImpl* mbox_cpy = nullptr; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR @@ -58,7 +60,7 @@ public: #endif void (*clean_fun)(void*) = nullptr; /* Function to clean the detached src_buf if something goes wrong */ - int (*match_fun)(void*, void*, CommImpl*) = nullptr; /* Filter function used by the other side. It is used when + bool (*match_fun)(void*, void*, CommImpl*) = nullptr; /* Filter function used by the other side. It is used when looking if a given communication matches my needs. For that, myself must match the expectations of the other side, too. See */ void (*copy_data_fun)(CommImpl*, void*, size_t) = nullptr; @@ -68,6 +70,8 @@ expectations of the other side, too. See */ resource::Action* dst_timeout_ = nullptr; /* Surf's actions to instrument the timeouts */ actor::ActorImplPtr src_actor_ = nullptr; actor::ActorImplPtr dst_actor_ = nullptr; + s4u::Host* from_ = nullptr; /* Pre-determined only for direct host-to-host communications */ + s4u::Host* to_ = nullptr; /* Otherwise, computed at start() time from the actors */ /* Data to be transferred */ unsigned char* src_buff_ = nullptr;