[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7257 - in freeway: . native src src/org/gnu/freeway/server
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7257 - in freeway: . native src src/org/gnu/freeway/server src/org/gnu/freeway/services/c |
|
Date: |
Sun, 15 Jun 2008 11:31:20 -0600 (MDT) |
Author: mdonoughe
Date: 2008-06-15 11:31:20 -0600 (Sun, 15 Jun 2008)
New Revision: 7257
Removed:
freeway/native/switch-table.c
freeway/native/switch-table.h
freeway/src/org/gnu/freeway/services/c/DatastoreService.java
freeway/src/org/gnu/freeway/services/c/IdentityService.java
freeway/src/org/gnu/freeway/services/c/SQstoreService.java
freeway/src/org/gnu/freeway/services/c/StatsService.java
freeway/src/org/gnu/freeway/services/c/TrafficService.java
Modified:
freeway/build.xml
freeway/protocols.xml
freeway/src/Makefile.am
freeway/src/org/gnu/freeway/server/CPluginLoader.java
Log:
put all the ant tasks from the build process into the "all" task so ant's
dependency system doesn't run init and build so many times
remove files generated during the build
make the warning about not being able to load the native part of the
CPluginLoader look less severe because it's not fatal
Modified: freeway/build.xml
===================================================================
--- freeway/build.xml 2008-06-15 17:31:13 UTC (rev 7256)
+++ freeway/build.xml 2008-06-15 17:31:20 UTC (rev 7257)
@@ -3,7 +3,7 @@
<!ENTITY protocols SYSTEM "protocols.xml">
<!ENTITY transports SYSTEM "transports.xml">
]>
-<project name="Freeway" default="build" basedir=".">
+<project name="Freeway" default="all" basedir=".">
<!-- property name="build.compiler" value="javac" / -->
<property name="build.sysclasspath" value="ignore" />
<property file="build.properties" />
@@ -89,6 +89,8 @@
</java>
</target>
+ <target name="all" depends="build, make-headers, switch-table" />
+
<target name="switch-table" depends="build">
<java
classname="org.gnu.freeway.cwrappers.util.SwitchTableGenerator" fork="yes">
<classpath>
Deleted: freeway/native/switch-table.c
===================================================================
--- freeway/native/switch-table.c 2008-06-15 17:31:13 UTC (rev 7256)
+++ freeway/native/switch-table.c 2008-06-15 17:31:20 UTC (rev 7257)
@@ -1,85 +0,0 @@
-// This file was autogenerated by SwitchTableGenerator
-jobject * jargs;
-int jargLength = (*env)->GetArrayLength(env, arguments);
-if(jargLength > 0) {
- jargs = malloc(sizeof(jobject) * jargLength);
- int jargsI;
- for(jargsI = 0; jargsI < jargLength; jargsI++) {
- jargs[jargsI] = (*env)->GetObjectArrayElement(env, arguments,
jargsI);
- }
-}
-switch (functionType) {
- case 0: {
- ((FunctionType0)
((void**)m->moduleFptrStruct)[functionOffset])();
- break;
- }
- case 1635880: {
- int carg0 = convCIntToInt(jargs[0], env);
- short carg1 = convCShortToShort(jargs[1], env);
- short carg2 = convCShortToShort(jargs[2], env);
- PointerObject * carg3 = convObjectToPtr(jargs[3], env);
- PointerObject * carg4 = convObjectToPtr(jargs[4], env);
- PointerObject * carg5 = convObjectToPtr(jargs[5], env);
- PointerObject * carg6 = convObjectToPtr(jargs[6], env);
- int cret = ((FunctionType1635880)
((void**)m->moduleFptrStruct)[functionOffset])(carg0, carg1, carg2,
carg3->pointer, carg4->pointer, carg5->pointer, carg6->pointer);
- updateObjectFromPtr(jargs[6], carg6, env);
- updateObjectFromPtr(jargs[5], carg5, env);
- updateObjectFromPtr(jargs[4], carg4, env);
- updateObjectFromPtr(jargs[3], carg3, env);
- oret = convIntToCInt(cret, env);
- break;
- }
- case 4: {
- long long cret = ((FunctionType4)
((void**)m->moduleFptrStruct)[functionOffset])();
- oret = convLongToCLong(cret, env);
- break;
- }
- case 113: {
- PointerObject * carg0 = convObjectToPtr(jargs[0], env);
- PointerObject * carg1 = convObjectToPtr(jargs[1], env);
- int cret = ((FunctionType113)
((void**)m->moduleFptrStruct)[functionOffset])(carg0->pointer, carg1->pointer);
- updateObjectFromPtr(jargs[1], carg1, env);
- updateObjectFromPtr(jargs[0], carg0, env);
- oret = convIntToCInt(cret, env);
- break;
- }
- case 77: {
- int carg0 = convCIntToInt(jargs[0], env);
- long long carg1 = convCLongToLong(jargs[1], env);
- ((FunctionType77)
((void**)m->moduleFptrStruct)[functionOffset])(carg0, carg1);
- break;
- }
- case 11: {
- int carg0 = convCIntToInt(jargs[0], env);
- long long cret = ((FunctionType11)
((void**)m->moduleFptrStruct)[functionOffset])(carg0);
- oret = convLongToCLong(cret, env);
- break;
- }
- case 56: {
- int carg0 = convCIntToInt(jargs[0], env);
- int carg1 = convCIntToInt(jargs[1], env);
- ((FunctionType56)
((void**)m->moduleFptrStruct)[functionOffset])(carg0, carg1);
- break;
- }
- case 792: {
- PointerObject * carg0 = convObjectToPtr(jargs[0], env);
- PointerObject * carg1 = convObjectToPtr(jargs[1], env);
- int carg2 = convCIntToInt(jargs[2], env);
- int cret = ((FunctionType792)
((void**)m->moduleFptrStruct)[functionOffset])(carg0->pointer, carg1->pointer,
carg2);
- updateObjectFromPtr(jargs[1], carg1, env);
- updateObjectFromPtr(jargs[0], carg0, env);
- oret = convIntToCInt(cret, env);
- break;
- }
- case 15: {
- PointerObject * carg0 = convObjectToPtr(jargs[0], env);
- int cret = ((FunctionType15)
((void**)m->moduleFptrStruct)[functionOffset])(carg0->pointer);
- updateObjectFromPtr(jargs[0], carg0, env);
- oret = convIntToCInt(cret, env);
- break;
- }
- default:
- GNUNET_ASSERT(0);
-}
-if(jargs != NULL)
- free(jargs);
Deleted: freeway/native/switch-table.h
===================================================================
--- freeway/native/switch-table.h 2008-06-15 17:31:13 UTC (rev 7256)
+++ freeway/native/switch-table.h 2008-06-15 17:31:20 UTC (rev 7257)
@@ -1,11 +0,0 @@
-// This file was autogenerated by SwitchTableGenerator
-#include "jni.h"
-typedef void (*FunctionType0)();
-typedef int (*FunctionType1635880)(int arg0, short arg1, short arg2, void *
arg3, void * arg4, void * arg5, void * arg6);
-typedef long long (*FunctionType4)();
-typedef int (*FunctionType113)(void * arg0, void * arg1);
-typedef void (*FunctionType77)(int arg0, long long arg1);
-typedef long long (*FunctionType11)(int arg0);
-typedef void (*FunctionType56)(int arg0, int arg1);
-typedef int (*FunctionType792)(void * arg0, void * arg1, int arg2);
-typedef int (*FunctionType15)(void * arg0);
Modified: freeway/protocols.xml
===================================================================
--- freeway/protocols.xml 2008-06-15 17:31:13 UTC (rev 7256)
+++ freeway/protocols.xml 2008-06-15 17:31:20 UTC (rev 7257)
@@ -8,12 +8,12 @@
</manifest>
</jar>
-<jar destfile="${project.build}/protocol-afs-mysql.jar">
+<!-- <jar destfile="${project.build}/protocol-afs-mysql.jar">
<fileset dir="${project.build}/classes"
includes="org/gnu/freeway/protocol/afs/MySQLHandle*" />
<manifest>
<attribute name="Main-Class"
value="org.gnu.freeway.protocol.afs.MySQLHandle" />
</manifest>
-</jar>
+</jar> -->
<jar destfile="${project.build}/protocol-chat.jar">
<fileset dir="${project.build}/classes"
includes="org/gnu/freeway/protocol/chat/**" />
Modified: freeway/src/Makefile.am
===================================================================
--- freeway/src/Makefile.am 2008-06-15 17:31:13 UTC (rev 7256)
+++ freeway/src/Makefile.am 2008-06-15 17:31:20 UTC (rev 7257)
@@ -1,6 +1,6 @@
# The headers are only created by make if they don't exist, so update them here
all:
- cd .. && ant build make-headers switch-table
+ cd .. && ant
clean:
cd .. && ant clean
Modified: freeway/src/org/gnu/freeway/server/CPluginLoader.java
===================================================================
--- freeway/src/org/gnu/freeway/server/CPluginLoader.java 2008-06-15
17:31:13 UTC (rev 7256)
+++ freeway/src/org/gnu/freeway/server/CPluginLoader.java 2008-06-15
17:31:20 UTC (rev 7257)
@@ -79,8 +79,7 @@
} catch(SecurityException e) {
System.err.println("Security manager forbids loading
native code.");
} catch(UnsatisfiedLinkError e) {
- e.printStackTrace();
-
System.err.println("org_gnu_freeway_server_CPluginLoader could not be loaded.");
+ System.err.println(e.getMessage());
}
}
Deleted: freeway/src/org/gnu/freeway/services/c/DatastoreService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/c/DatastoreService.java
2008-06-15 17:31:13 UTC (rev 7256)
+++ freeway/src/org/gnu/freeway/services/c/DatastoreService.java
2008-06-15 17:31:20 UTC (rev 7257)
@@ -1,41 +0,0 @@
-// This class was autogenerated by SwitchTableGenerator
-package org.gnu.freeway.services.c;
-
-import org.gnu.freeway.cwrappers.ConstCHashCode512;
-import org.gnu.freeway.server.CPluginLoader;
-import org.gnu.freeway.util.AbstractNativeService;
-import org.gnu.freeway.cwrappers.CInt;
-import org.gnu.freeway.util.NativeService;
-import org.gnu.freeway.cwrappers.ConstCDatastoreValue;
-import org.gnu.freeway.cwrappers.CLong;
-
-public class DatastoreService extends AbstractNativeService implements
NativeService, org.gnu.freeway.services.DatastoreService {
-
- public CLong getSize() {
- return (CLong) loader.callC(handle, 0, 4, new Object[] {});
- }
-
- public CInt put(ConstCHashCode512 arg0, ConstCDatastoreValue arg1) {
- return (CInt) loader.callC(handle, 1, 113, new Object[] {arg0,
arg1});
- }
-
- public CInt putUpdate(ConstCHashCode512 arg0, ConstCDatastoreValue
arg1) {
- return (CInt) loader.callC(handle, 2, 113, new Object[] {arg0,
arg1});
- }
-
- public CInt fast_get(ConstCHashCode512 arg0) {
- return (CInt) loader.callC(handle, 3, 15, new Object[] {arg0});
- }
-
- public CInt del(ConstCHashCode512 arg0, ConstCDatastoreValue arg1) {
- return (CInt) loader.callC(handle, 4, 113, new Object[] {arg0,
arg1});
- }
-
- public DatastoreService() {
- this(CPluginLoader._);
- }
-
- public DatastoreService(CPluginLoader loader) {
- super(loader);
- }
-}
Deleted: freeway/src/org/gnu/freeway/services/c/IdentityService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/c/IdentityService.java 2008-06-15
17:31:13 UTC (rev 7256)
+++ freeway/src/org/gnu/freeway/services/c/IdentityService.java 2008-06-15
17:31:20 UTC (rev 7257)
@@ -1,17 +0,0 @@
-// This class was autogenerated by SwitchTableGenerator
-package org.gnu.freeway.services.c;
-
-import org.gnu.freeway.server.CPluginLoader;
-import org.gnu.freeway.util.AbstractNativeService;
-import org.gnu.freeway.util.NativeService;
-
-public class IdentityService extends AbstractNativeService implements
NativeService, org.gnu.freeway.services.IdentityService {
-
- public IdentityService() {
- this(CPluginLoader._);
- }
-
- public IdentityService(CPluginLoader loader) {
- super(loader);
- }
-}
Deleted: freeway/src/org/gnu/freeway/services/c/SQstoreService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/c/SQstoreService.java 2008-06-15
17:31:13 UTC (rev 7256)
+++ freeway/src/org/gnu/freeway/services/c/SQstoreService.java 2008-06-15
17:31:20 UTC (rev 7257)
@@ -1,41 +0,0 @@
-// This class was autogenerated by SwitchTableGenerator
-package org.gnu.freeway.services.c;
-
-import org.gnu.freeway.cwrappers.CDatastoreValue;
-import org.gnu.freeway.cwrappers.CHashCode512;
-import org.gnu.freeway.server.CPluginLoader;
-import org.gnu.freeway.util.AbstractNativeService;
-import org.gnu.freeway.cwrappers.CInt;
-import org.gnu.freeway.util.NativeService;
-import org.gnu.freeway.cwrappers.CLong;
-
-public class SQstoreService extends AbstractNativeService implements
NativeService, org.gnu.freeway.services.SQstoreService {
-
- public CLong getSize() {
- return (CLong) loader.callC(handle, 0, 4, new Object[] {});
- }
-
- public CInt put(CHashCode512 arg0, CDatastoreValue arg1) {
- return (CInt) loader.callC(handle, 1, 113, new Object[] {arg0,
arg1});
- }
-
- public CInt update(CHashCode512 arg0, CDatastoreValue arg1, CInt arg2) {
- return (CInt) loader.callC(handle, 2, 792, new Object[] {arg0,
arg1, arg2});
- }
-
- public CInt del(CHashCode512 arg0, CDatastoreValue arg1) {
- return (CInt) loader.callC(handle, 3, 113, new Object[] {arg0,
arg1});
- }
-
- public void drop() {
- loader.callC(handle, 4, 0, new Object[] {});
- }
-
- public SQstoreService() {
- this(CPluginLoader._);
- }
-
- public SQstoreService(CPluginLoader loader) {
- super(loader);
- }
-}
Deleted: freeway/src/org/gnu/freeway/services/c/StatsService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/c/StatsService.java 2008-06-15
17:31:13 UTC (rev 7256)
+++ freeway/src/org/gnu/freeway/services/c/StatsService.java 2008-06-15
17:31:20 UTC (rev 7257)
@@ -1,38 +0,0 @@
-// This class was autogenerated by SwitchTableGenerator
-package org.gnu.freeway.services.c;
-
-import org.gnu.freeway.cwrappers.ConstCString;
-import org.gnu.freeway.server.CPluginLoader;
-import org.gnu.freeway.util.AbstractNativeService;
-import org.gnu.freeway.cwrappers.CInt;
-import org.gnu.freeway.util.NativeService;
-import org.gnu.freeway.cwrappers.ConstCLong;
-import org.gnu.freeway.cwrappers.ConstCInt;
-import org.gnu.freeway.cwrappers.CLong;
-
-public class StatsService extends AbstractNativeService implements
NativeService, org.gnu.freeway.services.StatsService {
-
- public CInt create(ConstCString arg0) {
- return (CInt) loader.callC(handle, 0, 15, new Object[] {arg0});
- }
-
- public void set(ConstCInt arg0, ConstCLong arg1) {
- loader.callC(handle, 1, 77, new Object[] {arg0, arg1});
- }
-
- public CLong get(ConstCInt arg0) {
- return (CLong) loader.callC(handle, 2, 11, new Object[] {arg0});
- }
-
- public void change(ConstCInt arg0, ConstCInt arg1) {
- loader.callC(handle, 3, 56, new Object[] {arg0, arg1});
- }
-
- public StatsService() {
- this(CPluginLoader._);
- }
-
- public StatsService(CPluginLoader loader) {
- super(loader);
- }
-}
Deleted: freeway/src/org/gnu/freeway/services/c/TrafficService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/c/TrafficService.java 2008-06-15
17:31:13 UTC (rev 7256)
+++ freeway/src/org/gnu/freeway/services/c/TrafficService.java 2008-06-15
17:31:20 UTC (rev 7257)
@@ -1,25 +0,0 @@
-// This class was autogenerated by SwitchTableGenerator
-package org.gnu.freeway.services.c;
-
-import org.gnu.freeway.cwrappers.CUnsignedIntPtr;
-import org.gnu.freeway.cwrappers.CShort;
-import org.gnu.freeway.cwrappers.CUnsignedInt;
-import org.gnu.freeway.server.CPluginLoader;
-import org.gnu.freeway.util.AbstractNativeService;
-import org.gnu.freeway.cwrappers.CInt;
-import org.gnu.freeway.util.NativeService;
-
-public class TrafficService extends AbstractNativeService implements
NativeService, org.gnu.freeway.services.TrafficService {
-
- public CInt get(CUnsignedInt arg0, CShort arg1, CShort arg2,
CUnsignedIntPtr arg3, CUnsignedIntPtr arg4, CUnsignedIntPtr arg5,
CUnsignedIntPtr arg6) {
- return (CInt) loader.callC(handle, 0, 1635880, new Object[]
{arg0, arg1, arg2, arg3, arg4, arg5, arg6});
- }
-
- public TrafficService() {
- this(CPluginLoader._);
- }
-
- public TrafficService(CPluginLoader loader) {
- super(loader);
- }
-}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7257 - in freeway: . native src src/org/gnu/freeway/server src/org/gnu/freeway/services/c,
gnunet <=