- test for external iterator

[oweals/gnunet.git] / src / util / gnunet-service-resolver.c

diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index f20666a38996df80c88181820f496e60f0b1e66a..cab13ae5794f1507e2be6f2337b897f51a4779fc 100644 (file)
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2007, 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+     (C) 2007-2013 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
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -217,8 +217,8 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
            (0 != memcmp (pos->ip, ip, ip_len))) )
   {
     next = pos->next;
-    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value <
-        60 * 60 * 1000)
+    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us <
+        60 * 60 * 1000 * 1000LL)
     {
       GNUNET_CONTAINER_DLL_remove (cache_head,
                                   cache_tail,
@@ -231,8 +231,8 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   if (pos != NULL)
   {
     pos->last_request = now;
-    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value <
-        60 * 60 * 1000)
+    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us <
+        60 * 60 * 1000 * 1000LL)
     {
       GNUNET_free_non_null (pos->addr);
       pos->addr = NULL;
@@ -490,10 +490,8 @@ handle_get (void *cls, struct GNUNET_SERVER_Client *client,
       GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
       return;
     }
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Resolver asked to look up `%s'.\n"),
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Resolver asked to look up `%s'.\n",
                 hostname);
-#endif
     get_ip_from_hostname (client, hostname, af);
     return;
   }
@@ -521,15 +519,13 @@ handle_get (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-#if DEBUG_RESOLVER
   {
     char buf[INET6_ADDRSTRLEN];
     
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-               _("Resolver asked to look up IP address `%s'.\n"), 
+               "Resolver asked to look up IP address `%s'.\n", 
                inet_ntop (af, ip, buf, sizeof (buf)));
   }
-#endif
   get_ip_as_string (client, af, ip);  
 }
 
@@ -581,4 +577,19 @@ main (int argc, char *const *argv)
   return ret;
 }
 
+#ifdef LINUX
+#include <malloc.h>
+
+/**
+ * MINIMIZE heap size (way below 128k) since this process doesn't need much.
+ */
+void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
+{
+  mallopt (M_TRIM_THRESHOLD, 4 * 1024);
+  mallopt (M_TOP_PAD, 1 * 1024);
+  malloc_trim (0);
+}
+#endif
+
+
 /* end of gnunet-service-resolver.c */