[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r2927 - in freeway: . .settings native src/org/gnu/freeway/
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r2927 - in freeway: . .settings native src/org/gnu/freeway/server |
|
Date: |
Sun, 28 May 2006 12:45:38 -0700 (PDT) |
Author: grothoff
Date: 2006-05-28 12:45:36 -0700 (Sun, 28 May 2006)
New Revision: 2927
Removed:
freeway/build/
Modified:
freeway/.settings/org.eclipse.jdt.ui.prefs
freeway/INSTALL
freeway/native/org_gnu_freeway_server_CPluginLoader.c
freeway/native/org_gnu_freeway_server_CPluginLoader.h
freeway/src/org/gnu/freeway/server/CPluginLoader.java
freeway/src/org/gnu/freeway/server/CPluginLoaderTest.java
Log:
towards proper jni wrapper design
Modified: freeway/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- freeway/.settings/org.eclipse.jdt.ui.prefs 2006-05-28 19:40:40 UTC (rev
2926)
+++ freeway/.settings/org.eclipse.jdt.ui.prefs 2006-05-28 19:45:36 UTC (rev
2927)
@@ -1,3 +1,4 @@
-#Fri May 26 16:02:10 UTC 2006
+#Sun May 28 13:20:45 PDT 2006
eclipse.preferences.version=1
+internal.default.compliance=default
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
encoding\="UTF-8"?><templates><template autoinsert\="true"
context\="gettercomment_context" deleted\="false" description\="Comment for
getter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n
*/</template><template autoinsert\="true" context\="settercomment_context"
deleted\="false" description\="Comment for setter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\n
*/</template><template autoinsert\="true" context\="constructorcomment_context"
deleted\="false" description\="Comment for created constructors"
enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\n * ${tags}\n */</template><template
autoinsert\="false" context\="filecomment_context" deleted\="false"
description\="Comment for created Java files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">
/*\n This file is part of Freeway\n\n Freeway is free software; you
can redistribute it and/or modify\n it under the terms of the GNU General
Public License as published\n by the Free Software Foundation; either
version 2, or (at your\n option) any later version.\n\n Freeway is
distributed in the hope that it will be useful, but\n WITHOUT ANY
WARRANTY; without even the implied warranty of\n MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n General Public License
for more details.\n\n You should have received a copy of the GNU General
Public License\n along with Freeway; see the file COPYING. If not, write
to the\n Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n
Boston, MA 02111-1307, USA.\n */\n</template><template autoinsert\="false"
context\="typecomment_context" deleted\="false" description\="Comment for
created types" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
name\="typecomment">/**\n * @file ${file_name}\n * @brief \n * @author
${user}\n * ${tags}\n */</template><template autoinsert\="true"
context\="fieldcomment_context" deleted\="false" description\="Comment for
fields" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment"
name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true"
context\="methodcomment_context" deleted\="false" description\="Comment for
non-overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\n * ${tags}\n */</template><template
autoinsert\="true" context\="overridecomment_context" deleted\="false"
description\="Comment for overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n
*/</template><template autoinsert\="true" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.newtype"
name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
autoinsert\="true" context\="catchblock_context" deleted\="false"
description\="Code in new catch blocks" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">//
${todo} Auto-generated catch
block\n${exception_var}.printStackTrace();</template><template
autoinsert\="true" context\="methodbody_context" deleted\="false"
description\="Code in created method stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">//
${todo} Auto-generated method stub\n${body_statement}</template><template
autoinsert\="true" context\="constructorbody_context" deleted\="false"
description\="Code in created constructor stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}\n// ${todo} Auto-generated
constructor stub</template><template autoinsert\="true"
context\="getterbody_context" deleted\="false" description\="Code in created
getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody"
name\="getterbody">return ${field};</template><template autoinsert\="true"
context\="setterbody_context" deleted\="false" description\="Code in created
setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template></templates>
Modified: freeway/INSTALL
===================================================================
--- freeway/INSTALL 2006-05-28 19:40:40 UTC (rev 2926)
+++ freeway/INSTALL 2006-05-28 19:45:36 UTC (rev 2927)
@@ -1,16 +1,13 @@
-Installation Instructions
-*************************
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+ These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -70,9 +67,9 @@
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -85,7 +82,7 @@
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
@@ -102,19 +99,19 @@
Installation Names
==================
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+ By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
+options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -125,7 +122,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -140,11 +137,11 @@
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -159,7 +156,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the `--target=TYPE' option to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -170,9 +167,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +178,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -189,18 +186,14 @@
./configure CC=/usr/local2/bin/gcc
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
Modified: freeway/native/org_gnu_freeway_server_CPluginLoader.c
===================================================================
--- freeway/native/org_gnu_freeway_server_CPluginLoader.c 2006-05-28
19:40:40 UTC (rev 2926)
+++ freeway/native/org_gnu_freeway_server_CPluginLoader.c 2006-05-28
19:45:36 UTC (rev 2927)
@@ -1,5 +1,6 @@
/*
This file is part of Freeway.
+ (C) 2006 Free Software Foundation
Freeway is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -21,40 +22,215 @@
* @file native/org_gnu_freeway_server_CPluginLoader.c
* @brief Loads C plugins into Freeway
* @author mdonoughe
- **/
+ * @author Christian Grothoff
+ */
#include <stdio.h>
#include <jni.h>
#include <GNUnet/gnunet_util.h>
-
+#include <GNUnet/gnunet_core.h>
#include "org_gnu_freeway_server_CPluginLoader.h"
+/* FIXME: #include "platform.h", plibc? config.h? */
+#define _(a) a
+
#define DSO_PREFIX "libgnunet" // from GNUnet's core.c
+typedef struct ModuleList {
+ void * modulePtr;
+ void * moduleFptrStruct;
+ char * name; /* for debugging */
+
+ JNIEnv * env;
+ jobject jcapi;
+
+ /**
+ * Used to identify which env / jcapi to use when called back.
+ */
+ PTHREAD_T thread;
+ struct ModuleList * next;
+} ModuleList;
+
+/**
+ * FIXME: add proper locking for concurrent access to modules.
+ */
+static ModuleList * modules;
+
+
+
+
+static int jloadApplicationModule(const char * name) {
+ ModuleList * pos;
+ jstring mname;
+ jmethodID method;
+ jclass capiClazz;
+ JNIEnv * env;
+ jint ret;
+
+ pos = modules;
+ while (pos != NULL) {
+ if (PTHREAD_SELF_TEST(&pos->thread))
+ break;
+ pos = pos->next;
+ }
+ if (pos == NULL)
+ errexit(_("Thread creation in C modules not supported by Freeway.\n"));
+ env = pos->env;
+ GNUNET_ASSERT(env != NULL);
+ mname = (*env)->NewStringUTF(env, name);
+ GNUNET_ASSERT(mname != 0);
+ capiClazz = (*env)->GetObjectClass(env, pos->jcapi);
+ GNUNET_ASSERT(capiClazz != 0);
+ method = (*env)->GetMethodID(env, capiClazz, "loadApplicationModule",
"FIXME-SIGNATURE");
+ GNUNET_ASSERT(method != 0);
+ ret = (*env)->CallIntMethod(env, pos->jcapi, method, mname);
+ return (int) ret;
+}
+
+
+static CoreAPIForApplication jcapi = {
+ 0,
+ NULL, /* FIXME */
+ &jloadApplicationModule,
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+ NULL, /* FIXME... */
+};
+
+
+
JNIEXPORT jlong JNICALL Java_org_gnu_freeway_server_CPluginLoader_cLoadService
(JNIEnv *env, jobject cls, jstring serviceName, jobject capi) {
const char *strServiceName;
- void *modulePtr;
+ void * modulePtr;
+ ModuleList * m;
+ void * fptr;
+ ServiceInitMethod mptr;
+ jclass UnsatisfiedLinkError;
+
strServiceName = (*env)->GetStringUTFChars(env, serviceName, NULL);
- if(!strServiceName)
+ if (! strServiceName)
return 0;
- //fprintf(stderr, "%s", strServiceName);
modulePtr = loadDynamicLibrary(DSO_PREFIX, strServiceName);
- if(!modulePtr) {
- jclass UnsatisfiedLinkError = (*env)->FindClass(env,
"java/lang/UnsatisfiedLinkError");
- if(UnsatisfiedLinkError)
- (*env)->ThrowNew(env, UnsatisfiedLinkError,
strServiceName);
- }
+ if (! modulePtr)
+ goto ULE;
+ mptr = bindDynamicMethod(modulePtr,
+ "initialize_",
+ strServiceName);
+ if (mptr == NULL)
+ goto ULE;
+ m = MALLOC(sizeof(ModuleList));
+ PTHREAD_GET_SELF(&m->thread);
+ m->modulePtr = modulePtr;
+ m->moduleFptrStruct = NULL;
+ m->name = STRDUP(strServiceName);
+ m->env = env;
+ m->jcapi = capi;
+ m->next = modules;
+ modules = m;
+
+ fptr = mptr(&jcapi);
+
+ /* by JNI API definition, these are no longer valid
+ after we return! */
+ PTHREAD_REL_SELF(&m->thread);
+ m->env = NULL;
+ m->jcapi = 0;
+
+ if (fptr == NULL) {
+ FREE(m->name);
+ /* FIXME: concurrent modification of modules... */
+ modules = m->next;
+ FREE(m);
+ goto ULE;
+ }
(*env)->ReleaseStringUTFChars(env, serviceName, strServiceName);
- return modulePtr;
+ return (jlong) (long) m;
+ULE:
+ (*env)->ReleaseStringUTFChars(env, serviceName, strServiceName);
+ UnsatisfiedLinkError = (*env)->FindClass(env,
"java/lang/UnsatisfiedLinkError");
+ if(UnsatisfiedLinkError)
+ (*env)->ThrowNew(env, UnsatisfiedLinkError, strServiceName);
+ return 0;
}
JNIEXPORT jobject JNICALL Java_org_gnu_freeway_server_CPluginLoader_cCallC
- (JNIEnv *env, jobject cls, jlong modulePtr, jint functionOffset,
jobjectArray arguments, jint callType) {
- return 0;
+(JNIEnv *env, jobject cls, jlong modulePtr, jobject capi, jint functionOffset,
jint functionType, jobjectArray arguments, jint callType) {
+ ModuleList * m = (ModuleList*) (long) modulePtr;
+ jobject oret = 0;
+
+ GNUNET_ASSERT(m != NULL);
+ GNUNET_ASSERT(m->env == NULL);
+ m->env = env;
+ m->jcapi = capi; // FIXME: add extra argument!
+ PTHREAD_GET_SELF(&m->thread);
+
+#if 0
+#include "switch-table.c"
+#endif
+#if 0
+ /* here is the idea of what the generated code should look like: */
+ switch (functionType) { // FIXME: add extra argument!
+ case 0: {
+ int arg1 = (*env)->...(arguments,0);
+ char * arg2 = (*env)->...(arguments,1);
+ float arg3 = (*env)->...(arguments,2);
+ /* FunctionType0 is defined in switch-table.h as
+ "typedef int (FunctionType0*)(int a1, char* a2, float a3);" */
+ int ret = ((FunctionType0) ((void**)m->modulePtr)[functionOffset])(arg1,
arg2, arg3);
+ oret = (*env)->...(ret);
+ }
+ case 1: {
+ /* ... */
+ }
+ default:
+ // error: unsupported function type
+ }
+#endif
+
+ /* again, destroy env environment */
+ PTHREAD_REL_SELF(&m->thread);
+ m->env = NULL;
+ m->jcapi = 0;
+
+ return oret;
}
JNIEXPORT void JNICALL Java_org_gnu_freeway_server_CPluginLoader_cUnloadService
(JNIEnv *env, jobject cls, jlong modulePtr) {
- unloadDynamicLibrary(modulePtr);
+
+
+ // unloadDynamicLibrary(modulePtr);
+
+
}
Modified: freeway/native/org_gnu_freeway_server_CPluginLoader.h
===================================================================
--- freeway/native/org_gnu_freeway_server_CPluginLoader.h 2006-05-28
19:40:40 UTC (rev 2926)
+++ freeway/native/org_gnu_freeway_server_CPluginLoader.h 2006-05-28
19:45:36 UTC (rev 2927)
@@ -13,15 +13,15 @@
* Signature: (Ljava/lang/String;Lorg/gnu/freeway/server/CoreAPI;)J
*/
JNIEXPORT jlong JNICALL Java_org_gnu_freeway_server_CPluginLoader_cLoadService
- (JNIEnv *, jobject, jstring, jobject);
+ (JNIEnv *, jclass, jstring, jobject);
/*
* Class: org_gnu_freeway_server_CPluginLoader
* Method: cCallC
- * Signature: (JI[Ljava/lang/Object;I)Ljava/lang/Object;
+ * Signature:
(JLorg/gnu/freeway/server/CoreAPI;II[Ljava/lang/Object;I)Ljava/lang/Object;
*/
JNIEXPORT jobject JNICALL Java_org_gnu_freeway_server_CPluginLoader_cCallC
- (JNIEnv *, jobject, jlong, jint, jobjectArray, jint);
+ (JNIEnv *, jclass, jlong, jobject, jint, jint, jobjectArray, jint);
/*
* Class: org_gnu_freeway_server_CPluginLoader
@@ -29,7 +29,7 @@
* Signature: (J)V
*/
JNIEXPORT void JNICALL Java_org_gnu_freeway_server_CPluginLoader_cUnloadService
- (JNIEnv *, jobject, jlong);
+ (JNIEnv *, jclass, jlong);
#ifdef __cplusplus
}
Modified: freeway/src/org/gnu/freeway/server/CPluginLoader.java
===================================================================
--- freeway/src/org/gnu/freeway/server/CPluginLoader.java 2006-05-28
19:40:40 UTC (rev 2926)
+++ freeway/src/org/gnu/freeway/server/CPluginLoader.java 2006-05-28
19:45:36 UTC (rev 2927)
@@ -34,17 +34,29 @@
}
private static native long cLoadService(String serviceName, CoreAPI
capi);
- private static native Object cCallC(long modulePtr, int functionOffset,
Object[] arguments, int callType);
+ private static native Object cCallC(long modulePtr,
+ CoreAPI capi,
+ int functionOffset,
+ int functionType,
+ Object[] arguments,
+ int callType);
private static native void cUnloadService(long modulePtr);
- public static CLibraryHandle loadService(String serviceName, CoreAPI
capi) {
- if(serviceName == null || capi == null)
- throw new NullPointerException();
- return new CLibraryHandle(cLoadService(serviceName, capi));
+ public static CLibraryHandle loadService(String serviceName) {
+ assert (serviceName != null);
+ return new CLibraryHandle(cLoadService(serviceName, CoreAPI._));
}
- public static Object callC(CLibraryHandle modulePtr, int
functionOffset, Object[] arguments, int callType) {
+ public static Object callC(CLibraryHandle modulePtr,
+ int functionOffset,
+ int functionType,
+ Object[] arguments,
+ int callType) {
if(modulePtr._ == 0)
throw new NullPointerException();
- return cCallC(modulePtr._, functionOffset, arguments, callType);
+ return cCallC(modulePtr._, CoreAPI._,
+ functionOffset,
+ functionType,
+ arguments,
+ callType);
}
public static void unloadService(CLibraryHandle modulePtr) {
if(modulePtr._ == 0)
Modified: freeway/src/org/gnu/freeway/server/CPluginLoaderTest.java
===================================================================
--- freeway/src/org/gnu/freeway/server/CPluginLoaderTest.java 2006-05-28
19:40:40 UTC (rev 2926)
+++ freeway/src/org/gnu/freeway/server/CPluginLoaderTest.java 2006-05-28
19:45:36 UTC (rev 2927)
@@ -7,7 +7,7 @@
public class CPluginLoaderTest extends TestCase {
public void testService() {
- CLibraryHandle modulePtr =
CPluginLoader.loadService("module_chat", CoreAPI._);
+ CLibraryHandle modulePtr =
CPluginLoader.loadService("module_chat");
assertFalse(modulePtr._ == 0);
CPluginLoader.unloadService(modulePtr);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r2927 - in freeway: . .settings native src/org/gnu/freeway/server,
grothoff <=