[GNUnet-SVN] r2912 - in freeway: . src/org/gnu/freeway/cwrappers src/org/gnu/freeway/server src/org/gnu/freeway/services

[mdonoughe]

Author: mdonoughe
Date: 2006-05-26 20:37:23 -0700 (Fri, 26 May 2006)
New Revision: 2912

Added:
   freeway/Makefile.am
   freeway/bootstrap
   freeway/src/org/gnu/freeway/server/CPluginLoader.h
   freeway/src/org/gnu/freeway/server/CPluginLoader.java
   freeway/src/org/gnu/freeway/server/CoreAPI.java
Modified:
   freeway/src/org/gnu/freeway/cwrappers/CString.java
   freeway/src/org/gnu/freeway/cwrappers/ConstCString.java
   freeway/src/org/gnu/freeway/services/StatsService.java
Log:
Now throwing Errors if UTF-8 is not supported
corrected the return type of StatsService.create(ConstCString)
added CPluginLoader and its C header file. Needs nonprivate functions.
added empty class CoreAPI to prevent compile errors.
added the beginnings of an autotools based build system for C code. 
configure.ac not completed. M4 directory not populated



Added: freeway/Makefile.am
===================================================================
--- freeway/Makefile.am 2006-05-27 00:24:25 UTC (rev 2911)
+++ freeway/Makefile.am 2006-05-27 03:37:23 UTC (rev 2912)
@@ -0,0 +1,2 @@
+SUBDIRS = src .
+ACLOCAL_AMFLAGS = -I m4

Added: freeway/bootstrap
===================================================================
--- freeway/bootstrap   2006-05-27 00:24:25 UTC (rev 2911)
+++ freeway/bootstrap   2006-05-27 03:37:23 UTC (rev 2912)
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoreconf -f -i


Property changes on: freeway/bootstrap
___________________________________________________________________
Name: svn:executable
   + *

Modified: freeway/src/org/gnu/freeway/cwrappers/CString.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/CString.java  2006-05-27 00:24:25 UTC 
(rev 2911)
+++ freeway/src/org/gnu/freeway/cwrappers/CString.java  2006-05-27 03:37:23 UTC 
(rev 2912)
@@ -40,7 +40,7 @@
                try {
                        value = new String(serializedData, 0, 
getSerializedSize(), "UTF-8");
                } catch(UnsupportedEncodingException e) {
-                       //TODO: define this behavior
+                       throw new Error(e);
                }
        }
        

Modified: freeway/src/org/gnu/freeway/cwrappers/ConstCString.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/ConstCString.java     2006-05-27 
00:24:25 UTC (rev 2911)
+++ freeway/src/org/gnu/freeway/cwrappers/ConstCString.java     2006-05-27 
03:37:23 UTC (rev 2912)
@@ -59,7 +59,7 @@
                try {
                        string = value.getBytes("UTF-8");
                } catch(UnsupportedEncodingException e) {
-                       //TODO: what happens here?
+                       throw new Error(e);
                }
                return string.length + 1;
        }

Added: freeway/src/org/gnu/freeway/server/CPluginLoader.h
===================================================================
--- freeway/src/org/gnu/freeway/server/CPluginLoader.h  2006-05-27 00:24:25 UTC 
(rev 2911)
+++ freeway/src/org/gnu/freeway/server/CPluginLoader.h  2006-05-27 03:37:23 UTC 
(rev 2912)
@@ -0,0 +1,37 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_gnu_freeway_server_CPluginLoader */
+
+#ifndef _Included_org_gnu_freeway_server_CPluginLoader
+#define _Included_org_gnu_freeway_server_CPluginLoader
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_gnu_freeway_server_CPluginLoader
+ * Method:    loadService
+ * Signature: (Ljava/lang/String;Lorg/gnu/freeway/server/CoreAPI;)J
+ */
+JNIEXPORT jlong JNICALL Java_org_gnu_freeway_server_CPluginLoader_loadService
+  (JNIEnv *, jobject, jstring, jobject);
+
+/*
+ * Class:     org_gnu_freeway_server_CPluginLoader
+ * Method:    callC
+ * Signature: (JI[Ljava/lang/Object;I)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_org_gnu_freeway_server_CPluginLoader_callC
+  (JNIEnv *, jobject, jlong, jint, jobjectArray, jint);
+
+/*
+ * Class:     org_gnu_freeway_server_CPluginLoader
+ * Method:    unloadService
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_org_gnu_freeway_server_CPluginLoader_unloadService
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

Added: freeway/src/org/gnu/freeway/server/CPluginLoader.java
===================================================================
--- freeway/src/org/gnu/freeway/server/CPluginLoader.java       2006-05-27 
00:24:25 UTC (rev 2911)
+++ freeway/src/org/gnu/freeway/server/CPluginLoader.java       2006-05-27 
03:37:23 UTC (rev 2912)
@@ -0,0 +1,31 @@
+ /*
+      This file is part of Freeway
+
+      Freeway is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      Freeway 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 GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with Freeway; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+ */
+
+package org.gnu.freeway.server;
+
+/**
+ * @file CPluginLoader.java
+ * @brief 
+ * @author mdonoughe
+ */
+public class CPluginLoader {
+       private native long loadService(String serviceName, CoreAPI capi);
+       private native Object callC(long modulePtr, int functionOffset, 
Object[] arguments, int callType);
+       private native void unloadService(long modulePtr);
+}

Added: freeway/src/org/gnu/freeway/server/CoreAPI.java
===================================================================
--- freeway/src/org/gnu/freeway/server/CoreAPI.java     2006-05-27 00:24:25 UTC 
(rev 2911)
+++ freeway/src/org/gnu/freeway/server/CoreAPI.java     2006-05-27 03:37:23 UTC 
(rev 2912)
@@ -0,0 +1,29 @@
+ /*
+      This file is part of Freeway
+
+      Freeway is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      Freeway 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 GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with Freeway; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+ */
+
+package org.gnu.freeway.server;
+
+/**
+ * @file CoreAPI.java
+ * @brief 
+ * @author mdonoughe
+ */
+public class CoreAPI {
+
+}

Modified: freeway/src/org/gnu/freeway/services/StatsService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/StatsService.java      2006-05-27 
00:24:25 UTC (rev 2911)
+++ freeway/src/org/gnu/freeway/services/StatsService.java      2006-05-27 
03:37:23 UTC (rev 2912)
@@ -22,6 +22,7 @@
 import org.gnu.freeway.cwrappers.ConstCInt;
 import org.gnu.freeway.cwrappers.ConstCLong;
 import org.gnu.freeway.cwrappers.CLong;
+import org.gnu.freeway.cwrappers.CInt;
 
 /**
  * @file StatsService.java
@@ -29,7 +30,7 @@
  * @author mdonoughe
  */
 public interface StatsService {
-       public int create(ConstCString name);
+       public CInt create(ConstCString name);
        public void set(ConstCInt handle, ConstCLong value);
        public CLong get(ConstCInt handle); //cannot return a constant type 
because those can't be deserialized
 }