[GNUnet-SVN] r9239 - gnunet/src/datastore

[gnunet]

Author: grothoff
Date: 2009-10-21 15:38:56 -0600 (Wed, 21 Oct 2009)
New Revision: 9239

Modified:
   gnunet/src/datastore/Makefile.am
   gnunet/src/datastore/gnunet-service-datastore.c
   gnunet/src/datastore/plugin_datastore_sqlite.c
Log:
fix

Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am    2009-10-21 20:11:13 UTC (rev 9238)
+++ gnunet/src/datastore/Makefile.am    2009-10-21 21:38:56 UTC (rev 9239)
@@ -31,6 +31,7 @@
 gnunet_service_datastore_SOURCES = \
  gnunet-service-datastore.c plugin_datastore.h
 gnunet_service_datastore_LDADD = \
+  $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
@@ -44,7 +45,6 @@
   plugin_datastore_sqlite.c
 libgnunet_plugin_datastore_sqlite_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
 libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)

Modified: gnunet/src/datastore/gnunet-service-datastore.c
===================================================================
--- gnunet/src/datastore/gnunet-service-datastore.c     2009-10-21 20:11:13 UTC 
(rev 9238)
+++ gnunet/src/datastore/gnunet-service-datastore.c     2009-10-21 21:38:56 UTC 
(rev 9239)
@@ -26,6 +26,7 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_arm_service.h"
 #include "gnunet_protocols.h"
 #include "plugin_datastore.h"
 #include "datastore.h"
@@ -1208,6 +1209,7 @@
       GNUNET_CONTAINER_bloomfilter_free (filter);
       filter = NULL;
     }
+  GNUNET_ARM_stop_services (cfg, tc->sched, "statistics", NULL);
 }
 
 
@@ -1305,11 +1307,13 @@
                  _("Failed to initialize bloomfilter.\n"));
       return;
     }
+  GNUNET_ARM_start_services (cfg, sched, "statistics", NULL);
   plugin = load_plugin ();
   if (NULL == plugin)
     {
       GNUNET_CONTAINER_bloomfilter_free (filter);
       filter = NULL;
+      GNUNET_ARM_stop_services (cfg, sched, "statistics", NULL);
       return;
     }
   GNUNET_SERVER_disconnect_notify (server, &cleanup_reservations, NULL);

Modified: gnunet/src/datastore/plugin_datastore_sqlite.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_sqlite.c      2009-10-21 20:11:13 UTC 
(rev 9238)
+++ gnunet/src/datastore/plugin_datastore_sqlite.c      2009-10-21 21:38:56 UTC 
(rev 9239)
@@ -25,7 +25,6 @@
  */
 
 #include "platform.h"
-#include "gnunet_arm_service.h"
 #include "gnunet_statistics_service.h"
 #include "plugin_datastore.h"
 #include <sqlite3.h>
@@ -1580,7 +1579,6 @@
     return NULL; /* can only initialize once! */
   memset (&plugin, 0, sizeof(struct Plugin));
   plugin.env = env;
-  GNUNET_ARM_start_services (env->cfg, env->sched, "statistics", NULL);
   plugin.statistics = GNUNET_STATISTICS_create (env->sched,
                                                "sqlite",
                                                env->cfg);
@@ -1595,7 +1593,6 @@
       database_setup (env->cfg, &plugin))
     {
       database_shutdown (&plugin);
-      GNUNET_ARM_stop_services (env->cfg, env->sched, "statistics", NULL);
       return NULL;
     }
   api = GNUNET_malloc (sizeof (struct GNUNET_DATASTORE_PluginFunctions));
@@ -1635,7 +1632,6 @@
     fn = GNUNET_strdup (plugin->fn);
   database_shutdown (plugin);
   GNUNET_STATISTICS_destroy (plugin->statistics);
-  GNUNET_ARM_stop_services (plugin->env->cfg, plugin->env->sched, 
"statistics", NULL);
   plugin->env = NULL; 
   plugin->payload = 0;
   GNUNET_free (api);