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
Fix build errors and warnings with mingw.
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Mailbox.hpp
diff --git
a/include/simgrid/s4u/Mailbox.hpp
b/include/simgrid/s4u/Mailbox.hpp
index
9ccf53d
..
3ca3459
100644
(file)
--- a/
include/simgrid/s4u/Mailbox.hpp
+++ b/
include/simgrid/s4u/Mailbox.hpp
@@
-9,6
+9,7
@@
#include <string>
#include <xbt/base.h>
#include <string>
#include <xbt/base.h>
+#include <xbt/string.hpp>
#include <simgrid/s4u/forward.hpp>
#include <simgrid/s4u/Actor.hpp>
#include <simgrid/s4u/forward.hpp>
#include <simgrid/s4u/Actor.hpp>
@@
-120,8
+121,10
@@
public:
/** private function, do not use. FIXME: make me protected */
kernel::activity::MailboxImpl* getImpl() { return pimpl_; }
/** private function, do not use. FIXME: make me protected */
kernel::activity::MailboxImpl* getImpl() { return pimpl_; }
- /** Gets the name of that mailbox */
- const char* getName();
+ /** @brief Retrieves the name of that mailbox as a C++ string */
+ const simgrid::xbt::string& getName() const;
+ /** @brief Retrieves the name of that mailbox as a C string */
+ const char* getCname() const;
/** Retrieve the mailbox associated to the given C string */
static MailboxPtr byName(const char *name);
/** Retrieve the mailbox associated to the given C string */
static MailboxPtr byName(const char *name);
@@
-152,17
+155,14
@@
public:
/** Creates (but don't start) a data emission to that mailbox */
CommPtr put_init();
/** Creates (but don't start) a data emission to that mailbox */
/** Creates (but don't start) a data emission to that mailbox */
CommPtr put_init();
/** Creates (but don't start) a data emission to that mailbox */
- CommPtr put_init(void* data,
double
simulatedSizeInBytes);
+ CommPtr put_init(void* data,
uint64_t
simulatedSizeInBytes);
/** Creates and start a data emission to that mailbox */
/** Creates and start a data emission to that mailbox */
- CommPtr put_async(void* data,
double
simulatedSizeInBytes);
+ CommPtr put_async(void* data,
uint64_t
simulatedSizeInBytes);
- /** Blocking data emission
- *
- * simulatedSizeInBytes must be a double so that you can send more than 4Gb even if the simulator runs on 32 bits
- */
- void put(void* payload, double simulatedSizeInBytes);
+ /** Blocking data emission */
+ void put(void* payload, uint64_t simulatedSizeInBytes);
/** Blocking data emission with timeout */
/** Blocking data emission with timeout */
- void put(void* payload,
double
simulatedSizeInBytes, double timeout);
+ void put(void* payload,
uint64_t
simulatedSizeInBytes, double timeout);
/** Creates (but don't start) a data reception onto that mailbox */
CommPtr get_init();
/** Creates (but don't start) a data reception onto that mailbox */
CommPtr get_init();