[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r2988 - in freeway: . build lib native src/org/gnu/freeway/
|
From: |
mdonoughe |
|
Subject: |
[GNUnet-SVN] r2988 - in freeway: . build lib native src/org/gnu/freeway/cwrappers src/org/gnu/freeway/cwrappers/util src/org/gnu/freeway/server src/org/gnu/freeway/services/impl |
|
Date: |
Thu, 8 Jun 2006 19:41:52 -0700 (PDT) |
Author: mdonoughe
Date: 2006-06-08 19:41:40 -0700 (Thu, 08 Jun 2006)
New Revision: 2988
Added:
freeway/build/
freeway/lib/junit.jar
Modified:
freeway/build.xml
freeway/native/org_gnu_freeway_server_CPluginLoader.c
freeway/src/org/gnu/freeway/cwrappers/CInt.java
freeway/src/org/gnu/freeway/cwrappers/CIntPtr.java
freeway/src/org/gnu/freeway/cwrappers/CLong.java
freeway/src/org/gnu/freeway/cwrappers/CLongPtr.java
freeway/src/org/gnu/freeway/cwrappers/CString.java
freeway/src/org/gnu/freeway/cwrappers/CUnsignedInt.java
freeway/src/org/gnu/freeway/cwrappers/CUnsignedIntPtr.java
freeway/src/org/gnu/freeway/cwrappers/ConstCInt.java
freeway/src/org/gnu/freeway/cwrappers/ConstCIntPtr.java
freeway/src/org/gnu/freeway/cwrappers/ConstCLong.java
freeway/src/org/gnu/freeway/cwrappers/ConstCLongPtr.java
freeway/src/org/gnu/freeway/cwrappers/ConstCString.java
freeway/src/org/gnu/freeway/cwrappers/ConstCUnsignedInt.java
freeway/src/org/gnu/freeway/cwrappers/ConstCUnsignedIntPtr.java
freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
freeway/src/org/gnu/freeway/server/CPluginLoader.java
freeway/src/org/gnu/freeway/services/impl/StatsService.java
Log:
added JUnit library to lib
made code compile with jikes again(removed some 1.5 specific stuff)
finished fixing the function reordering problem(forgot to change callC)
Property changes on: freeway/build
___________________________________________________________________
Name: svn:ignore
+ *
Modified: freeway/build.xml
===================================================================
--- freeway/build.xml 2006-06-08 23:13:48 UTC (rev 2987)
+++ freeway/build.xml 2006-06-09 02:41:40 UTC (rev 2988)
@@ -139,7 +139,6 @@
</manifest>
</jar>
- <exec dir="." executable="./build.sh" />
</target>
<target name="fix-build" depends="build">
Added: freeway/lib/junit.jar
===================================================================
(Binary files differ)
Property changes on: freeway/lib/junit.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: freeway/native/org_gnu_freeway_server_CPluginLoader.c
===================================================================
--- freeway/native/org_gnu_freeway_server_CPluginLoader.c 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/native/org_gnu_freeway_server_CPluginLoader.c 2006-06-09
02:41:40 UTC (rev 2988)
@@ -138,8 +138,9 @@
if(method == NULL)
return NULL;
jByteArray = (*env)->CallObjectMethod(env, input, method);
+ void * ret = (*env)->GetByteArrayElements(env, jByteArray, NULL);
fprintf(stderr, "leaving convObjectToPtr\n");
- return (void *) (*env)->GetByteArrayElements(env, jByteArray, NULL);
+ return ret;
}
//FIXME: there is a leak here. array cannot be released
//FIXME: this will not work because we don't know the length of the array
Modified: freeway/src/org/gnu/freeway/cwrappers/CInt.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/CInt.java 2006-06-08 23:13:48 UTC
(rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/CInt.java 2006-06-09 02:41:40 UTC
(rev 2988)
@@ -28,7 +28,7 @@
*/
public class CInt extends ConstCInt implements CWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.INT_KIND;
public CInt(int value) {
Modified: freeway/src/org/gnu/freeway/cwrappers/CIntPtr.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/CIntPtr.java 2006-06-08 23:13:48 UTC
(rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/CIntPtr.java 2006-06-09 02:41:40 UTC
(rev 2988)
@@ -28,7 +28,7 @@
*/
public class CIntPtr extends ConstCInt implements CWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.PTR_KIND;
public CIntPtr(int value) {
Modified: freeway/src/org/gnu/freeway/cwrappers/CLong.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/CLong.java 2006-06-08 23:13:48 UTC
(rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/CLong.java 2006-06-09 02:41:40 UTC
(rev 2988)
@@ -28,7 +28,7 @@
*/
public class CLong extends ConstCLong implements CWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.LINT_KIND;
public CLong(long value) {
Modified: freeway/src/org/gnu/freeway/cwrappers/CLongPtr.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/CLongPtr.java 2006-06-08 23:13:48 UTC
(rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/CLongPtr.java 2006-06-09 02:41:40 UTC
(rev 2988)
@@ -28,7 +28,7 @@
*/
public class CLongPtr extends ConstCLong implements CWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.PTR_KIND;
public CLongPtr(long value) {
Modified: freeway/src/org/gnu/freeway/cwrappers/CString.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/CString.java 2006-06-08 23:13:48 UTC
(rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/CString.java 2006-06-09 02:41:40 UTC
(rev 2988)
@@ -29,7 +29,7 @@
*/
public class CString extends ConstCString implements CWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.PTR_KIND;
public CString(String value) {
Modified: freeway/src/org/gnu/freeway/cwrappers/CUnsignedInt.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/CUnsignedInt.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/CUnsignedInt.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -28,7 +28,7 @@
*/
public class CUnsignedInt extends ConstCUnsignedInt implements CWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.INT_KIND;
public CUnsignedInt(long value) {
Modified: freeway/src/org/gnu/freeway/cwrappers/CUnsignedIntPtr.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/CUnsignedIntPtr.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/CUnsignedIntPtr.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -28,7 +28,7 @@
*/
public class CUnsignedIntPtr extends ConstCUnsignedInt implements CWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.PTR_KIND;
public CUnsignedIntPtr(long value) {
Modified: freeway/src/org/gnu/freeway/cwrappers/ConstCInt.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/ConstCInt.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/ConstCInt.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -29,7 +29,7 @@
*/
public class ConstCInt implements ConstCWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.INT_KIND;
protected int value;
Modified: freeway/src/org/gnu/freeway/cwrappers/ConstCIntPtr.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/ConstCIntPtr.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/ConstCIntPtr.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -29,7 +29,7 @@
*/
public class ConstCIntPtr implements ConstCWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.PTR_KIND;
protected int value;
Modified: freeway/src/org/gnu/freeway/cwrappers/ConstCLong.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/ConstCLong.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/ConstCLong.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -29,7 +29,7 @@
*/
public class ConstCLong implements ConstCWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.LINT_KIND;
protected long value;
Modified: freeway/src/org/gnu/freeway/cwrappers/ConstCLongPtr.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/ConstCLongPtr.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/ConstCLongPtr.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -29,7 +29,7 @@
*/
public class ConstCLongPtr implements ConstCWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.PTR_KIND;
protected long value;
Modified: freeway/src/org/gnu/freeway/cwrappers/ConstCString.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/ConstCString.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/ConstCString.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -31,7 +31,7 @@
*/
public class ConstCString implements ConstCWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.PTR_KIND;
protected String value;
Modified: freeway/src/org/gnu/freeway/cwrappers/ConstCUnsignedInt.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/ConstCUnsignedInt.java
2006-06-08 23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/ConstCUnsignedInt.java
2006-06-09 02:41:40 UTC (rev 2988)
@@ -29,7 +29,7 @@
*/
public class ConstCUnsignedInt implements ConstCWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.INT_KIND;
protected long value;
Modified: freeway/src/org/gnu/freeway/cwrappers/ConstCUnsignedIntPtr.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/ConstCUnsignedIntPtr.java
2006-06-08 23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/ConstCUnsignedIntPtr.java
2006-06-09 02:41:40 UTC (rev 2988)
@@ -29,7 +29,7 @@
*/
public class ConstCUnsignedIntPtr implements ConstCWrapper {
- @SuppressWarnings("unused")
+ //@SuppressWarnings("unused")
private static final int KIND = CWrapper.PTR_KIND;
protected long value;
Modified: freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
2006-06-08 23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
2006-06-09 02:41:40 UTC (rev 2988)
@@ -572,7 +572,7 @@
arrayBuffer.append(cleanClassName(methods[i].getReturnType().getName(),
imports) + ".class");
}
}
- buffer.append("loader.callC(handle, \"" +
methods[i].getName() + "\", this, new Object[] {" + arrayBuffer + "});\n");
+ buffer.append("loader.callC(handle, __FUNCTIONINDEX__,
" + getFunctionType(methods[i]) + ", new Object[] {" + arrayBuffer + "});\n");
buffer.append(" }");
functionTypeSet.add(new
Integer(getFunctionType(methods[i])));
methodList.put(methods[i].getName(), buffer.toString());
@@ -589,8 +589,9 @@
writer.write(" private CPluginLoader loader;\n");
writer.write(" private CPluginLoader.Handle handle;\n");
writer.write("\n");
+ int ic = 0;
for(Iterator i = order.iterator(); i.hasNext(); )
- writer.write((String) methodList.get(i.next()) +
"\n\n");
+ writer.write(((String)
methodList.get(i.next())).replace("__FUNCTIONINDEX__", Integer.toString(ic++))
+ "\n\n");
writer.write(" public " + stripPackage(c.getName()) +
"(CPluginLoader loader) {\n");
writer.write(" this.loader = loader;\n");
writer.write(" handle = loader.loadService(\"" +
classToLibraryName(c.getName()) + "\");\n");
Modified: freeway/src/org/gnu/freeway/server/CPluginLoader.java
===================================================================
--- freeway/src/org/gnu/freeway/server/CPluginLoader.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/server/CPluginLoader.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -100,26 +100,16 @@
* and method index and then use cCallC to do the actual call.
*
* @param modulePtr the handle obtained when loading the module
- * @param method the name of the method to call
- * @param serviceInstance the "services.impl" object that
- * is providing the service
+ * @param offset the position of the method to call
+ * @param functionType the type of function to call
* @param arguments list of arguments to pass
* @return return value (null for void)
*/
public Object callC(Handle modulePtr,
- String methodName,
- Object serviceInstance,
+ int offset,
+ int functionType,
Object[] arguments) {
- Class c = serviceInstance.getClass();
- Method[] methods = c.getMethods();
- int offset = -1;
- for (int i=0;i<methods.length;i++)
- if (methods[i].getName().equals(methodName))
- offset = i;
- if (offset == -1)
- throw new IllegalArgumentException(c + " must have
method " + methodName);
- int type =
SwitchTableGenerator.getFunctionType(methods[offset]);
- return cCallC(modulePtr._, CoreAPI._, offset, type, arguments);
+ return cCallC(modulePtr._, CoreAPI._, offset, functionType,
arguments);
}
/**
Modified: freeway/src/org/gnu/freeway/services/impl/StatsService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/impl/StatsService.java 2006-06-08
23:13:48 UTC (rev 2987)
+++ freeway/src/org/gnu/freeway/services/impl/StatsService.java 2006-06-09
02:41:40 UTC (rev 2988)
@@ -13,19 +13,19 @@
private CPluginLoader.Handle handle;
public CInt create(ConstCString arg0) {
- return (CInt) loader.callC(handle, "create", this, new Object[]
{arg0});
+ return (CInt) loader.callC(handle, 0, 13, new Object[] {arg0});
}
public void set(ConstCInt arg0, ConstCLong arg1) {
- loader.callC(handle, "set", this, new Object[] {arg0, arg1});
+ loader.callC(handle, 1, 60, new Object[] {arg0, arg1});
}
public CLong get(ConstCInt arg0) {
- return (CLong) loader.callC(handle, "get", this, new Object[]
{arg0});
+ return (CLong) loader.callC(handle, 2, 10, new Object[] {arg0});
}
public void change(ConstCInt arg0, ConstCInt arg1) {
- loader.callC(handle, "change", this, new Object[] {arg0, arg1});
+ loader.callC(handle, 3, 42, new Object[] {arg0, arg1});
}
public StatsService(CPluginLoader loader) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r2988 - in freeway: . build lib native src/org/gnu/freeway/cwrappers src/org/gnu/freeway/cwrappers/util src/org/gnu/freeway/server src/org/gnu/freeway/services/impl,
mdonoughe <=