Merge branch 'master' of https://github.com/mpoquet/simgrid

[simgrid.git] / src / bindings / java / JavaContext.cpp

diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp
index 9f4441e..54bc03f 100644 (file)
--- a/src/bindings/java/JavaContext.cpp
+++ b/src/bindings/java/JavaContext.cpp
@@ -23,9 +23,10 @@ extern JavaVM *__java_vm;
 XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg, "MSG for Java(TM)");
 
 namespace simgrid {
-namespace java {
+namespace kernel {
+namespace context {
 
-simgrid::simix::ContextFactory* java_factory()
+ContextFactory* java_factory()
 {
   XBT_INFO("Using regular java threads.");
   return new JavaContextFactory();
@@ -44,7 +45,7 @@ JavaContext* JavaContextFactory::self()
 
 JavaContext* JavaContextFactory::create_context(
   std::function<void()> code,
-  void_pfn_smxprocess_t cleanup, smx_process_t process)
+  void_pfn_smxprocess_t cleanup, smx_actor_t process)
 {
   return this->new_context<JavaContext>(std::move(code), cleanup, process);
 }
@@ -52,7 +53,7 @@ JavaContext* JavaContextFactory::create_context(
 void JavaContextFactory::run_all()
 {
   xbt_dynar_t processes = SIMIX_process_get_runnable();
-  smx_process_t process;
+  smx_actor_t process;
   unsigned int cursor;
   xbt_dynar_foreach(processes, cursor, process) {
     static_cast<JavaContext*>(SIMIX_process_get_context(process))->resume();
@@ -61,7 +62,7 @@ void JavaContextFactory::run_all()
 
 JavaContext::JavaContext(std::function<void()> code,
         void_pfn_smxprocess_t cleanup_func,
-        smx_process_t process)
+        smx_actor_t process)
   : Context(std::move(code), cleanup_func, process)
 {
   static int thread_amount=0;
@@ -164,5 +165,4 @@ void JavaContext::resume()
   xbt_os_sem_acquire(this->end);
 }
 
-}
-}
+}}} // namespace simgrid::kernel::context