java directory moved into bindings directory

bindings/java/Context.cpp

@@ -0,0 +1,96 @@
+/*
+    Copyright (c) 2007-2009 FastMQ Inc.
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the Lesser GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    Lesser GNU General Public License for more details.
+
+    You should have received a copy of the Lesser GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <errno.h>
+
+#include "zmq.h"
+#include "org_zmq_Context.h"
+
+static jfieldID ctx_handle_fid = NULL;
+
+static void raise_exception (JNIEnv *env, int err)
+{
+    //  Get exception class.
+    jclass exception_class = env->FindClass ("java/lang/Exception");
+    assert (exception_class);
+
+    //  Get text description of the exception.
+#if defined _MSC_VER
+#pragma warning (push)
+#pragma warning (disable:4996)
+#endif
+    const char *err_msg = strerror (err);
+#if defined _MSC_VER
+#pragma warning (pop)
+#endif
+
+    //  Raise the exception.
+    int rc = env->ThrowNew (exception_class, err_msg);
+    assert (rc == 0);
+
+    //  Free the local ref.
+    env->DeleteLocalRef (exception_class);
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Context_construct (JNIEnv *env, jobject obj,
+    jint app_threads, jint io_threads)
+{
+    if (ctx_handle_fid == NULL) {
+        jclass cls = env->GetObjectClass (obj);
+        assert (cls);
+        ctx_handle_fid = env->GetFieldID (cls, "contextHandle", "J");
+        assert (ctx_handle_fid);
+        env->DeleteLocalRef (cls);
+    }
+
+    void *ctx = zmq_init (app_threads, io_threads);
+    if (ctx == NULL) {
+        raise_exception (env, errno);
+        return;
+    }
+
+    env->SetLongField (obj, ctx_handle_fid, (jlong) ctx);
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Context_finalize (JNIEnv *env, jobject obj)
+{
+    void *ctx = (void*) env->GetLongField (obj, ctx_handle_fid);
+    assert (ctx);
+
+    int rc = zmq_term (ctx);
+    assert (rc == 0);
+}
+
+JNIEXPORT jlong JNICALL Java_org_zmq_Context_createSocket (JNIEnv *env,
+    jobject obj, jint type)
+{
+    void *ctx = (void*) env->GetLongField (obj, ctx_handle_fid);
+    assert (ctx);
+
+    void *s = zmq_socket (ctx, type);
+    if (s == NULL) {
+        raise_exception (env, errno);
+        return -1;
+    }
+
+    return (jlong) s;
+}

bindings/java/Makefile.am

@@ -0,0 +1,58 @@
+# We do not want to install Jzmq.class file
+# user has to copy it to the right location.
+#jzmqdir = /tmp
+
+jarfile = Zmq.jar
+jardir = $(datadir)/java
+
+$(jarfile): $(dist_noinst_JAVA)
+	$(JAR) cf $(JARFLAGS) $@ org/zmq/*.class
+
+jar_DATA = $(jarfile)
+
+dist_noinst_JAVA = \
+	org/zmq/Context.java \
+	org/zmq/Socket.java
+
+lib_LTLIBRARIES = libjzmq.la
+libjzmq_la_SOURCES = \
+	Context.cpp \
+    org_zmq_Context.h \
+	Socket.cpp \
+    org_zmq_Socket.h
+
+libjzmq_la_CXXFLAGS = -I$(top_srcdir)/src/libzmq \
+@JAVA_INCLUDE@ -I$(top_srcdir)/c -I$(top_srcdir)/libjzmq -Wall
+libjzmq_la_LDFLAGS = -version-info @JLTVER@
+libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la
+
+BUILT_SOURCES = \
+    org/zmq/Context.class \
+    org_zmq_Context.h \
+	org/zmq/Socket.class \
+    org_zmq_Socket.h
+
+CLEANFILES = \
+	org/zmq/Context.class \
+	org_zmq_Context.h \
+	org/zmq/Socket.class \
+	org_zmq_Socket.h \
+	Zmq.jar
+
+$(srcdir)/Context.cpp: org_zmq_Context.h
+
+org_zmq_Context.h: org/zmq/Context.class
+	$(CLASSPATH_ENV) $(JAVAH) -jni -classpath . org.zmq.Context
+
+./org/zmq/Context.class: classdist_noinst.stamp
+
+$(srcdir)/Socket.cpp: org_zmq_Socket.h
+
+org_zmq_Socket.h: org/zmq/Socket.class
+	$(CLASSPATH_ENV) $(JAVAH) -jni -classpath . org.zmq.Socket
+
+./org/zmq/Socket.class: classdist_noinst.stamp
+
+dist-hook:
+	-rm $(distdir)/*.h
+

bindings/java/Socket.cpp

@@ -0,0 +1,272 @@
+/*
+    Copyright (c) 2007-2009 FastMQ Inc.
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the Lesser GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    Lesser GNU General Public License for more details.
+
+    You should have received a copy of the Lesser GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <errno.h>
+
+#include "../src/stdint.hpp"
+
+#include "zmq.h"
+#include "org_zmq_Socket.h"
+
+static jfieldID socket_handle_fid = NULL;
+static jmethodID create_socket_mid = NULL;
+
+static void raise_exception (JNIEnv *env, int err)
+{
+    //  Get exception class.
+    jclass exception_class = env->FindClass ("java/lang/Exception");
+    assert (exception_class);
+
+    //  Get text description of the exception.
+#if defined _MSC_VER
+#pragma warning (push)
+#pragma warning (disable:4996)
+#endif
+    const char *err_msg = strerror (err);
+#if defined _MSC_VER
+#pragma warning (pop)
+#endif
+
+    //  Raise the exception.
+    int rc = env->ThrowNew (exception_class, err_msg);
+    assert (rc == 0);
+
+    //  Free the local ref.
+    env->DeleteLocalRef (exception_class);
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Socket_construct (JNIEnv *env, jobject obj,
+    jobject context, jint type)
+{
+    if (socket_handle_fid == NULL) {
+        jclass cls = env->GetObjectClass (obj);
+        assert (cls);
+        socket_handle_fid = env->GetFieldID (cls, "socketHandle", "J");
+        assert (socket_handle_fid);
+        env->DeleteLocalRef (cls);
+    }
+
+    if (create_socket_mid == NULL) {
+        jclass cls = env->FindClass ("org/zmq/Context");
+        assert (cls);
+        create_socket_mid = env->GetMethodID (cls, "createSocket", "(I)J");
+        assert (create_socket_mid);
+        env->DeleteLocalRef (cls);
+    }
+
+    void *s = (void*) env->CallLongMethod (context, create_socket_mid, type);
+    if (env->ExceptionCheck ())
+        return;
+
+    env->SetLongField (obj, socket_handle_fid, (jlong) s);
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Socket_finalize (JNIEnv *env, jobject obj)
+{
+    void *s = (void*) env->GetLongField (obj, socket_handle_fid);
+    assert (s);
+    int rc = zmq_close (s);
+    assert (rc == 0);
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Socket_setsockopt__IJ (JNIEnv *env,
+    jobject obj, jint option, jlong optval)
+{
+    switch (option) {
+    case ZMQ_HWM:
+    case ZMQ_LWM:
+    case ZMQ_SWAP:
+    case ZMQ_AFFINITY:
+    case ZMQ_RATE:
+    case ZMQ_RECOVERY_IVL:
+    case ZMQ_MCAST_LOOP:
+        {
+            void *s = (void*) env->GetLongField (obj, socket_handle_fid);
+            assert (s);
+
+            int64_t value = optval;
+            int rc = zmq_setsockopt (s, option, &value, sizeof (value));
+            if (rc != 0)
+                raise_exception (env, errno);
+            return;
+        }
+    default:
+        raise_exception (env, EINVAL);
+        return;
+    }
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Socket_setsockopt__ILjava_lang_String_2 (
+    JNIEnv *env, jobject obj, jint option, jstring optval)
+{
+    switch (option) {
+    case ZMQ_IDENTITY:
+    case ZMQ_SUBSCRIBE:
+    case ZMQ_UNSUBSCRIBE:
+        {
+            if (optval == NULL) {
+                raise_exception (env, EINVAL);
+                return;
+            }
+
+            void *s = (void*) env->GetLongField (obj, socket_handle_fid);
+            assert (s);
+
+            const char *value = env->GetStringUTFChars (optval, NULL);
+            assert (value);
+            int rc = zmq_setsockopt (s, option, value, strlen (value));
+            env->ReleaseStringUTFChars (optval, value);
+            if (rc != 0)
+                raise_exception (env, errno);
+            return;
+        }
+    default:
+        raise_exception (env, EINVAL);
+        return;
+    }
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Socket_bind (JNIEnv *env, jobject obj,
+    jstring addr)
+{
+    void *s = (void*) env->GetLongField (obj, socket_handle_fid);
+    assert (s);
+
+    if (addr == NULL) {
+        raise_exception (env, EINVAL);
+        return;
+    }
+
+    const char *c_addr = env->GetStringUTFChars (addr, NULL);
+    if (c_addr == NULL) {
+        raise_exception (env, EINVAL);
+        return;
+    }
+
+    int rc = zmq_bind (s, c_addr);
+    env->ReleaseStringUTFChars (addr, c_addr);
+
+    if (rc == -1)
+        raise_exception (env, errno);
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Socket_connect (JNIEnv *env, jobject obj,
+    jstring addr)
+{
+    void *s = (void*) env->GetLongField (obj, socket_handle_fid);
+    assert (s);
+
+    if (addr == NULL) {
+        raise_exception (env, EINVAL);
+        return;
+    }
+
+    const char *c_addr = env->GetStringUTFChars (addr, NULL);
+    if (c_addr == NULL) {
+        raise_exception (env, EINVAL);
+        return;
+    }
+
+    int rc = zmq_connect (s, c_addr);
+    env->ReleaseStringUTFChars (addr, c_addr);
+
+    if (rc == -1)
+        raise_exception (env, errno);
+}
+
+JNIEXPORT jboolean JNICALL Java_org_zmq_Socket_send (JNIEnv *env, jobject obj,
+    jbyteArray msg, jlong flags)
+{
+    void *s = (void*) env->GetLongField (obj, socket_handle_fid);
+    assert (s);
+
+    jsize size = env->GetArrayLength (msg); 
+    jbyte *data = env->GetByteArrayElements (msg, 0);
+
+    zmq_msg_t message;
+    int rc = zmq_msg_init_size (&message, size);
+    assert (rc == 0);
+    memcpy (zmq_msg_data (&message), data, size);
+
+    env->ReleaseByteArrayElements (msg, data, 0);
+
+    rc = zmq_send (s, &message, (int) flags);
+        
+    if (rc == -1 && errno == EAGAIN) {
+        rc = zmq_msg_close (&message);
+        assert (rc == 0);
+        return JNI_FALSE;
+    }
+    
+    if (rc == -1) {
+        raise_exception (env, errno);
+        rc = zmq_msg_close (&message);
+        assert (rc == 0);
+        return JNI_FALSE;
+    }
+
+    rc = zmq_msg_close (&message);
+    assert (rc == 0);
+    return JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL Java_org_zmq_Socket_flush (JNIEnv *env, jobject obj)
+{
+    void *s = (void*) env->GetLongField (obj, socket_handle_fid);
+    assert (s);
+
+    int rc = zmq_flush (s);
+
+    if (rc == -1) {
+        raise_exception (env, errno);
+        return ;
+    }
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_zmq_Socket_recv (JNIEnv *env, jobject obj,
+    jlong flags)
+{
+    void *s = (void*) env->GetLongField (obj, socket_handle_fid);
+    assert (s);
+
+    zmq_msg_t message;
+    zmq_msg_init (&message);
+    int rc = zmq_recv (s, &message, (int) flags);
+
+    if (rc == -1 && errno == EAGAIN) {
+        zmq_msg_close (&message);
+        return NULL;
+    }
+
+    if (rc == -1) {
+        raise_exception (env, errno);
+        zmq_msg_close (&message);
+        return NULL;
+    }
+
+    jbyteArray data = env->NewByteArray (zmq_msg_size (&message));
+    assert (data);
+    env->SetByteArrayRegion (data, 0, zmq_msg_size (&message),
+        (jbyte*) zmq_msg_data (&message));
+
+    return data;
+}

bindings/java/org/zmq/Context.java

@@ -0,0 +1,50 @@
+/*
+    Copyright (c) 2007-2009 FastMQ Inc.
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the Lesser GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    Lesser GNU General Public License for more details.
+
+    You should have received a copy of the Lesser GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package org.zmq;
+
+public class Context {
+    static {
+        System.loadLibrary("jzmq");
+    }
+
+    /**
+     * Class constructor.
+     *
+     * @param appThreads maximum number of application threads.
+     * @param ioThreads size of the threads pool to handle I/O operations.
+     */
+    public Context (int appThreads, int ioThreads) {
+        construct (appThreads, ioThreads);
+    }
+
+    /**
+     * Internal function. Do not use directly!
+     */
+    public native long createSocket (int type);
+
+    /** Initialize the JNI interface */
+    protected native void construct (int appThreads, int ioThreads);
+
+    /** Free resources used by JNI driver. */
+    protected native void finalize ();
+
+    /** Opaque data used by JNI driver. */
+    private long contextHandle;
+}

bindings/java/org/zmq/Socket.java

@@ -0,0 +1,112 @@
+        /*
+    Copyright (c) 2007-2009 FastMQ Inc.
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the Lesser GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    Lesser GNU General Public License for more details.
+
+    You should have received a copy of the Lesser GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package org.zmq;
+
+public class Socket
+{
+
+    static {
+        System.loadLibrary("jzmq");
+    }
+
+    public static final int NOBLOCK = 1;
+    public static final int NOFLUSH = 2;
+
+    public static final int P2P = 0;
+    public static final int PUB = 1;
+    public static final int SUB = 2;
+    public static final int REQ = 3;
+    public static final int REP = 4;
+
+    public static final int HWM = 1;
+    public static final int LWM = 2;
+    public static final int SWAP = 3;
+    public static final int AFFINITY = 4;
+    public static final int IDENTITY = 5;
+    public static final int SUBSCRIBE = 6;
+    public static final int UNSUBSCRIBE = 7;
+    public static final int RATE = 8;
+    public static final int RECOVERY_IVL = 9;
+    public static final int MCAST_LOOP = 10;
+
+    /**
+     * Class constructor.
+     *
+     * @param context
+     * @param type
+     */
+    public Socket (Context context, int type) {
+        construct (context, type);
+    }
+
+    /**
+     * Set the socket option value.
+     *
+     * @param option ID of the option to set
+     * @param optval value to set the option to
+     */
+     public native void setsockopt (int option, long optval);
+     public native void setsockopt (int option, String optval);
+
+    /**
+     * Bind to network interface. Start listening for new connections.
+     *
+     * @param addr
+     */
+    public native void bind (String addr);
+
+    /**
+     * Connect to remote application.
+     *
+     * @param addr
+     */
+    public native void connect (String addr);
+
+    /**
+     * Send the message.
+     *
+     * @param msg
+     * @param flags
+     */
+    public native boolean send (byte [] msg, long flags);
+
+    /**
+     * Flush the messages down the stream.
+     */
+    public native void flush ();
+
+    /**
+     * Receive message.
+     *
+     * @param flags
+     * @return
+     */
+    public native byte [] recv (long flags);
+
+    /** Initialize JNI driver */
+    protected native void construct (Context context, int type);
+
+    /** Free all resources used by JNI driver. */
+    protected native void finalize ();
+
+    /** Opaque data used by JNI driver. */
+    private long socketHandle;
+
+}