-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-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 "xbt/log.h"
#include "src/msg/msg_private.h"
-#include "simgrid/s4u/comm.hpp"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm,s4u_activity,"S4U asynchronous communications");
namespace simgrid {
namespace s4u {
-Comm::~Comm() {
-
-}
-
-
-
-s4u::Comm &Comm::send_init(s4u::Mailbox &chan) {
+s4u::Comm &Comm::send_init(s4u::MailboxPtr chan) {
s4u::Comm *res = new s4u::Comm();
res->sender_ = SIMIX_process_self();
- res->mailbox_ = &chan;
+ res->mailbox_ = chan;
return *res;
}
-s4u::Comm &Comm::recv_init(s4u::Mailbox &chan) {
+s4u::Comm &Comm::recv_init(s4u::MailboxPtr chan) {
s4u::Comm *res = new s4u::Comm();
res->receiver_ = SIMIX_process_self();
- res->mailbox_ = &chan;
+ res->mailbox_ = chan;
return *res;
}
}
}
state_ = finished;
+ delete this;
}
void Comm::wait(double timeout) {
xbt_assert(state_ == started || state_ == inited);
userData_, timeout, rate_);
}
state_ = finished;
+ delete this;
}
-s4u::Comm &Comm::send_async(Mailbox &dest, void *data, int simulatedSize) {
+s4u::Comm &Comm::send_async(MailboxPtr dest, void *data, int simulatedSize) {
s4u::Comm &res = s4u::Comm::send_init(dest);
res.setRemains(simulatedSize);
res.srcBuff_ = data;
return res;
}
-s4u::Comm &Comm::recv_async(Mailbox &dest, void **data) {
+s4u::Comm &Comm::recv_async(MailboxPtr dest, void **data) {
s4u::Comm &res = s4u::Comm::recv_init(dest);
- res.setDstData(data);
+ res.setDstData(data, sizeof(*data));
res.start();
return res;
}
if(simcall_comm_test(pimpl_)){
state_ = finished;
+ delete this;
return true;
}
return false;