From 1118c26fb7df28273d572dfd6324ab1b02ce365f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Mon, 14 Sep 2009 14:52:34 +0000 Subject: [PATCH] Working CREAM example via ContextIL, including native unix socket send --- org.glite.lb.client-java/Makefile | 3 ++- org.glite.lb.client-java/examples/CreamTest.java | 4 ++-- org.glite.lb.client-java/src/org/glite/lb/ContextIL.java | 2 +- org.glite.lb.client-java/src_c/Makefile | 3 +-- org.glite.lb.client-java/src_c/send_via_socket.c | 5 ++++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index c04b328..d95eb01 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -11,7 +11,8 @@ all compile: -Dreference.jobid-api-java.jar=${stagedir}/share/java/jobid-api-java.jar \ -Dreference.trustmanager.jar=${trustmanager_prefix}/share/java/glite-security-trustmanager.jar \ -Daxis.classpath=`ls ${axis_prefix}/lib/*.jar | tr '\012' :` - cd src_c && make PREFIX=${PREFIX} + javah -classpath build/classes -jni org.glite.lb.ContextIL + cd src_c && make PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=.. examples: ${EXAMPLES} diff --git a/org.glite.lb.client-java/examples/CreamTest.java b/org.glite.lb.client-java/examples/CreamTest.java index 8819101..3a28c5e 100644 --- a/org.glite.lb.client-java/examples/CreamTest.java +++ b/org.glite.lb.client-java/examples/CreamTest.java @@ -7,13 +7,13 @@ public static void main(String[] args) { int i; - String srv = null,socket = null,prefix = null,lib = null; + String srv = null,socket = null,prefix = null,lib = "glite_lb_sendviasocket"; for (i = 0; i < args.length; i++) { if (args[i].equals("-m")) srv = args[++i]; else if (args[i].equals("-s")) socket = args[++i]; else if (args[i].equals("-f")) prefix = args[++i]; - else if (args[i].equals("-l")) lib = args[++i]; + else if (args[i].equals("-l")) lib = args[++i]; /* needs java.library.path */ } try { diff --git a/org.glite.lb.client-java/src/org/glite/lb/ContextIL.java b/org.glite.lb.client-java/src/org/glite/lb/ContextIL.java index aca0fad..dcdf40b 100644 --- a/org.glite.lb.client-java/src/org/glite/lb/ContextIL.java +++ b/org.glite.lb.client-java/src/org/glite/lb/ContextIL.java @@ -63,7 +63,7 @@ public class ContextIL extends Context { throw new IllegalArgumentException("ContextIL prefix"); } - String message = "DG.LLLID=\"0\"" + super.createMessage(event); + String message = "DG.LLLID=\"0\"" + super.createMessage(event) +"\n"; String file = prefix + "." + getJobid().getUnique(); diff --git a/org.glite.lb.client-java/src_c/Makefile b/org.glite.lb.client-java/src_c/Makefile index 6d48605..f17d815 100755 --- a/org.glite.lb.client-java/src_c/Makefile +++ b/org.glite.lb.client-java/src_c/Makefile @@ -1,5 +1,4 @@ CC=gcc -PREFIX=${HOME}/tmp PATH_TO_JAVA=${JAVA_HOME} LIB=libglite_lb_sendviasocket.la @@ -11,7 +10,7 @@ ${LIB}: ${OBJ} libtool --mode=link ${CC} -rpath ${PREFIX}/lib -o $@ ${OBJ} %.lo: %.c - libtool --mode=compile ${CC} -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/linux -c $< + libtool --mode=compile ${CC} -I${topdir} -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/linux -c $< install: compile -mkdir -p ${PREFIX}/lib diff --git a/org.glite.lb.client-java/src_c/send_via_socket.c b/org.glite.lb.client-java/src_c/send_via_socket.c index 4f0fc95..7c530aa 100755 --- a/org.glite.lb.client-java/src_c/send_via_socket.c +++ b/org.glite.lb.client-java/src_c/send_via_socket.c @@ -11,6 +11,8 @@ #include #include +#include "org_glite_lb_ContextIL.h" + #define tv_sub(a, b) {\ (a).tv_usec -= (b).tv_usec;\ (a).tv_sec -= (b).tv_sec;\ @@ -125,7 +127,8 @@ edg_wll_socket_write_full( jint msg_size_j, jint conn_attempts_j, jint timeout_int_j)*/ -JNIEXPORT jint JNICALL Java_org_glite_lb_client_1java_ContextIL_sendToSocket +JNIEXPORT jint JNICALL +Java_org_glite_lb_ContextIL_sendToSocket (JNIEnv *env, jobject jobj, jstring socket_path_j, -- 1.8.2.3