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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_request.h
diff --git
a/src/mc/mc_request.h
b/src/mc/mc_request.h
index
2fa0896
..
476cf9e
100644
(file)
--- a/
src/mc/mc_request.h
+++ b/
src/mc/mc_request.h
@@
-7,6
+7,8
@@
#ifndef SIMGRID_MC_REQUEST_H
#define SIMGRID_MC_REQUEST_H
#ifndef SIMGRID_MC_REQUEST_H
#define SIMGRID_MC_REQUEST_H
+#include <string>
+
#include <xbt/base.h>
#include "src/simix/smx_private.h"
#include <xbt/base.h>
#include "src/simix/smx_private.h"
@@
-22,7
+24,7
@@
enum class RequestType {
XBT_PRIVATE bool request_depend(smx_simcall_t req1, smx_simcall_t req2);
XBT_PRIVATE bool request_depend(smx_simcall_t req1, smx_simcall_t req2);
-XBT_PRIVATE
char*
request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType type);
+XBT_PRIVATE
std::string
request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType type);
XBT_PRIVATE bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx);
XBT_PRIVATE bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx);
@@
-30,9
+32,9
@@
XBT_PRIVATE bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx);
*
* This is true if the request associated with the process is ready.
*/
*
* This is true if the request associated with the process is ready.
*/
-XBT_PRIVATE bool
process_is_enabled(smx_process
_t process);
+XBT_PRIVATE bool
actor_is_enabled(smx_actor
_t process);
-XBT_PRIVATE
char *
request_get_dot_output(smx_simcall_t req, int value);
+XBT_PRIVATE
std::string
request_get_dot_output(smx_simcall_t req, int value);
}
}
}
}