Changeset 8

Timestamp:

04/16/07 11:48:20 (2 years ago)

Author:

bwilliams

Message:

Update from ross, fixing null pointer problem and update to the java wrappers

Files:

• branches/binary-mq/libsipc/bindings/java/com/tresys/sipc/Sipc.java (modified) (7 diffs)
• branches/binary-mq/libsipc/bindings/java/com/tresys/sipc/libsipc.java (modified) (2 diffs)
• branches/binary-mq/libsipc/bindings/java/examples/MQ_Binary_Reader.java (added)
• branches/binary-mq/libsipc/bindings/java/examples/MQ_Reader.java (modified) (1 diff)
• branches/binary-mq/libsipc/bindings/java/examples/MQ_Sender.java (modified) (3 diffs)
• branches/binary-mq/libsipc/bindings/java/sipc_java_wrapper/sipc_wrap.c (modified) (13 diffs)
• branches/binary-mq/libsipc/src/sipc_mqueue.c (modified) (1 diff)

branches/binary-mq/libsipc/bindings/java/com/tresys/sipc/Sipc.java

@@ -25 +25 @@
- * @author David Windsor <dwindsor@tresys.com>
- * @author Norman Patrick <npatrick@tresys.com>
+ * @author L. Ross Raszewski <lraszewski@tresys.com>
- */
-public abstract class Sipc {
@@ -41 +42 @@
-        protected long handle; /* internal handle */
-
+        protected long size_handle; /* internal message size handle */
-        private java.nio.ByteBuffer dataPtr = null; /* internal pointer to data */
-
@@ -77 +79 @@
-        public void Init(boolean write) {
-                handle = libsipc.sipc_init(Key, GetIPCType(), DATA_LEN, write ? 1 : 0);
+                size_handle=libsipc.sipc_create_length();
-        }
-
@@ -86 +89 @@
-                if(handle != 0) {
-                        libsipc.sipc_destroy_handle(handle);
+                        libsipc.sipc_destroy_length(size_handle);
+                        size_handle=0;
-                        handle = 0;
-                        dataPtr = null;
@@ -146 +151 @@
-         */
-        public java.nio.ByteBuffer ReadData() {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /**
-         * Get a reference to the IPC handle's internal data buffer.
@@ -159 +174 @@
-        public java.nio.ByteBuffer GetDataPtr() {
-                if(isConnected && dataPtr == null) {
-
-
+
+
+
-
-                return dataPtr;
@@ -169 +185 @@
-         * connected state for this to succeed.
-         *
+         * @param len Length of the message to be sent
-         * @return  0 on success, <0 on error.
-         * @see     #Connect() Connect
-         */
+        public int SendData(int len) {
+                return libsipc.sipc_send_data(handle, len);
+        }
+        
+        /**
+         * Send data to the communications channel. The amount of data to 
+         * send is determined by the current limit of the data buffer.
+         *
+         * @return 0 on success, <0 on error
+         * @see #SendData(int) SendData(int)
+         */
-        public int SendData() {
-libsipc.sipc_send_data(handle
+SendData(dataPtr.limit()
-        }
-}

branches/binary-mq/libsipc/bindings/java/com/tresys/sipc/libsipc.java

@@ +1 @@
+/* This file has been hand-modified -- do not regenerate */
+
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
@@ -9 +11 @@
-package com.tresys.sipc;
-
-
+
+
-        static {
-                System.loadLibrary("sipcwrapper");
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

branches/binary-mq/libsipc/bindings/java/examples/MQ_Reader.java

@@ -61 +61 @@
-                ByteBuffer bbuf = queue.ReadData();
-                String data = ByteBufferToString(bbuf);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-                queue.Disconnect();
-        }

branches/binary-mq/libsipc/bindings/java/examples/MQ_Sender.java

@@ -23 +23 @@
-import java.io.*;
-import com.tresys.sipc.*;
+
+import java.nio.*;
+import java.nio.charset.*;
-
-/**
@@ -73 +76 @@
-                        java.nio.channels.FileChannel fc = stream.getChannel();
-                        int read = fc.read(buffer);
-                        buffer.flip();
-
-                        if(read < queue.DATA_LEN)
-                                buffer.put((byte) 0);
-
-                        while(read >= 0) {
-
+
+
+
-                                        throw new IOException("Cannot send data.");
-
-                                buffer.clear();
-
-
-
+
-                        }
-
@@ -92 +90 @@
-                        buffer.put(MQ_Sender.data_end.getBytes());
-                        buffer.put((byte) 0);
+                        /* Inferred-length version of SendData: 
+                           flip the buffer to set its limit, and 
+                           Sipc will use that as the data length
+                        */
+                        buffer.flip();
-                        if(queue.SendData() < 0)
-                                throw new IOException("Cannot send end of transmission marker");

branches/binary-mq/libsipc/bindings/java/sipc_java_wrapper/sipc_wrap.c

@@ +1 @@
+/* This file has been modified by hand. Do not regenerate it. */
+
+
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
@@ -14 +17 @@
- * ----------------------------------------------------------------------------- */
-
-
+
+
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
@@ -72 +76 @@
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
-
+\
-#  endif
-#endif
@@ -173 +177 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifdef __cplusplus
@@ -181 +207 @@
-#endif
-
-
-
+
-  jlong jresult = 0 ;
-  char *arg1 = (char *) 0 ;
@@ -193 +218 @@
-  (void)jcls;
-  arg1 = 0;
-key
-key
+jarg1
+jarg1
-    if (!arg1) return 0;
-  }
-ipc_type
-size
-sender
+jarg2
+jarg3
+jarg4
-  result = (sipc_t *)sipc_init(arg1,arg2,arg3,arg4);
-  *(sipc_t **)&jresult = result; 
-key
-
-
-
-
-handle
-
-
-
-
-handle
+jarg1
+
+
+
+
+jarg1
+
+
+
+
+jarg1
-  sipc_destroy_handle(arg1);
-}
-
-
-key, jint ipc_type
+
+jarg1, jint jarg2
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
@@ -224 +249 @@
-  (void)jcls;
-  arg1 = 0;
-key
-key
+jarg1
+jarg1
-    if (!arg1) return ;
-  }
-ipc_type
+jarg2
-  sipc_destroy_resource(arg1,arg2);
-key
-
-
-
-key, jint ipc_type
+jarg1
+
+
+
+jarg1, jint jarg2
-  jint jresult = 0 ;
-  char *arg1 = (char *) 0 ;
@@ -243 +268 @@
-  (void)jcls;
-  arg1 = 0;
-key
-key
+jarg1
+jarg1
-    if (!arg1) return 0;
-  }
-ipc_type
+jarg2
-  result = (int)sipc_create(arg1,arg2);
-  jresult = (jint)result; 
-key
-
-
-
-
-handle
+jarg1
+
+
+
+
+jarg1
-  jint jresult = 0 ;
-  sipc_t *arg1 = (sipc_t *) 0 ;
@@ -262 +287 @@
-  (void)jenv;
-  (void)jcls;
-handle
+jarg1
-  result = (int)sipc_connect(arg1);
-  jresult = (jint)result; 
@@ -268 +293 @@
-}
-
-
-handle
-
-
-
-
-handle
+
+jarg1
+
+
+
+
+jarg1
-  sipc_disconnect(arg1);
-}
-
-
-handle
+
+jarg1, jint jarg2
-  jint jresult = 0 ;
-  sipc_t *arg1 = (sipc_t *) 0 ;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-  jresult = (jint)result; 
-  return jresult;
@@ -293 +320 @@
-
-
-
-
-object jresult = 0 
+
+
+byteArray jresult = (jbyteArray) 0
-  sipc_t *arg1 = (sipc_t *) 0 ;
-  char *arg2 = NULL;
-  int arg3 = 0;
-  int result;
-
-
-
- 
+
+
+
+
-  result = (int)sipc_recv_data(arg1, &arg2, &arg3);
-
+
+
+
-  if (result == 0)
-  {
-
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-
-
-
-
+
+
+
+
+
+
-  jint jresult = 0 ;
-  sipc_t *arg1 = (sipc_t *) 0 ;
@@ -342 +399 @@
-  (void)jenv;
-  (void)jcls;
-handle
+jarg1
-  result = (int)sipc_shm_recv_done(arg1);
-  jresult = (jint)result; 
@@ -349 +406 @@
-
-
+  /* Methods to allocate and unbox the int pointer used for returning 
+     message size */
+static int *sipc_create_length()
+{
+  return (int *)malloc(sizeof(int));
+}
+
+static int sipc_get_length(int *arg)
+{
+  if (arg) return *arg; else return -1;
+}
+
+static void sipc_destroy_length(int *arg)
+{ 
+  if (arg) free(arg);
+}
+
+
+JNIEXPORT jlong JNICALL Java_com_tresys_sipc_libsipc_sipc_1create_1length(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  int *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  result = (int *)sipc_create_length();
+  *(int **)&jresult = result; 
+  return jresult;
+}
+
+JNIEXPORT jint JNICALL Java_com_tresys_sipc_libsipc_sipc_1get_1length(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jint jresult = 0 ;
+  int *arg1 = (int *) 0 ;
+  int result;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(int **)&jarg1; 
+  result = (int)sipc_get_length(arg1);
+  jresult = (jint)result; 
+  return jresult;
+}
+
+JNIEXPORT void JNICALL Java_com_tresys_sipc_libsipc_sipc_1destroy_1length(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  int *arg1 = (int *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(int **)&jarg1; 
+  sipc_destroy_length(arg1);
+}
+
+
-#ifdef __cplusplus
-}

branches/binary-mq/libsipc/src/sipc_mqueue.c

@@ -302 +302 @@
-}
-
+/* Finds the length in digits of a number (approximates log10+1 for ints) */
+static int qlog(int x)
+{
+  int i=0;
+  while(x)
+    {
+      i++;
+      x/=10;
+    }
+  return i;
+}
+
-static int mqueue_send_msg_len(sipc_t *sipc, int len)
-{
-
-
-
+
+
-        if (len < 0) 
-                return -1;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return 0;
-}