X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c924fe6229cf13ed8de5cf4fbda1fa1b85c72cdd..0062810c4d947182d063333a1e949f89a3647dd8:/src/jmsg_file.c

diff --git a/src/jmsg_file.c b/src/jmsg_file.c
index 3695fb8379..36650e262e 100644
--- a/src/jmsg_file.c
+++ b/src/jmsg_file.c
@@ -11,66 +11,67 @@ void jfile_bind(JNIEnv *env, jobject jfile, msg_file_t stream) {
 }
 
 msg_file_t jfile_get_native(JNIEnv *env, jobject jfile) {
-	msg_file_t file = (msg_file_t)(*env)->GetLongField(env, jfile, jfile_field_bind);
-	return file;
+  msg_file_t file = (msg_file_t)(*env)->GetLongField(env, jfile, jfile_field_bind);
+  return file;
 }
 
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_File_nativeInit(JNIEnv *env, jclass cls) {
-	jclass class_File = (*env)->FindClass(env, "org/simgrid/msg/File");
-	jfile_field_bind = jxbt_get_jfield(env , class_File, "bind", "J");
-	xbt_assert((jfile_field_bind != NULL), "Can't find \"bind\" field in File class.");
+  jclass class_File = (*env)->FindClass(env, "org/simgrid/msg/File");
+  jfile_field_bind = jxbt_get_jfield(env , class_File, "bind", "J");
+  xbt_assert((jfile_field_bind != NULL), "Can't find \"bind\" field in File class.");
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_File_open(JNIEnv *env, jobject jfile, jobject jstorage, jobject jpath, jobject jmode) {
-
-	const char *storage = (*env)->GetStringUTFChars(env, jstorage, 0);
-	const char *path = (*env)->GetStringUTFChars(env, jpath, 0);
-	const char *mode = (*env)->GetStringUTFChars(env, jmode, 0);
-
-	msg_file_t file = MSG_file_open(storage, path, mode);
-
-	jfile_bind(env, jfile, file);
-
-	(*env)->ReleaseStringUTFChars(env, jstorage, storage);
-	(*env)->ReleaseStringUTFChars(env, jpath, path);
-	(*env)->ReleaseStringUTFChars(env, jmode, mode);
+  const char *storage = (*env)->GetStringUTFChars(env, jstorage, 0);
+  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);
+  }
+  jfile_bind(env, jfile, file);
+
+  (*env)->ReleaseStringUTFChars(env, jstorage, storage);
+  (*env)->ReleaseStringUTFChars(env, jpath, path);
+  (*env)->ReleaseStringUTFChars(env, jmode, mode);
 }
 JNIEXPORT jlong JNICALL
-Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jobject jstorage, jlong jsize, jlong jnmemb) {
-	msg_file_t file = jfile_get_native(env, jfile);
-
-	const char *storage = (*env)->GetStringUTFChars(env, jstorage, 0);
-
-	size_t n = MSG_file_read(storage, NULL,(size_t)jsize, (size_t)jnmemb, file);
-
-	(*env)->ReleaseStringUTFChars(env, jstorage, storage);
-
-	return (jlong)n;
+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);
+  }
+  return (jlong)n;
 }
 
 JNIEXPORT jlong JNICALL
-Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jobject jstorage, jlong jsize, jlong jnmemb) {
-	msg_file_t file = jfile_get_native(env, jfile);
-
-	const char *storage = (*env)->GetStringUTFChars(env, jstorage, 0);
-
-	size_t n = MSG_file_write(storage, NULL, (size_t)jsize, (size_t)jnmemb, file);
-
-	(*env)->ReleaseStringUTFChars(env, jstorage, storage);
-
-	return (jlong)n;
+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);
+  }
+  return (jlong)n;
 }
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile, jobject jstorage) {
-	msg_file_t file = jfile_get_native(env, jfile);
-
-	const char *storage = (*env)->GetStringUTFChars(env, jstorage, 0);
-
-	MSG_file_close(storage, file);
-	jfile_bind(env, jfile, NULL);
-
-	(*env)->ReleaseStringUTFChars(env, jstorage, storage);
+Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile) {
+  msg_file_t file = jfile_get_native(env, jfile);
 
+  MSG_file_close(file);
+  jfile_bind(env, jfile, NULL);
 }