-/* $Id$ */
-
/* context_java - implementation of context switching for java threads */
/* Copyright (c) 2007-2008 the SimGrid team. All right reserved */
#include "xbt/function_types.h"
-#include "private.h"
#include "smx_context_java.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg, "MSG for Java(TM)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jmsg, bindings, "MSG for Java(TM)");
static smx_context_t
smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char** argv,
void_f_pvoid_t cleanup_func, void* cleanup_arg);
-static int smx_ctx_java_factory_finalize(smx_context_factory_t * factory);
-
static void smx_ctx_java_free(smx_context_t context);
-
static void smx_ctx_java_start(smx_context_t context);
-
static void smx_ctx_java_stop(smx_context_t context);
-
static void smx_ctx_java_suspend(smx_context_t context);
-
-static void
- smx_ctx_java_resume(smx_context_t old_context, smx_context_t new_context);
+static void smx_ctx_java_resume(smx_context_t new_context);
void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
{
/* instantiate the context factory */
- *factory = xbt_new0(s_smx_context_factory_t, 1);
+ smx_ctx_base_factory_init(factory);
(*factory)->create_context = smx_ctx_java_factory_create_context;
- (*factory)->finalize = smx_ctx_java_factory_finalize;
+ /* Leave default behavior of (*factory)->finalize */
(*factory)->free = smx_ctx_java_free;
(*factory)->stop = smx_ctx_java_stop;
(*factory)->suspend = smx_ctx_java_suspend;
(*factory)->name = "ctx_java_factory";
}
-static int smx_ctx_java_factory_finalize(smx_context_factory_t * factory)
-{
- free(*factory);
- *factory = NULL;
- return 0;
-}
-
static smx_context_t
smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char** argv,
void_f_pvoid_t cleanup_func, void* cleanup_arg)
/* If the user provided a function for the process then use it
otherwise is the context for maestro */
if(code){
- context->cleanup_func = cleanup_func;
- context->cleanup_arg = cleanup_arg;
+ context->super.cleanup_func = cleanup_func;
+ context->super.cleanup_arg = cleanup_arg;
context->jprocess = (jobject) code;
context->jenv = get_current_thread_env();
jprocess_start(((smx_ctx_java_t) context)->jprocess,
if (jprocess_is_alive(jprocess, get_current_thread_env()))
jprocess_join(jprocess, get_current_thread_env());
}
-
- free(context);
- context = NULL;
}
+
+ smx_ctx_base_free(context);
}
static void smx_ctx_java_stop(smx_context_t context)
jprocess_unschedule(context);
}
+// FIXME: inline those functions
static void
-smx_ctx_java_resume(smx_context_t old_context, smx_context_t new_context)
+smx_ctx_java_resume(smx_context_t new_context)
{
jprocess_schedule(new_context);
}