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
tend to the google coding standards in all S4U API
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg_comm.h
diff --git
a/src/bindings/java/jmsg_comm.h
b/src/bindings/java/jmsg_comm.h
index
e5cd3de
..
dd7bb99
100644
(file)
--- a/
src/bindings/java/jmsg_comm.h
+++ b/
src/bindings/java/jmsg_comm.h
@@
-1,18
+1,27
@@
-/*
Functions related to the java comm instances
*/
+/*
Java bindings to the Comm API
*/
-/* Copyright (c) 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2012-2017. 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. */
#ifndef MSG_JCOMM_H
#define MSG_JCOMM_H
/* 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. */
#ifndef MSG_JCOMM_H
#define MSG_JCOMM_H
+
+#include "simgrid/msg.h"
#include <jni.h>
#include <jni.h>
-#include <simgrid/msg.h>
SG_BEGIN_DECL()
SG_BEGIN_DECL()
+/* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
+#ifndef JNIEXPORT
+#define JNIEXPORT
+#endif
+#ifndef JNICALL
+#define JNICALL
+#endif
+/* end of eclipse-mandated pimple */
+
/** This function binds the task associated with the communication to the java communication object. */
void jcomm_bind_task(JNIEnv *env, jobject jcomm);
/** This function binds the task associated with the communication to the java communication object. */
void jcomm_bind_task(JNIEnv *env, jobject jcomm);
@@
-23,6
+32,8
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, job
JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm);
JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout);
JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm);
JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitAll(JNIEnv *env, jclass cls, jobjectArray jcomms, jdouble timeout);
+JNIEXPORT int JNICALL Java_org_simgrid_msg_Comm_waitAny(JNIEnv *env, jclass cls, jobjectArray jcomms);
SG_END_DECL()
SG_END_DECL()
-#endif
/* MSG_JCOMM_H */
+#endif