A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let the exception flow.
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg_synchro.cpp
diff --git
a/src/bindings/java/jmsg_synchro.cpp
b/src/bindings/java/jmsg_synchro.cpp
index
9749bf3
..
021dcce
100644
(file)
--- a/
src/bindings/java/jmsg_synchro.cpp
+++ b/
src/bindings/java/jmsg_synchro.cpp
@@
-1,21
+1,18
@@
/* Java bindings of the Synchronization API. */
/* Java bindings of the Synchronization API. */
-/* Copyright (c) 2012-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-201
9
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <xbt/ex.hpp>
-
-#include "jmsg.h"
#include "jmsg_synchro.h"
#include "jmsg_synchro.h"
-#include "jxbt_utilities.h"
+#include "jmsg.hpp"
+#include "jxbt_utilities.hpp"
+#include "simgrid/Exception.hpp"
#include "xbt/synchro.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
#include "xbt/synchro.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
-SG_BEGIN_DECL()
-
static jfieldID jsynchro_field_Mutex_bind;
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_nativeInit(JNIEnv *env, jclass cls) {
static jfieldID jsynchro_field_Mutex_bind;
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_nativeInit(JNIEnv *env, jclass cls) {
@@
-31,11
+28,7
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_init(JNIEnv * env, jobject obj
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj) {
xbt_mutex_t mutex = (xbt_mutex_t)(uintptr_t)env->GetLongField(obj, jsynchro_field_Mutex_bind);
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj) {
xbt_mutex_t mutex = (xbt_mutex_t)(uintptr_t)env->GetLongField(obj, jsynchro_field_Mutex_bind);
- try {
- xbt_mutex_acquire(mutex);
- } catch (xbt_ex const& e) {
- XBT_DEBUG("Caught an exception: %s", e.what());
- }
+ xbt_mutex_acquire(mutex);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_release(JNIEnv * env, jobject obj) {
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_release(JNIEnv * env, jobject obj) {
@@
-67,7
+60,7
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_acquire(JNIEnv * env, jobj
msg_sem_t sem;
sem = (msg_sem_t)(uintptr_t)env->GetLongField(obj, jsynchro_field_Semaphore_bind);
msg_sem_t sem;
sem = (msg_sem_t)(uintptr_t)env->GetLongField(obj, jsynchro_field_Semaphore_bind);
- msg_error_t res = MSG_sem_acquire_timeout(sem, (double)
timeout)
;
+ msg_error_t res = MSG_sem_acquire_timeout(sem, (double)
timeout) == 0 ? MSG_OK : MSG_TIMEOUT
;
if (res != MSG_OK) {
jmsg_throw_status(env, res);
}
if (res != MSG_OK) {
jmsg_throw_status(env, res);
}
@@
-94,5
+87,3
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_nativeFinalize(JNIEnv * en
sem = (msg_sem_t)(uintptr_t)env->GetLongField(obj, jsynchro_field_Semaphore_bind);
MSG_sem_destroy(sem);
}
sem = (msg_sem_t)(uintptr_t)env->GetLongField(obj, jsynchro_field_Semaphore_bind);
MSG_sem_destroy(sem);
}
-
-SG_END_DECL()