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
fix: correct trace mask checking
[simgrid.git]
/
src
/
java
/
jmsg.c
diff --git
a/src/java/jmsg.c
b/src/java/jmsg.c
index
2f22893
..
d7fcb2d
100644
(file)
--- a/
src/java/jmsg.c
+++ b/
src/java/jmsg.c
@@
-158,8
+158,11
@@
Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
}
/* try to suspend the process */
}
/* try to suspend the process */
- if (MSG_OK != MSG_process_suspend(process))
- jxbt_throw_native(env, xbt_strdup("MSG_process_suspend() failed"));
+ MSG_error_t rv = MSG_process_suspend(process);
+
+ jxbt_check_res("MSG_process_suspend()",rv,MSG_OK,
+ bprintf("unexpected error , please report this bug"));
+
}
JNIEXPORT void JNICALL
}
JNIEXPORT void JNICALL
@@
-174,8
+177,10
@@
Java_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
}
/* try to resume the process */
}
/* try to resume the process */
- if (MSG_OK != MSG_process_resume(process))
- jxbt_throw_native(env, xbt_strdup("MSG_process_resume() failed"));
+ MSG_error_t rv = MSG_process_resume(process);
+
+ jxbt_check_res("MSG_process_resume()",rv,MSG_OK,
+ bprintf("unexpected error , please report this bug"));
}
JNIEXPORT jboolean JNICALL
}
JNIEXPORT jboolean JNICALL
@@
-250,7
+255,7
@@
Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls, jint PID)
}
if (!native_to_java_process(process)) {
}
if (!native_to_java_process(process)) {
- jxbt_throw_
native(env, xbt_strdup("SIMIX_process_get_jprocess() failed")
);
+ jxbt_throw_
jni(env, "SIMIX_process_get_jprocess() failed"
);
return NULL;
}
return NULL;
}
@@
-294,14
+299,14
@@
Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
jobject jprocess;
if (!process) {
jobject jprocess;
if (!process) {
- jxbt_throw_
native
(env, xbt_strdup("MSG_process_self() failed"));
+ jxbt_throw_
jni
(env, xbt_strdup("MSG_process_self() failed"));
return NULL;
}
jprocess = native_to_java_process(process);
if (!jprocess)
return NULL;
}
jprocess = native_to_java_process(process);
if (!jprocess)
- jxbt_throw_
native
(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
+ jxbt_throw_
jni
(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
return jprocess;
}
return jprocess;
}
@@
-318,18
+323,22
@@
Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
}
/* try to change the host of the process */
}
/* try to change the host of the process */
- if (MSG_OK != MSG_process_change_host(host))
- jxbt_throw_native(env, xbt_strdup("MSG_process_change_host() failed"));
+ MSG_error_t rv = MSG_process_change_host(host);
+
+ jxbt_check_res("MSG_process_change_host()",rv,MSG_OK,
+ bprintf("unexpected error , please report this bug"));
+
}
JNIEXPORT void JNICALL
Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
jdouble seconds)
{
}
JNIEXPORT void JNICALL
Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
jdouble seconds)
{
- if (MSG_OK != MSG_process_sleep((double) seconds))
- jxbt_throw_native(env,
- bprintf("MSG_process_change_host(%f) failed",
- (double) seconds));
+ MSG_error_t rv= MSG_process_sleep((double) seconds);
+
+ jxbt_check_res("MSG_process_sleep()",rv, MSG_HOST_FAILURE,
+ bprintf("while process was waiting for %f seconds",(double)seconds));
+
}
}
@@
-656,7
+665,7
@@
Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
host = MSG_task_get_source(task);
if (!host->data) {
host = MSG_task_get_source(task);
if (!host->data) {
- jxbt_throw_
native(env, xbt_strdup("MSG_task_get_source() failed")
);
+ jxbt_throw_
jni(env, "MSG_task_get_source() failed"
);
return NULL;
}
return NULL;
}
@@
-688,8
+697,10
@@
Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls, jobject jtask)
return;
}
return;
}
- if (MSG_OK != MSG_task_cancel(ptask))
- jxbt_throw_native(env, xbt_strdup("MSG_task_cancel() failed"));
+ MSG_error_t rv = MSG_task_cancel(ptask);
+
+ jxbt_check_res("MSG_task_cancel()",rv,MSG_OK,
+ bprintf("unexpected error , please report this bug"));
}
JNIEXPORT jdouble JNICALL
}
JNIEXPORT jdouble JNICALL
@@
-745,9
+756,12
@@
Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
return;
}
jtask = (jobject) task->data;
return;
}
jtask = (jobject) task->data;
+
+ MSG_error_t rv = MSG_task_destroy(task);
+
+ jxbt_check_res("MSG_task_destroy()",rv,MSG_OK,
+ bprintf("unexpected error , please report this bug"));
- if (MSG_OK != MSG_task_destroy(task))
- jxbt_throw_native(env, xbt_strdup("MSG_task_destroy() failed"));
/* delete the global reference to the java task object */
jtask_delete_global_ref(jtask, env);
/* delete the global reference to the java task object */
jtask_delete_global_ref(jtask, env);
@@
-764,8
+778,10
@@
Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
return;
}
return;
}
- if (MSG_OK != MSG_task_execute(task))
- jxbt_throw_native(env, xbt_strdup("MSG_task_execute() failed"));
+ MSG_error_t rv = MSG_task_execute(task);
+
+ jxbt_check_res("MSG_task_execute()",rv,MSG_HOST_FAILURE|MSG_TASK_CANCELLED,
+ bprintf("while executing task %s", MSG_task_get_name(task)));
}
/***************************************************************************************
}
/***************************************************************************************
@@
-821,31
+837,36
@@
Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) {
JNIEXPORT void JNICALL
JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) {
JNIEXPORT void JNICALL
JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) {
- xbt_fifo_item_t item = NULL;
- m_host_t host = NULL;
+ MSG_error_t rv;
+ int index;//xbt_fifo_item_t item = NULL;
+ m_host_t *hosts;
jobject jhost;
/* Run everything */
jobject jhost;
/* Run everything */
- if (MSG_OK != MSG_main()) {
- jxbt_throw_native(env, xbt_strdup("MSG_main() failed"));
- }
+ rv= MSG_main();
+ jxbt_check_res("MSG_main()",rv,MSG_OK,
+ bprintf("unexpected error : MSG_main() failed .. please report this bug "));
+
DEBUG0
("MSG_main finished. Bail out before cleanup since there is a bug in this part.");
DEBUG0("Clean java world");
/* Cleanup java hosts */
DEBUG0
("MSG_main finished. Bail out before cleanup since there is a bug in this part.");
DEBUG0("Clean java world");
/* Cleanup java hosts */
- xbt_fifo_foreach(msg_global->host, item, host, m_host_t) {
- jhost = (jobject) host->data;
+ hosts = MSG_get_host_table();
+ for (index=0;index<MSG_get_host_number()-1;index++)
+ {
+ jhost = (jobject)hosts[index]->data;
+ if(jhost)
+ jhost_unref(env,jhost);
- if (jhost)
- jhost_unref(env, jhost);
}
DEBUG0("Clean native world");
/* cleanup native stuff */
}
DEBUG0("Clean native world");
/* cleanup native stuff */
- if (MSG_OK != MSG_clean()){
- jxbt_throw_native(env, xbt_strdup("MSG_main() failed"));
- }
+ rv = MSG_OK != MSG_clean();
+ jxbt_check_res("MSG_clean()",rv,MSG_OK,
+ bprintf("unexpected error : MSG_clean() failed .. please report this bug "));
+
}
JNIEXPORT jint JNICALL
}
JNIEXPORT jint JNICALL
@@
-899,8
+920,8
@@
Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
jstring jname;
m_host_t host;
jstring jname;
m_host_t host;
- int count =
xbt_fifo_size(msg_global->host
);
- m_host_t *table =
(m_host_t *) xbt_fifo_to_array(msg_global->host
);
+ int count =
MSG_get_host_number(
);
+ m_host_t *table =
MSG_get_host_table(
);
jclass cls = jxbt_get_class(env, "simgrid/msg/Host");
jclass cls = jxbt_get_class(env, "simgrid/msg/Host");
@@
-955,7
+976,7
@@
Java_simgrid_msg_MsgNative_selectContextFactory(JNIEnv * env, jclass class,
if (errmsg) {
char *thrown = bprintf("xbt_select_context_factory() failed: %s", errmsg);
free(errmsg);
if (errmsg) {
char *thrown = bprintf("xbt_select_context_factory() failed: %s", errmsg);
free(errmsg);
- jxbt_throw_
native
(env, thrown);
+ jxbt_throw_
jni
(env, thrown);
}
}
}
}
@@
-981,7
+1002,7
@@
Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
(*env)->ReleaseStringUTFChars(env, jalias, alias);
(*env)->ReleaseStringUTFChars(env, jalias, alias);
- jxbt_check_res("MSG_task_send_with_timeout()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT
_FAILURE
,
+ jxbt_check_res("MSG_task_send_with_timeout()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
bprintf("while sending task %s to mailbox %s", MSG_task_get_name(task),alias));
}
bprintf("while sending task %s to mailbox %s", MSG_task_get_name(task),alias));
}
@@
-1005,8
+1026,9
@@
Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
(*env)->ReleaseStringUTFChars(env, jalias, alias);
(*env)->ReleaseStringUTFChars(env, jalias, alias);
- if (MSG_OK != rv)
- jxbt_throw_native(env, xbt_strdup("MSG_task_send_bounded() failed"));
+ jxbt_check_res("MSG_task_send_bounded()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
+ bprintf("while sending task %s to mailbox %s with max rate %f", MSG_task_get_name(task),alias,(double)jmaxRate));
+
}
JNIEXPORT jobject JNICALL
}
JNIEXPORT jobject JNICALL
@@
-1034,10
+1056,8
@@
Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
(*env)->ReleaseStringUTFChars(env, jalias, alias);
(*env)->ReleaseStringUTFChars(env, jalias, alias);
- if (MSG_OK != rv) {
- jxbt_throw_native(env, xbt_strdup("MSG_task_receive_ext() failed"));
- return NULL;
- }
+ jxbt_check_res("MSG_task_receive_ext()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
+ bprintf("while receiving from mailbox %s",alias));
return (jobject) task->data;
}
return (jobject) task->data;
}
@@
-1123,7
+1143,7
@@
Java_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
japplication_handler_on_start_document();
if (surf_parse())
japplication_handler_on_start_document();
if (surf_parse())
- jxbt_throw_
native(env, xbt_strdup("surf_parse() failed")
);
+ jxbt_throw_
jni(env,"surf_parse() failed"
);
surf_parse_close();
surf_parse_close();