Commit broken files which were wrongly moved; right move in the next commit

[simgrid.git] / src / xbt_context_java.c

diff --git a/src/xbt/xbt_jcontext.c b/src/xbt_context_java.c
similarity index 56%
rename from src/xbt/xbt_jcontext.c
rename to src/xbt_context_java.c
index 131c2c3..8b2516b 100644 (file)
--- a/src/xbt/xbt_jcontext.c
+++ b/src/xbt_context_java.c
@@ -3,98 +3,98 @@
 #include "xbt/function_types.h"\r
 #include "xbt/ex_interface.h"\r
 #include "xbt/xbt_context_factory.h"\r
 #include "xbt/function_types.h"\r
 #include "xbt/ex_interface.h"\r
 #include "xbt/xbt_context_factory.h"\r

-#include "xbt/xbt_jcontext.h"\r
+#include "xbt/xbt_context_java.h"\r

 \r
 XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg,"MSG for Java(TM)");\r
 \r
 /* callback: context fetching */\r
 static ex_ctx_t*\r
 \r
 XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg,"MSG for Java(TM)");\r
 \r
 /* callback: context fetching */\r
 static ex_ctx_t*\r

-xbt_jcontext_ex_ctx(void);\r
+xbt_ctx_java_ex_ctx(void);\r

 \r
 /* callback: termination */\r
 static void \r
 \r
 /* callback: termination */\r
 static void \r

-xbt_jcontext_ex_terminate(xbt_ex_t *e);\r
+xbt_ctx_java_ex_terminate(xbt_ex_t *e);\r

 \r
 static xbt_context_t \r
 \r
 static xbt_context_t \r

-xbt_jcontext_factory_create_context(const char* name, xbt_main_func_t code, void_f_pvoid_t startup_func, void* startup_arg, void_f_pvoid_t cleanup_func, void* cleanup_arg, int argc, char** argv);\r
+xbt_ctx_java_factory_create_context(const char* name, xbt_main_func_t code, void_f_pvoid_t startup_func, void* startup_arg, void_f_pvoid_t cleanup_func, void* cleanup_arg, int argc, char** argv);\r

 \r
 static int \r
 \r
 static int \r

-xbt_jcontext_factory_create_maestro_context(xbt_context_t* maestro);\r
+xbt_ctx_java_factory_create_maestro_context(xbt_context_t* maestro);\r

 \r
 static int\r
 \r
 static int\r

-xbt_jcontext_factory_finalize(xbt_context_factory_t* factory);\r
+xbt_ctx_java_factory_finalize(xbt_context_factory_t* factory);\r

 \r
 static void \r
 \r
 static void \r

-xbt_jcontext_free(xbt_context_t context);\r
+xbt_ctx_java_free(xbt_context_t context);\r

 \r
 static void \r
 \r
 static void \r

-xbt_jcontext_kill(xbt_context_t context);\r
+xbt_ctx_java_kill(xbt_context_t context);\r

 \r
 static void \r
 \r
 static void \r

-xbt_jcontext_schedule(xbt_context_t context);\r
+xbt_ctx_java_schedule(xbt_context_t context);\r

 \r
 static void \r
 \r
 static void \r

-xbt_jcontext_yield(void);\r
+xbt_ctx_java_yield(void);\r

 \r
 static void \r
 \r
 static void \r

-xbt_jcontext_start(xbt_context_t context);\r
+xbt_ctx_java_start(xbt_context_t context);\r

 \r
 static void \r
 \r
 static void \r

-xbt_jcontext_stop(int exit_code);\r
+xbt_ctx_java_stop(int exit_code);\r

 \r
 static void \r
 \r
 static void \r

-xbt_jcontext_swap(xbt_context_t context);\r
+xbt_ctx_java_swap(xbt_context_t context);\r

 \r
 static void\r
 \r
 static void\r

-xbt_jcontext_schedule(xbt_context_t context);\r
+xbt_ctx_java_schedule(xbt_context_t context);\r

 \r
 static void\r
 \r
 static void\r

-xbt_jcontext_yield(void);\r
+xbt_ctx_java_yield(void);\r

 \r
 static void\r
 \r
 static void\r

-xbt_jcontext_suspend(xbt_context_t context);\r
+xbt_ctx_java_suspend(xbt_context_t context);\r

 \r
 static void\r
 \r
 static void\r

-xbt_jcontext_resume(xbt_context_t context);\r
+xbt_ctx_java_resume(xbt_context_t context);\r

 \r
 \r
 /* callback: context fetching */\r
 static ex_ctx_t*\r
 \r
 \r
 /* callback: context fetching */\r
 static ex_ctx_t*\r

-xbt_jcontext_ex_ctx(void) \r
+xbt_ctx_java_ex_ctx(void) \r

 {\r
        return current_context->exception;\r
 }\r
 \r
 /* callback: termination */\r
 static void \r
 {\r
        return current_context->exception;\r
 }\r
 \r
 /* callback: termination */\r
 static void \r

-xbt_jcontext_ex_terminate(xbt_ex_t *e) \r
+xbt_ctx_java_ex_terminate(xbt_ex_t *e) \r

 {\r
        xbt_ex_display(e);\r
        abort();\r
 }\r
 \r
 int\r
 {\r
        xbt_ex_display(e);\r
        abort();\r
 }\r
 \r
 int\r

-xbt_jcontext_factory_init(xbt_context_factory_t* factory)\r
+xbt_ctx_java_factory_init(xbt_context_factory_t* factory)\r

 {\r
        /* context exception handlers */\r
 {\r
        /* context exception handlers */\r

-    __xbt_ex_ctx       = xbt_jcontext_ex_ctx;\r
-    __xbt_ex_terminate = xbt_jcontext_ex_terminate;    \r
+    __xbt_ex_ctx       = xbt_ctx_java_ex_ctx;\r
+    __xbt_ex_terminate = xbt_ctx_java_ex_terminate;    \r

     \r
     /* instantiate the context factory */\r
        *factory = xbt_new0(s_xbt_context_factory_t,1);\r
        \r
     \r
     /* instantiate the context factory */\r
        *factory = xbt_new0(s_xbt_context_factory_t,1);\r
        \r

-       (*factory)->create_context = xbt_jcontext_factory_create_context;\r
-       (*factory)->finalize = xbt_jcontext_factory_finalize;\r
-       (*factory)->create_maestro_context = xbt_jcontext_factory_create_maestro_context;\r
-       (*factory)->name = "jcontext_factory";\r
+       (*factory)->create_context = xbt_ctx_java_factory_create_context;\r
+       (*factory)->finalize = xbt_ctx_java_factory_finalize;\r
+       (*factory)->create_maestro_context = xbt_ctx_java_factory_create_maestro_context;\r
+       (*factory)->name = "ctx_java_factory";\r

        \r
        return 0;\r
 }\r
 \r
 static int \r
        \r
        return 0;\r
 }\r
 \r
 static int \r

-xbt_jcontext_factory_create_maestro_context(xbt_context_t* maestro)\r
+xbt_ctx_java_factory_create_maestro_context(xbt_context_t* maestro)\r

 {\r
 {\r

-       xbt_jcontext_t context = xbt_new0(s_xbt_jcontext_t, 1);\r
+       xbt_ctx_java_t context = xbt_new0(s_xbt_ctx_java_t, 1);\r

        \r
        context->exception = xbt_new(ex_ctx_t,1);\r
     XBT_CTX_INITIALIZE(context->exception);\r
        \r
        context->exception = xbt_new(ex_ctx_t,1);\r
     XBT_CTX_INITIALIZE(context->exception);\r


@@ -105,7 +105,7 @@ xbt_jcontext_factory_create_maestro_context(xbt_context_t* maestro)
 }\r
 \r
 static int\r
 }\r
 \r
 static int\r

-xbt_jcontext_factory_finalize(xbt_context_factory_t* factory)\r
+xbt_ctx_java_factory_finalize(xbt_context_factory_t* factory)\r

 {\r
        free(maestro_context->exception);\r
        free(*factory);\r
 {\r
        free(maestro_context->exception);\r
        free(*factory);\r


@@ -115,9 +115,9 @@ xbt_jcontext_factory_finalize(xbt_context_factory_t* factory)
 }\r
 \r
 static xbt_context_t \r
 }\r
 \r
 static xbt_context_t \r

-xbt_jcontext_factory_create_context(const char* name, xbt_main_func_t code, void_f_pvoid_t startup_func, void* startup_arg, void_f_pvoid_t cleanup_func, void* cleanup_arg, int argc, char** argv)\r
+xbt_ctx_java_factory_create_context(const char* name, xbt_main_func_t code, void_f_pvoid_t startup_func, void* startup_arg, void_f_pvoid_t cleanup_func, void* cleanup_arg, int argc, char** argv)\r

 {\r
 {\r

-       xbt_jcontext_t context = xbt_new0(s_xbt_jcontext_t,1);\r
+       xbt_ctx_java_t context = xbt_new0(s_xbt_ctx_java_t,1);\r

 \r
        context->name = xbt_strdup(name);\r
 \r
 \r
        context->name = xbt_strdup(name);\r
 \r


@@ -127,12 +127,12 @@ xbt_jcontext_factory_create_context(const char* name, xbt_main_func_t code, void
        context->exception = xbt_new(ex_ctx_t,1);\r
        XBT_CTX_INITIALIZE(context->exception);\r
 \r
        context->exception = xbt_new(ex_ctx_t,1);\r
        XBT_CTX_INITIALIZE(context->exception);\r
 \r

-       context->free = xbt_jcontext_free;                      \r
-       context->kill = xbt_jcontext_kill;                      \r
-       context->schedule = xbt_jcontext_schedule;\r
-       context->yield = xbt_jcontext_yield;                    \r
-       context->start = xbt_jcontext_start;                    \r
-       context->stop = xbt_jcontext_stop;      \r
+       context->free = xbt_ctx_java_free;                      \r
+       context->kill = xbt_ctx_java_kill;                      \r
+       context->schedule = xbt_ctx_java_schedule;\r
+       context->yield = xbt_ctx_java_yield;                    \r
+       context->start = xbt_ctx_java_start;                    \r
+       context->stop = xbt_ctx_java_stop;      \r

        context->jprocess = (jobject)startup_arg;\r
        context->jenv = get_current_thread_env();\r
 \r
        context->jprocess = (jobject)startup_arg;\r
        context->jenv = get_current_thread_env();\r
 \r


@@ -140,26 +140,26 @@ xbt_jcontext_factory_create_context(const char* name, xbt_main_func_t code, void
 }\r
 \r
 static void \r
 }\r
 \r
 static void \r

-xbt_jcontext_free(xbt_context_t context)\r
+xbt_ctx_java_free(xbt_context_t context)\r

 {\r
        if(context) \r
        {\r
 {\r
        if(context) \r
        {\r

-               xbt_jcontext_t jcontext = (xbt_jcontext_t)context;\r
+               xbt_ctx_java_t ctx_java = (xbt_ctx_java_t)context;\r

                \r
                \r

-               free(jcontext->name);\r
+               free(ctx_java->name);\r

                \r
                \r

-               if(jcontext->jprocess) \r
+               if(ctx_java->jprocess) \r

                {\r
                {\r

-                       jobject jprocess = jcontext->jprocess;\r
-                       jcontext->jprocess = NULL;\r
+                       jobject jprocess = ctx_java->jprocess;\r
+                       ctx_java->jprocess = NULL;\r

 \r
                        /* if the java process is alive join it */\r
                        if(jprocess_is_alive(jprocess,get_current_thread_env())) \r
                                jprocess_join(jprocess,get_current_thread_env());\r
                }\r
 \r
 \r
                        /* if the java process is alive join it */\r
                        if(jprocess_is_alive(jprocess,get_current_thread_env())) \r
                                jprocess_join(jprocess,get_current_thread_env());\r
                }\r
 \r

-               if(jcontext->exception) \r
-                       free(jcontext->exception);\r
+               if(ctx_java->exception) \r
+                       free(ctx_java->exception);\r

 \r
                free(context);\r
                context = NULL;\r
 \r
                free(context);\r
                context = NULL;\r


@@ -167,10 +167,10 @@ xbt_jcontext_free(xbt_context_t context)
 }\r
 \r
 static void \r
 }\r
 \r
 static void \r

-xbt_jcontext_kill(xbt_context_t context)\r
+xbt_ctx_java_kill(xbt_context_t context)\r

 {\r
        context->iwannadie = 1;\r
 {\r
        context->iwannadie = 1;\r

-       xbt_jcontext_swap(context);\r
+       xbt_ctx_java_swap(context);\r

 }\r
 \r
 /** \r
 }\r
 \r
 /** \r


@@ -183,10 +183,10 @@ xbt_jcontext_kill(xbt_context_t context)
  * Only the maestro can call this function to run a given process.\r
  */\r
 static void \r
  * Only the maestro can call this function to run a given process.\r
  */\r
 static void \r

-xbt_jcontext_schedule(xbt_context_t context)\r
+xbt_ctx_java_schedule(xbt_context_t context)\r

 {\r
        xbt_assert0((current_context == maestro_context),"You are not supposed to run this function here!");\r
 {\r
        xbt_assert0((current_context == maestro_context),"You are not supposed to run this function here!");\r

-       xbt_jcontext_swap(context);\r
+       xbt_ctx_java_swap(context);\r

 }\r
 \r
 /** \r
 }\r
 \r
 /** \r


@@ -198,23 +198,23 @@ xbt_jcontext_schedule(xbt_context_t context)
  * to the maestro\r
  */\r
 static void \r
  * to the maestro\r
  */\r
 static void \r

-xbt_jcontext_yield(void)\r
+xbt_ctx_java_yield(void)\r

 {\r
        xbt_assert0((current_context != maestro_context),"You are not supposed to run this function here!");\r
        jprocess_unschedule(current_context);\r
 }\r
 \r
 static void \r
 {\r
        xbt_assert0((current_context != maestro_context),"You are not supposed to run this function here!");\r
        jprocess_unschedule(current_context);\r
 }\r
 \r
 static void \r

-xbt_jcontext_start(xbt_context_t context)\r
+xbt_ctx_java_start(xbt_context_t context)\r

 {\r
 {\r

-       jprocess_start(((xbt_jcontext_t)context)->jprocess,get_current_thread_env());\r
+       jprocess_start(((xbt_ctx_java_t)context)->jprocess,get_current_thread_env());\r

 }\r
 \r
 static void \r
 }\r
 \r
 static void \r

-xbt_jcontext_stop(int exit_code)\r
+xbt_ctx_java_stop(int exit_code)\r

 {\r
        jobject jprocess = NULL;\r
 {\r
        jobject jprocess = NULL;\r

-       xbt_jcontext_t jcontext;\r
+       xbt_ctx_java_t ctx_java;\r

 \r
        if(current_context->cleanup_func)\r
                (*(current_context->cleanup_func))(current_context->cleanup_arg);\r
 \r
        if(current_context->cleanup_func)\r
                (*(current_context->cleanup_func))(current_context->cleanup_arg);\r


@@ -222,19 +222,19 @@ xbt_jcontext_stop(int exit_code)
        xbt_swag_remove(current_context, context_living);\r
        xbt_swag_insert(current_context, context_to_destroy);\r
        \r
        xbt_swag_remove(current_context, context_living);\r
        xbt_swag_insert(current_context, context_to_destroy);\r
        \r

-       jcontext = (xbt_jcontext_t)current_context;\r
+       ctx_java = (xbt_ctx_java_t)current_context;\r

        \r
        \r

-       if(jcontext->iwannadie)\r
+       if(ctx_java->iwannadie)\r

        {\r
                /* The maestro call xbt_context_stop() with an exit code set to one */\r
        {\r
                /* The maestro call xbt_context_stop() with an exit code set to one */\r

-               if(jcontext->jprocess) \r
+               if(ctx_java->jprocess) \r

                {\r
                        /* if the java process is alive schedule it */\r
                {\r
                        /* if the java process is alive schedule it */\r

-                       if(jprocess_is_alive(jcontext->jprocess,get_current_thread_env())) \r
+                       if(jprocess_is_alive(ctx_java->jprocess,get_current_thread_env())) \r

                        {\r
                                jprocess_schedule(current_context);\r
                        {\r
                                jprocess_schedule(current_context);\r

-                               jprocess = jcontext->jprocess;\r
-                               jcontext->jprocess = NULL;\r
+                               jprocess = ctx_java->jprocess;\r
+                               ctx_java->jprocess = NULL;\r

                                \r
                                /* interrupt the java process */\r
                                jprocess_exit(jprocess,get_current_thread_env());\r
                                \r
                                /* interrupt the java process */\r
                                jprocess_exit(jprocess,get_current_thread_env());\r


@@ -245,8 +245,8 @@ xbt_jcontext_stop(int exit_code)
        else\r
        {\r
                /* the java process exits */\r
        else\r
        {\r
                /* the java process exits */\r

-               jprocess = jcontext->jprocess;\r
-               jcontext->jprocess = NULL;\r
+               jprocess = ctx_java->jprocess;\r
+               ctx_java->jprocess = NULL;\r

        }\r
 \r
        /* delete the global reference associated with the java process */\r
        }\r
 \r
        /* delete the global reference associated with the java process */\r


@@ -254,7 +254,7 @@ xbt_jcontext_stop(int exit_code)
 }\r
 \r
 static void \r
 }\r
 \r
 static void \r

-xbt_jcontext_swap(xbt_context_t context)\r
+xbt_ctx_java_swap(xbt_context_t context)\r

 {\r
        if(context) \r
        {\r
 {\r
        if(context) \r
        {\r


@@ -268,5 +268,5 @@ xbt_jcontext_swap(xbt_context_t context)
        }\r
        \r
        if(current_context->iwannadie)\r
        }\r
        \r
        if(current_context->iwannadie)\r

-               xbt_jcontext_stop(1);\r
+               xbt_ctx_java_stop(1);\r

 }\r
 }\r