#include "jmsg_host.h"
#include "jxbt_utilities.hpp"
#include "simgrid/Exception.hpp"
-#include "src/simix/ActorImpl.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
jobject jprocess_from_native(msg_process_t process)
{
simgrid::kernel::context::JavaContext* context =
- (simgrid::kernel::context::JavaContext*)process->get_impl()->context_;
+ static_cast<simgrid::kernel::context::JavaContext*>(process->get_impl()->context_.get());
return context->jprocess_;
}
jstring jname = (jstring)env->GetObjectField(jprocess, jprocess_field_Process_name);
const char* name = env->GetStringUTFChars(jname, 0);
simgrid::simix::ActorCode function = [jprocess]() { simgrid::kernel::context::java_main_jprocess(jprocess); };
- smx_actor_t actor =
- simcall_process_create(name, function, /*data*/ nullptr, jhost_get_native(env, jhost), /* properties*/ nullptr);
+ smx_actor_t self = SIMIX_process_self();
+ sg_host_t host = jhost_get_native(env, jhost);
+ smx_actor_t actor = simgrid::kernel::actor::simcall([name, function, host, self] {
+ return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(function), nullptr, host, nullptr, self)
+ .get();
+ });
MSG_process_yield();
env->ReleaseStringUTFChars(jname, name);
{
double time = ((double)jmillis) / 1000 + ((double)jnanos) / 1000000000;
msg_error_t rv = MSG_OK;
- if (not simgrid::kernel::context::StopRequest::try_n_catch(
- [&time]() { simgrid::s4u::this_actor::sleep_for(time); })) {
+ if (not simgrid::ForcefulKillException::try_n_catch([&time]() { simgrid::s4u::this_actor::sleep_for(time); })) {
rv = MSG_HOST_FAILURE;
}
if (rv != MSG_OK) {
JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, jdouble jseconds)
{
msg_error_t rv = MSG_OK;
- if (not simgrid::kernel::context::StopRequest::try_n_catch(
+ if (not simgrid::ForcefulKillException::try_n_catch(
[&jseconds]() { simgrid::s4u::this_actor::sleep_for((double)jseconds); })) {
rv = MSG_HOST_FAILURE;
jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
jxbt_throw_notbound(env, "process", jprocess);
return;
}
- if (not simgrid::kernel::context::StopRequest::try_n_catch([&process]() { MSG_process_kill(process); })) {
+ if (not simgrid::ForcefulKillException::try_n_catch([&process]() { MSG_process_kill(process); })) {
jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
}
}