[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r4791 - in freeway: . native src/org/gnu/freeway/services s
From: |
gnunet |
Subject: |
[GNUnet-SVN] r4791 - in freeway: . native src/org/gnu/freeway/services src/org/gnu/freeway/services/c |
Date: |
Wed, 9 May 2007 08:40:16 -0600 (MDT) |
Author: mdonoughe
Date: 2007-05-09 08:40:16 -0600 (Wed, 09 May 2007)
New Revision: 4791
Added:
freeway/src/org/gnu/freeway/services/SQstoreService.java
freeway/src/org/gnu/freeway/services/c/SQstoreService.java
Modified:
freeway/
freeway/native/builtin.h
freeway/native/core.c
freeway/native/datastoreservice.c
freeway/native/identityservice.c
freeway/native/sqstoreservice.c
freeway/native/statsservice.c
freeway/native/trafficservice.c
freeway/native/util.c
Log:
Removed a possible infinite loop in hasModule
requestService now returns NULL when the service is not found instead of
crashing
Property changes on: freeway
___________________________________________________________________
Name: svk:merge
- 9da852c3-611b-0410-9456-b3f9f3a8f88d:/local/freeway:82
ca0d4bff-9018-0410-8ce9-c5d843b21c37:/local/freeway:73
+ 9da852c3-611b-0410-9456-b3f9f3a8f88d:/local/freeway:121
ca0d4bff-9018-0410-8ce9-c5d843b21c37:/local/freeway:73
Property changes on: freeway/native/builtin.h
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
Modified: freeway/native/core.c
===================================================================
--- freeway/native/core.c 2007-05-08 21:14:19 UTC (rev 4790)
+++ freeway/native/core.c 2007-05-09 14:40:16 UTC (rev 4791)
@@ -113,6 +113,8 @@
return 0;
ret = (*env)->GetLongField(env, retHandle, handle_);
fprintf(stderr, "leaving requestService %s: %x\n", name, ret);
+ if(ret == 0)
+ return NULL;
return ((ModuleList *) (long) ret)->moduleFptrStruct;
}
Property changes on: freeway/native/datastoreservice.c
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
Property changes on: freeway/native/identityservice.c
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
Property changes on: freeway/native/sqstoreservice.c
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
Property changes on: freeway/native/statsservice.c
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
Property changes on: freeway/native/trafficservice.c
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
Modified: freeway/native/util.c
===================================================================
--- freeway/native/util.c 2007-05-08 21:14:19 UTC (rev 4790)
+++ freeway/native/util.c 2007-05-09 14:40:16 UTC (rev 4791)
@@ -53,10 +53,14 @@
MUTEX_LOCK(&modulesLock);
pos = modules;
while(pos != NULL) {
- if(pos->prefix == NULL || pos->name == NULL)
+ if(pos->prefix == NULL || pos->name == NULL) {
+ pos = pos->next;
continue;
- if(strcmp(prefix, pos->prefix) != 0)
+ }
+ if(strcmp(prefix, pos->prefix) != 0) {
+ pos = pos->next;
continue;
+ }
if(strcmp(name, pos->name) == 0)
break;
pos = pos->next;
@@ -125,6 +129,7 @@
return NULL;
}
} else {
+ fprintf(stderr, "Using facade for %s %s\n", prefix, name);
temp = NULL;
}
pos = MALLOC(sizeof(ModuleList));
Added: freeway/src/org/gnu/freeway/services/SQstoreService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/SQstoreService.java
(rev 0)
+++ freeway/src/org/gnu/freeway/services/SQstoreService.java 2007-05-09
14:40:16 UTC (rev 4791)
@@ -0,0 +1,51 @@
+ /*
+ 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.services;
+
+import org.gnu.freeway.cwrappers.CDatastoreValue;
+import org.gnu.freeway.cwrappers.CHashCode512;
+import org.gnu.freeway.cwrappers.CInt;
+import org.gnu.freeway.cwrappers.CLong;
+import org.gnu.freeway.cwrappers.CUnsignedInt;
+import org.gnu.freeway.util.NativeService;
+
+/**
+ * @file SqstoreService.java
+ * @brief
+ * @author mdonoughe
+ */
+public interface SQstoreService extends NativeService {
+ public CLong getSize();
+
+ public CInt put(CHashCode512 key, CDatastoreValue value);
+
+ //TODO
+ //public CInt get(CHashCode512 key, CUnsignedInt type, CDatumIterator
iter, CPluginLoader.Handle closure);
+
+ public CInt update(CHashCode512 key, CDatastoreValue value, CInt delta);
+
+ //public CInt iterateLowPriority(CUnsignedInt type, CDatumIterator
iter, CPluginLoader.Handle closure);
+
+ //public CInt iterateExpirationTime(CUnsignedInt type, CDatumIterator
iter, CPluginLoader.Handle closure);
+
+ public CInt del(CHashCode512 key, CDatastoreValue value);
+
+ public void drop();
+}
Added: freeway/src/org/gnu/freeway/services/c/SQstoreService.java
===================================================================
--- freeway/src/org/gnu/freeway/services/c/SQstoreService.java
(rev 0)
+++ freeway/src/org/gnu/freeway/services/c/SQstoreService.java 2007-05-09
14:40:16 UTC (rev 4791)
@@ -0,0 +1,41 @@
+// 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);
+ }
+}
Property changes on: freeway/src/org/gnu/freeway/services/c/SQstoreService.java
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r4791 - in freeway: . native src/org/gnu/freeway/services src/org/gnu/freeway/services/c,
gnunet <=