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
also change the namespace of kernel/resource/{Action,Model}
[simgrid.git]
/
src
/
simix
/
libsmx.cpp
diff --git
a/src/simix/libsmx.cpp
b/src/simix/libsmx.cpp
index
9662361
..
61d57bc
100644
(file)
--- a/
src/simix/libsmx.cpp
+++ b/
src/simix/libsmx.cpp
@@
-20,6
+20,7
@@
#include "simgrid/simix/blocking_simcall.hpp"
#include "smx_private.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "simgrid/simix/blocking_simcall.hpp"
#include "smx_private.hpp"
#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
#include "src/mc/mc_forward.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/mc/mc_forward.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
@@
-170,6
+171,11
@@
e_smx_state_t simcall_execution_wait(smx_activity_t execution)
return (e_smx_state_t) simcall_BODY_execution_wait(execution);
}
return (e_smx_state_t) simcall_BODY_execution_wait(execution);
}
+e_smx_state_t simcall_execution_test(smx_activity_t execution)
+{
+ return (e_smx_state_t)simcall_BODY_execution_test(execution);
+}
+
/**
* \ingroup simix_process_management
* \brief Kills all SIMIX processes.
/**
* \ingroup simix_process_management
* \brief Kills all SIMIX processes.
@@
-444,7
+450,7
@@
smx_mutex_t simcall_mutex_init()
fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization
xbt_abort();
}
fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization
xbt_abort();
}
- return simgrid::simix::kernelImmediate([] { return new simgrid::
simix
::MutexImpl(); });
+ return simgrid::simix::kernelImmediate([] { return new simgrid::
kernel::activity
::MutexImpl(); });
}
/**
}
/**