-/* Functions related to the java comm instances */
+/* Functions related to the java comm instances */
+
+/* Copyright (c) 2012-2015. 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. */
-/* Copyright (c) 2012. The SimGrid Team. All rights reserved. */
#include "jmsg_comm.h"
#include "jxbt_utilities.h"
#include "jmsg.h"
-#include <msg/msg.h>
+#include <simgrid/msg.h>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
static jfieldID jcomm_field_Comm_bind;
static jfieldID jcomm_field_Comm_taskBind;
void jcomm_bind_task(JNIEnv *env, jobject jcomm) {
- msg_comm_t comm = (msg_comm_t) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
+ msg_comm_t comm = (msg_comm_t) (uintptr_t) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
//test if we are receiving or sending a task.
jboolean jreceiving = (*env)->GetBooleanField(env, jcomm, jcomm_field_Comm_receiving);
if (jreceiving == JNI_TRUE) {
}
JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Comm_destroy(JNIEnv *env, jobject jcomm) {
+Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, jobject jcomm) {
msg_comm_t comm;
msg_task_t *task_received;
- task_received = (msg_task_t*) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_taskBind);
+ task_received = (msg_task_t*) (uintptr_t) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_taskBind);
xbt_free(task_received);
- comm = (msg_comm_t) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
+ comm = (msg_comm_t) (uintptr_t) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
MSG_comm_destroy(comm);
}
JNIEXPORT jboolean JNICALL
Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) {
msg_comm_t comm;
- comm = (msg_comm_t) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
+ comm = (msg_comm_t) (uintptr_t) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
jboolean finished = (*env)->GetBooleanField(env, jcomm, jcomm_field_Comm_finished);
if (finished == JNI_TRUE) {
jxbt_throw_native(env,bprintf("comm is null"));
return JNI_FALSE;
}
- xbt_ex_t e;
- TRY {
- if (MSG_comm_test(comm)) {
- msg_error_t status = MSG_comm_get_status(comm);
- if (status == MSG_OK) {
- jcomm_bind_task(env,jcomm);
- return JNI_TRUE;
- }
- else {
- //send the correct exception
- jmsg_throw_status(env,status);
- return JNI_FALSE;
- }
- }
- else {
- return JNI_FALSE;
+
+ if (MSG_comm_test(comm)) {
+ msg_error_t status = MSG_comm_get_status(comm);
+ if (status == MSG_OK) {
+ jcomm_bind_task(env,jcomm);
+ return JNI_TRUE;
+ } else {
+ //send the correct exception
+ jmsg_throw_status(env,status);
}
}
- CATCH(e) {
- xbt_ex_free(e);
- }
-
return JNI_FALSE;
}
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout) {
- msg_comm_t comm = (msg_comm_t) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
+ msg_comm_t comm = (msg_comm_t) (uintptr_t) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
if (!comm) {
jxbt_throw_native(env,bprintf("comm is null"));
return;