[GNUnet-SVN] r3306 - in GNUnet/src: applications/sqstore_sqlite server util/config_impl util/string

[grothoff]

Author: grothoff
Date: 2006-08-24 19:33:39 -0700 (Thu, 24 Aug 2006)
New Revision: 3306

Modified:
   GNUnet/src/applications/sqstore_sqlite/sqlite.c
   GNUnet/src/server/connection.c
   GNUnet/src/util/config_impl/impl.c
   GNUnet/src/util/string/xmalloc.c
Log:
fixes

Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c     2006-08-25 02:20:38 UTC 
(rev 3305)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c     2006-08-25 02:33:39 UTC 
(rev 3306)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other 
contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other 
contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -28,6 +28,7 @@
  */
 
 #include "platform.h"
+#include "gnunet_directories.h"
 #include "gnunet_util.h"
 #include "gnunet_sqstore_service.h"
 #include "gnunet_protocols.h"

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2006-08-25 02:20:38 UTC (rev 3305)
+++ GNUnet/src/server/connection.c      2006-08-25 02:33:39 UTC (rev 3306)
@@ -2634,7 +2634,7 @@
   unsigned int i;
 
   if (0 != strcmp(section, "LOAD"))
-    return OK; /* fast path */
+    return 0; /* fast path */
   if (-1 == GC_get_configuration_value_number(cfg,
                                              "LOAD",
                                              "MAXNETDOWNBPSTOTAL",
@@ -2704,7 +2704,7 @@
                                                            "PADDING",
                                                            NO);
   MUTEX_UNLOCK(lock);
-  return OK;
+  return 0;
 }
 
 /**
@@ -2724,10 +2724,13 @@
   scl_nextHead = NULL;
   scl_nextTail = NULL;
   lock = MUTEX_CREATE(YES);
-  GC_attach_change_listener(cfg,
-                           &connectionConfigChangeCallback,
-                           NULL);
   CONNECTION_MAX_HOSTS_ = 0;
+  GE_ASSERT(ectx,
+           0 == GC_attach_change_listener(cfg,
+                                          &connectionConfigChangeCallback,
+                                          NULL));
+  GE_ASSERT(ectx,
+           CONNECTION_MAX_HOSTS_ != 0);
   registerp2pHandler(P2P_PROTO_hangup, &handleHANGUP);
   cron_add_job(cron,
               &cronDecreaseLiveness,

Modified: GNUnet/src/util/config_impl/impl.c
===================================================================
--- GNUnet/src/util/config_impl/impl.c  2006-08-25 02:20:38 UTC (rev 3305)
+++ GNUnet/src/util/config_impl/impl.c  2006-08-25 02:33:39 UTC (rev 3306)
@@ -738,6 +738,8 @@
   }
   l.listener = callback;
   l.ctx = ctx;
+  fprintf(stderr,
+         "Appending to %u\n", cfg->data->lsize);
   APPEND(cfg->data->listeners,
         cfg->data->lsize,
         l);
@@ -754,6 +756,8 @@
 
   MUTEX_LOCK(cfg->data->lock);
   for (i=cfg->data->lsize-1;i>=0;i--) {
+    fprintf(stderr,
+           "Accessing at to %u - base %p\n", i, cfg->data->listeners);
     l = &cfg->data->listeners[i];
     if ( (l->listener == callback) &&
         (l->ctx == ctx) ) {

Modified: GNUnet/src/util/string/xmalloc.c
===================================================================
--- GNUnet/src/util/string/xmalloc.c    2006-08-25 02:20:38 UTC (rev 3305)
+++ GNUnet/src/util/string/xmalloc.c    2006-08-25 02:33:39 UTC (rev 3306)
@@ -234,6 +234,9 @@
                   filename,
                   linenumber,
                   function);
+    fprintf(stderr,
+           "xm %u bytes at %p\n",
+           size, tmp);
     GE_ASSERT(NULL, tmp != NULL);
     memset(tmp, 0, size); /* client code should not rely on this, though... */
     if (*oldCount > newCount)