From e094538b3c56c20f2e93c2d0c01ee970b2a9cff9 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 31 Jan 2013 16:56:34 +0100 Subject: [PATCH] Don't catch exceptions if you don't know what to do after that! MSG functions should normally not throw any exception. Fixes warnings about "maybe uninitialized variables". --- src/bindings/java/jmsg_comm.c | 8 +-- src/bindings/java/jmsg_file.c | 25 ++------ src/bindings/java/jmsg_process.c | 33 +++------- src/bindings/java/jmsg_task.c | 104 ++++++++----------------------- 4 files changed, 40 insertions(+), 130 deletions(-) diff --git a/src/bindings/java/jmsg_comm.c b/src/bindings/java/jmsg_comm.c index 8fcd7aca1a..9fae1424a3 100644 --- a/src/bindings/java/jmsg_comm.c +++ b/src/bindings/java/jmsg_comm.c @@ -120,13 +120,7 @@ Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble tim } msg_error_t status; - xbt_ex_t e; - TRY { - status = MSG_comm_wait(comm,(double)timeout); - } - CATCH(e) { - xbt_ex_free(e); - } + status = MSG_comm_wait(comm,(double)timeout); (*env)->SetBooleanField(env, jcomm, jcomm_field_Comm_finished, JNI_TRUE); if (status == MSG_OK) { jcomm_bind_task(env,jcomm); diff --git a/src/bindings/java/jmsg_file.c b/src/bindings/java/jmsg_file.c index 36650e262e..1d45583d73 100644 --- a/src/bindings/java/jmsg_file.c +++ b/src/bindings/java/jmsg_file.c @@ -27,13 +27,8 @@ Java_org_simgrid_msg_File_open(JNIEnv *env, jobject jfile, jobject jstorage, job const char *path = (*env)->GetStringUTFChars(env, jpath, 0); const char *mode = (*env)->GetStringUTFChars(env, jmode, 0); msg_file_t file; - xbt_ex_t e; - TRY { - file = MSG_file_open(storage, path, mode); - } - CATCH(e) { - xbt_ex_free(e); - } + + file = MSG_file_open(storage, path, mode); jfile_bind(env, jfile, file); (*env)->ReleaseStringUTFChars(env, jstorage, storage); @@ -44,27 +39,15 @@ JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize, jlong jnmemb) { msg_file_t file = jfile_get_native(env, jfile); size_t n; - xbt_ex_t e; - TRY { - n = MSG_file_read(NULL,(size_t)jsize, (size_t)jnmemb, file); - } - CATCH (e) { - xbt_ex_free(e); - } + n = MSG_file_read(NULL,(size_t)jsize, (size_t)jnmemb, file); return (jlong)n; } JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize, jlong jnmemb) { msg_file_t file = jfile_get_native(env, jfile); - xbt_ex_t e; size_t n; - TRY { - n = MSG_file_write(NULL, (size_t)jsize, (size_t)jnmemb, file); - } - CATCH(e) { - xbt_ex_free(e); - } + n = MSG_file_write(NULL, (size_t)jsize, (size_t)jnmemb, file); return (jlong)n; } JNIEXPORT void JNICALL diff --git a/src/bindings/java/jmsg_process.c b/src/bindings/java/jmsg_process.c index aaa73e70ef..9499ba5892 100644 --- a/src/bindings/java/jmsg_process.c +++ b/src/bindings/java/jmsg_process.c @@ -321,21 +321,13 @@ Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, } JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_sleep - (JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) { - - double time = jmillis / 1000 + jnanos / 1000; - msg_error_t rv; - xbt_ex_t e; - TRY { - rv = MSG_process_sleep(time); - } - CATCH(e) { - xbt_ex_free(e); - return; - } +Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) + { + double time = jmillis / 1000 + jnanos / 1000; + msg_error_t rv; + rv = MSG_process_sleep(time); if (rv != MSG_OK) { - jmsg_throw_status(env,rv); + jmsg_throw_status(env,rv); } } JNIEXPORT void JNICALL @@ -343,17 +335,10 @@ Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, jdouble jseconds) { msg_error_t rv; - xbt_ex_t e; - TRY { - rv = MSG_process_sleep((double)jseconds); - } - CATCH(e) { - xbt_ex_free(e); - return; - } + rv = MSG_process_sleep((double)jseconds); if (rv != MSG_OK) { - XBT_INFO("Status NOK"); - jmsg_throw_status(env,rv); + XBT_INFO("Status NOK"); + jmsg_throw_status(env,rv); } } diff --git a/src/bindings/java/jmsg_task.c b/src/bindings/java/jmsg_task.c index a2e4b9281d..832b832e1f 100644 --- a/src/bindings/java/jmsg_task.c +++ b/src/bindings/java/jmsg_task.c @@ -206,8 +206,7 @@ Java_org_simgrid_msg_Task_cancel(JNIEnv * env, } JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_execute(JNIEnv * env, - jobject jtask) +Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask) { msg_task_t task = jtask_to_native_task(jtask, env); @@ -215,17 +214,10 @@ Java_org_simgrid_msg_Task_execute(JNIEnv * env, jxbt_throw_notbound(env, "task", jtask); return; } - xbt_ex_t e; msg_error_t rv; - TRY { - rv = MSG_task_execute(task); - } - CATCH(e) { - xbt_ex_free(e); - return; - } + rv = MSG_task_execute(task); if (rv != MSG_OK) { - jmsg_throw_status(env, rv); + jmsg_throw_status(env, rv); } } @@ -361,8 +353,8 @@ Java_org_simgrid_msg_Task_setDataSize JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask, - jstring jalias, - jdouble jtimeout) + jstring jalias, + jdouble jtimeout) { msg_error_t rv; const char *alias = (*env)->GetStringUTFChars(env, jalias, 0); @@ -378,25 +370,19 @@ Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask, /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */ MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask)); - xbt_ex_t e; - TRY { - rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout); - } - CATCH(e) { - xbt_ex_free(e); - } + rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout); (*env)->ReleaseStringUTFChars(env, jalias, alias); if (rv != MSG_OK) { - jmsg_throw_status(env, rv); + jmsg_throw_status(env, rv); } } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobject jtask, - jstring jalias, - jdouble jtimeout, - jdouble maxrate) + jstring jalias, + jdouble jtimeout, + jdouble maxrate) { msg_error_t rv; const char *alias = (*env)->GetStringUTFChars(env, jalias, 0); @@ -412,24 +398,18 @@ Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobject jtask, /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */ MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask)); - xbt_ex_t e; - TRY { - rv = MSG_task_send_with_timeout_bounded(task, alias, (double) jtimeout, (double) maxrate); - } - CATCH(e) { - xbt_ex_free(e); - } + rv = MSG_task_send_with_timeout_bounded(task, alias, (double) jtimeout, (double) maxrate); (*env)->ReleaseStringUTFChars(env, jalias, alias); if (rv != MSG_OK) { - jmsg_throw_status(env, rv); + jmsg_throw_status(env, rv); } } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls, - jstring jalias, jdouble jtimeout, - jobject jhost) + jstring jalias, jdouble jtimeout, + jobject jhost) { msg_error_t rv; msg_task_t *task = xbt_new(msg_task_t,1); @@ -449,17 +429,10 @@ Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls, } alias = (*env)->GetStringUTFChars(env, jalias, 0); - xbt_ex_t e; - TRY { - rv = MSG_task_receive_ext(task, alias, (double) jtimeout, host); - } - CATCH(e) { - xbt_ex_free(e); - return NULL; - } + rv = MSG_task_receive_ext(task, alias, (double) jtimeout, host); if (rv != MSG_OK) { - jmsg_throw_status(env,rv); - return NULL; + jmsg_throw_status(env,rv); + return NULL; } jtask_global = MSG_task_get_data(*task); @@ -647,30 +620,21 @@ Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobject jtask, JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls, - jstring jalias) { - +Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls, jstring jalias) +{ const char *alias; int rv; - xbt_ex_t e; alias = (*env)->GetStringUTFChars(env, jalias, 0); - TRY { - rv = MSG_task_listen(alias); - } - CATCH(e) { - xbt_ex_free(e); - return 0; - } + rv = MSG_task_listen(alias); (*env)->ReleaseStringUTFChars(env, jalias, alias); return (jboolean) rv; } JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls, - jstring jalias, - jobject jhost) { +Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls, jstring jalias, jobject jhost) + { int rv; const char *alias; @@ -681,15 +645,7 @@ Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls, return -1; } alias = (*env)->GetStringUTFChars(env, jalias, 0); - xbt_ex_t e; - - TRY { - rv = MSG_task_listen_from_host(alias, host); - } - CATCH(e) { - xbt_ex_free(e); - return 0; - } + rv = MSG_task_listen_from_host(alias, host); (*env)->ReleaseStringUTFChars(env, jalias, alias); return (jint) rv; @@ -697,19 +653,11 @@ Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls, JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass cls, - jstring jalias) { - +Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass cls, jstring jalias) +{ int rv; const char *alias = (*env)->GetStringUTFChars(env, jalias, 0); - xbt_ex_t e; - TRY { - rv = MSG_task_listen_from(alias); - } - CATCH(e) { - xbt_ex_free(e); - return 0; - } + rv = MSG_task_listen_from(alias); (*env)->ReleaseStringUTFChars(env, jalias, alias); return (jint) rv; -- 2.20.1