[GNUnet-SVN] r3331 - in GNUnet: . src/applications/kvstore_sqlite src/applications/sqstore_sqlite

[grothoff]

Author: grothoff
Date: 2006-08-26 22:09:14 -0700 (Sat, 26 Aug 2006)
New Revision: 3331

Modified:
   GNUnet/src/applications/kvstore_sqlite/Makefile.am
   GNUnet/src/applications/kvstore_sqlite/check.conf
   GNUnet/src/applications/kvstore_sqlite/kv_sqlitetest.c
   GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
   GNUnet/todo
Log:
making kvstore test compile

Modified: GNUnet/src/applications/kvstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/Makefile.am  2006-08-27 05:04:46 UTC 
(rev 3330)
+++ GNUnet/src/applications/kvstore_sqlite/Makefile.am  2006-08-27 05:09:14 UTC 
(rev 3331)
@@ -30,4 +30,5 @@
  kv_sqlitetest.c 
 kv_sqlitetest_LDADD = \
  $(top_builddir)/src/server/libgnunetcore.la  \
+ $(top_builddir)/src/util/config_impl/libgnunetutil_config.la  \
  $(top_builddir)/src/util/libgnunetutil.la  

Modified: GNUnet/src/applications/kvstore_sqlite/check.conf
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/check.conf   2006-08-27 05:04:46 UTC 
(rev 3330)
+++ GNUnet/src/applications/kvstore_sqlite/check.conf   2006-08-27 05:09:14 UTC 
(rev 3331)
@@ -1,18 +1,20 @@
+GNUNETD_HOME = /tmp/gnunet-sqlite-sqstore-test
+
 [GNUNETD]
-GNUNETD_HOME = "/tmp/gnunet-sqlite-sqstore-test"
+GNUNETD_HOME = /tmp/gnunet-sqlite-sqstore-test
 HELLOEXPIRES = 1440
 LOGLEVEL = "NOTHING"
-LOGFILE = "$GNUNETD_HOME/logs"
+LOGFILE = $GNUNETD_HOME/logs
 KEEPLOG = "0"
-PIDFILE = "$GNUNETD_HOME/gnunet.pid"
-HOSTS = "$GNUNETD_HOME/data/hosts/"
+PIDFILE = $GNUNETD_HOME/gnunet.pid
+HOSTS = $GNUNETD_HOME/data/hosts/
 HTTP-PROXY = ""
 HTTP-PROXY-PORT = 1080
 APPLICATIONS = "fs getoption stats traffic"
 PROCESS-PRIORITY = "NORMAL"
 
 [KEYVALUE_DATABASE]
-DIR = "$GNUNETD_HOME/data/kv/"
+DIR = $GNUNETD_HOME/data/kv/
 
 [MODULES]
 sqstore = "sqstore_sqlite"
@@ -35,8 +37,8 @@
 [FS]
 QUOTA = 1024
 ACTIVEMIGRATION = YES
-DIR = "$GNUNETD_HOME/data/fs/"
-INDEX-DIRECTORY = "$GNUNETD_HOME/data/shared/"
+DIR = $GNUNETD_HOME/data/fs/
+INDEX-DIRECTORY = $GNUNETD_HOME/data/shared/
 INDEX-QUOTA = 8192
 POOL = 32
 

Modified: GNUnet/src/applications/kvstore_sqlite/kv_sqlitetest.c
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/kv_sqlitetest.c      2006-08-27 
05:04:46 UTC (rev 3330)
+++ GNUnet/src/applications/kvstore_sqlite/kv_sqlitetest.c      2006-08-27 
05:09:14 UTC (rev 3331)
@@ -25,6 +25,8 @@
 
 #include "platform.h"
 #include "gnunet_util.h"
+#include "gnunet_util_cron.h"
+#include "gnunet_util_config_impl.h"
 #include "gnunet_protocols.h"
 #include "gnunet_kvstore_service.h"
 #include "core.h"
@@ -45,7 +47,7 @@
   kv = api->getTable("TEST", "KV");
   ASSERT(kv != NULL);
   
-  cronTime(&timeStmp);
+  timeStmp = get_time();
   ASSERT(api->put(kv, (void *) &k, sizeof(k), (void *) &v, sizeof(v),
     timeStmp) == OK);
   
@@ -71,37 +73,23 @@
 
 #define TEST_DB "/tmp/GNUnet_sqstore_test/"
 
-/**
- * Perform option parsing from the command line.
- */
-static int parser(int argc,
-                 char * argv[]) {
-  FREENONNULL(setConfigurationString("GNUNETD",
-                                    "_MAGIC_",
-                                    "YES"));
-  FREENONNULL(setConfigurationString("GNUNETD",
-                                    "LOGFILE",
-                                    NULL));
-  FREENONNULL(setConfigurationString("GNUNETD",
-                                    "GNUNETD_HOME",
-                                    "/tmp/gnunet_test/"));
-  FREENONNULL(setConfigurationString("FILES",
-                                    "gnunet.conf",
-                                    "check.conf"));
-  FREENONNULL(setConfigurationString("FS",
-                                    "DIR",
-                                    TEST_DB));
-  return OK;
-}
-
 int main(int argc, char *argv[]) {
   KVstore_ServiceAPI * api;
   int ok;
+  struct GC_Configuration * cfg;
+  struct CronManager * cron;
 
-  if (OK != initUtil(argc, argv, &parser))
-    errexit(_("Could not initialize libgnunetutil!\n"));
-  fprintf(stderr, "init\n");
-  initCore();
+  cfg = GC_create_C_impl();
+  if (-1 == GC_parse_configuration(cfg,
+                                  "check.conf")) {
+    GC_free(cfg);
+    return -1;  
+  }
+  cron = cron_create(NULL);
+  initCore(NULL,
+          cfg,
+          cron,
+          NULL);
   api = requestService("kvstore_sqlite");
   if (api != NULL) {
     ok = test(api);
@@ -109,11 +97,9 @@
   } else
     ok = SYSERR;
   doneCore();
-  doneUtil();
   if (ok == SYSERR)
     return 1;
-  else
-    return 0;
+  return 0;
 }
 
 /* end of kv_sqlitetest.c */

Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2006-08-27 05:04:46 UTC 
(rev 3330)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2006-08-27 05:09:14 UTC 
(rev 3331)
@@ -237,14 +237,14 @@
   struct GC_Configuration * cfg;
   struct CronManager * cron;
 
- cfg = GC_create_C_impl();
- if (-1 == GC_parse_configuration(cfg,
-                                 "check.conf")) {
-   GC_free(cfg);
-   return -1;  
- }
- cron = cron_create(NULL);
-   initCore(NULL,
+  cfg = GC_create_C_impl();
+  if (-1 == GC_parse_configuration(cfg,
+                                  "check.conf")) {
+    GC_free(cfg);
+    return -1;  
+  }
+  cron = cron_create(NULL);
+  initCore(NULL,
           cfg,
           cron,
           NULL);

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-08-27 05:04:46 UTC (rev 3330)
+++ GNUnet/todo 2006-08-27 05:09:14 UTC (rev 3331)
@@ -22,11 +22,11 @@
     + util/network_client/ 
     + fs/lib -- compiles, but fails!
     + session -- compiles, but fails!
+    + kvstore_sqlite -- compiles, but fails!
     + gap
     + fs/ecrs
     + fs/namespace
     + fs/fsui
-    + kvstore_sqlite      
     + tbench
     + dht/tools, dht/module
   * transports: