X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e8f8b64b899284cbd166542ba352cd0c44059e8..c1c1e55a043d3cb03aa731754b30c18b3151da91:/src/bindings/java/smx_context_cojava.c diff --git a/src/bindings/java/smx_context_cojava.c b/src/bindings/java/smx_context_cojava.c index 4983f73a7a..5e135f21f3 100644 --- a/src/bindings/java/smx_context_cojava.c +++ b/src/bindings/java/smx_context_cojava.c @@ -45,7 +45,6 @@ smx_ctx_cojava_factory_create_context(xbt_main_func_t code, int argc, void *data); static void smx_ctx_cojava_free(smx_context_t context); -static void smx_ctx_cojava_start(smx_context_t context); static void smx_ctx_cojava_suspend(smx_context_t context); static void smx_ctx_cojava_resume(smx_context_t new_context); static void smx_ctx_cojava_runall(void); @@ -182,7 +181,7 @@ void smx_ctx_cojava_stop(smx_context_t context) if (context->iwannadie) { context->iwannadie = 0; JNIEnv *env = get_current_thread_env(); - jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process killed :)")); + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", xbt_strdup("Process killed :)")); THROWF(cancel_error, 0, "process cancelled"); } else { @@ -204,7 +203,7 @@ static void smx_ctx_cojava_suspend(smx_context_t context) XBT_DEBUG("Switching to %p",my_current_context); smx_ctx_cojava_t java_context = (smx_ctx_cojava_t)(next_context); if (!java_context->jprocess) { - (*(java_context->super.code))(java_context->super.argc, java_context->super.argv); + java_context->super.code(java_context->super.argc, java_context->super.argv); smx_ctx_cojava_create_coroutine(java_context); } else if (!java_context->bound) { @@ -231,7 +230,7 @@ static void smx_ctx_cojava_resume(smx_context_t new_context) { smx_ctx_cojava_t java_context = (smx_ctx_cojava_t)(new_context); if (!java_context->jprocess) { - (*(java_context->super.code))(java_context->super.argc, java_context->super.argv); + java_context->super.code(java_context->super.argc, java_context->super.argv); smx_ctx_cojava_create_coroutine(java_context); java_context->bound = 1; } @@ -248,7 +247,7 @@ static void smx_ctx_cojava_runall(void) { cojava_processes = SIMIX_process_get_runnable(); smx_process_t process; - if (xbt_dynar_length(cojava_processes) > 0) { + if (!xbt_dynar_is_empty(cojava_processes)) { process = xbt_dynar_get_as(cojava_processes, 0, smx_process_t); cojava_process_index = 1; /* Execute the first process */