X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2513cd9f5055a6a62a7066685e7fca786bcf1966..38e2adf74c9fccec6487e953bcb6895b72786dc1:/src/bindings/java/JavaContext.cpp diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp index 586fd13194..54b394fdda 100644 --- a/src/bindings/java/JavaContext.cpp +++ b/src/bindings/java/JavaContext.cpp @@ -18,7 +18,7 @@ #include "../../simix/smx_private.h" extern JavaVM *__java_vm; -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jmsg, bindings, "MSG for Java(TM)"); +XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg, "MSG for Java(TM)"); namespace simgrid { namespace java { @@ -60,7 +60,6 @@ void JavaContextFactory::run_all() } } - JavaContext::JavaContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_process_t process) @@ -69,8 +68,7 @@ JavaContext::JavaContext(std::function code, static int thread_amount=0; thread_amount++; - /* If the user provided a function for the process then use it - otherwise is the context for maestro */ + /* If the user provided a function for the process then use it otherwise is the context for maestro */ if (has_code()) { this->jprocess = nullptr; this->begin = xbt_os_sem_init(0); @@ -134,7 +132,7 @@ void JavaContext::stop() // jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process %s killed :) (file smx_context_java.c)", MSG_process_get_name( (msg_process_t)context) )); jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process %s killed :) (file JavaContext.cpp)", - simcall_process_get_name((smx_process_t) SIMIX_context_get_process(this))) ); + simcall_process_get_name(this->process()) )); XBT_DEBUG("Trigger a cancel error at the C level"); THROWF(cancel_error, 0, "process cancelled"); } else {