A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sanitize the prototype of Actor::on_exit() callbacks
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Mailbox.hpp
diff --git
a/include/simgrid/s4u/Mailbox.hpp
b/include/simgrid/s4u/Mailbox.hpp
index
6f59545
..
c009267
100644
(file)
--- a/
include/simgrid/s4u/Mailbox.hpp
+++ b/
include/simgrid/s4u/Mailbox.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
9
. 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. */
/* 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. */
@@
-19,7
+19,7
@@
class XBT_PUBLIC Mailbox {
friend simgrid::s4u::Comm;
friend simgrid::kernel::activity::MailboxImpl;
friend simgrid::s4u::Comm;
friend simgrid::kernel::activity::MailboxImpl;
- simgrid::kernel::activity::MailboxImpl* pimpl_;
+ simgrid::kernel::activity::MailboxImpl*
const
pimpl_;
explicit Mailbox(kernel::activity::MailboxImpl * mbox) : pimpl_(mbox) {}
explicit Mailbox(kernel::activity::MailboxImpl * mbox) : pimpl_(mbox) {}
@@
-38,7
+38,7
@@
public:
const char* get_cname() const;
/** Retrieve the mailbox associated to the given name */
const char* get_cname() const;
/** Retrieve the mailbox associated to the given name */
- static MailboxPtr by_name(
std::string
name);
+ static MailboxPtr by_name(
const std::string&
name);
/** Returns whether the mailbox contains queued communications */
bool empty();
/** Returns whether the mailbox contains queued communications */
bool empty();
@@
-50,7
+50,7
@@
public:
bool ready();
/** Gets the first element in the queue (without dequeuing it), or nullptr if none is there */
bool ready();
/** Gets the first element in the queue (without dequeuing it), or nullptr if none is there */
-
smx_activity_t
front();
+
kernel::activity::CommImplPtr
front();
/** Declare that the specified actor is a permanent receiver on that mailbox
*
/** Declare that the specified actor is a permanent receiver on that mailbox
*
@@
-75,16
+75,17
@@
public:
/** Return the actor declared as permanent receiver, or nullptr if none **/
ActorPtr get_receiver();
/** Return the actor declared as permanent receiver, or nullptr if none **/
ActorPtr get_receiver();
- /** Creates (but don't start) a data
e
mission to that mailbox */
+ /** Creates (but don't start) a data
trans
mission to that mailbox */
CommPtr put_init();
CommPtr put_init();
- /** Creates (but don't start) a data
e
mission to that mailbox */
+ /** Creates (but don't start) a data
trans
mission to that mailbox */
CommPtr put_init(void* data, uint64_t simulated_size_in_bytes);
CommPtr put_init(void* data, uint64_t simulated_size_in_bytes);
- /** Creates and start a data
e
mission to that mailbox */
+ /** Creates and start a data
trans
mission to that mailbox */
CommPtr put_async(void* data, uint64_t simulated_size_in_bytes);
CommPtr put_async(void* data, uint64_t simulated_size_in_bytes);
- /** Blocking data emission */
+ smx_activity_t iprobe(int type, int (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data);
+ /** Blocking data transmission */
void put(void* payload, uint64_t simulated_size_in_bytes);
void put(void* payload, uint64_t simulated_size_in_bytes);
- /** Blocking data
e
mission with timeout */
+ /** Blocking data
trans
mission with timeout */
void put(void* payload, uint64_t simulated_size_in_bytes, double timeout);
/** Creates (but don't start) a data reception onto that mailbox */
void put(void* payload, uint64_t simulated_size_in_bytes, double timeout);
/** Creates (but don't start) a data reception onto that mailbox */