train hacks

5 files changed, 328 insertions, 99 deletions

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 31c7ab92d..116095f2a 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -35,7 +35,8 @@ gnunet_service_peerinfo_LDADD = \
 
 
 check_PROGRAMS = \
- test_peerinfo_api
+ test_peerinfo_api \
+ perf_peerinfo_api
 
 if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
@@ -48,5 +49,12 @@ test_peerinfo_api_LDADD = \
  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+perf_peerinfo_api_SOURCES = \
+ perf_peerinfo_api.c
+perf_peerinfo_api_LDADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 EXTRA_DIST = \
   test_peerinfo_api_data.conf 
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index ee8749955..4879eea34 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -33,6 +33,7 @@
 
 #include "platform.h"
 #include "gnunet_crypto_lib.h"
+#include "gnunet_container_lib.h"
 #include "gnunet_disk_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
@@ -57,11 +58,6 @@ struct HostEntry
 {
 
   /**
-   * This is a linked list.
-   */
-  struct HostEntry *next;
-
-  /**
    * Identity of the peer.
    */
   struct GNUNET_PeerIdentity identity;
@@ -75,9 +71,10 @@ struct HostEntry
 
 
 /**
- * The in-memory list of known hosts.
+ * The in-memory list of known hosts, mapping of
+ * host IDs to 'struct HostEntry*' values.
  */
-static struct HostEntry *hosts;
+static struct GNUNET_CONTAINER_MultiHashMap *hostmap;
 
 /**
  * Clients to immediately notify about all changes.
@@ -163,24 +160,6 @@ get_host_filename (const struct GNUNET_PeerIdentity *id)
 
 
 /**
- * Find the host entry for the given peer.  FIXME: replace by hash map!
- * @return NULL if not found
- */
-static struct HostEntry *
-lookup_host_entry (const struct GNUNET_PeerIdentity *id)
-{
-  struct HostEntry *pos;
-
-  pos = hosts;
-  while ((pos != NULL) &&
-         (0 !=
-          memcmp (id, &pos->identity, sizeof (struct GNUNET_PeerIdentity))))
-    pos = pos->next;
-  return pos;
-}
-
-
-/**
  * Broadcast information about the given entry to all 
  * clients that care.
  *
@@ -215,7 +194,8 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
   struct GNUNET_TIME_Absolute now;
   char *fn;
 
-  entry = lookup_host_entry (identity);
+  entry = GNUNET_CONTAINER_multihashmap_get (hostmap,
+                                             &identity->hashPubKey);
   if (entry != NULL)
     return;
   GNUNET_STATISTICS_update (stats,
@@ -250,8 +230,10 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
         }
     }
   GNUNET_free (fn);
-  entry->next = hosts;
-  hosts = entry;
+  GNUNET_CONTAINER_multihashmap_put (hostmap,
+                                     &identity->hashPubKey,
+                                     entry,
+                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
   notify_all (entry);
 }
 
@@ -275,7 +257,8 @@ remove_garbage (const char *fullname)
 
 
 static int
-hosts_directory_scan_callback (void *cls, const char *fullname)
+hosts_directory_scan_callback (void *cls,
+                               const char *fullname)
 {
   unsigned int *matched = cls;
   struct GNUNET_PeerIdentity identity;
@@ -350,7 +333,8 @@ bind_address (const struct GNUNET_PeerIdentity *peer,
   struct GNUNET_TIME_Absolute delta;
 
   add_host_to_known_hosts (peer);
-  host = lookup_host_entry (peer);
+  host = GNUNET_CONTAINER_multihashmap_get (hostmap,
+                                            &peer->hashPubKey);
   GNUNET_assert (host != NULL);
   if (host->hello == NULL)
     {
@@ -383,63 +367,43 @@ bind_address (const struct GNUNET_PeerIdentity *peer,
 }
 
 
+
 /**
- * Do transmit info either for only the host matching the given
- * argument or for all known hosts.
+ * Do transmit info about peer to given host.
  *
- * @param only NULL to hit all hosts, otherwise specifies a particular target
- * @param client who is making the request (and will thus receive our confirmation)
+ * @param cls NULL to hit all hosts, otherwise specifies a particular target
+ * @param key hostID
+ * @param value information to transmit
+ * @return GNUNET_YES (continue to iterate)
  */
-static void
-send_to_each_host (const struct GNUNET_PeerIdentity *only,
-                   struct GNUNET_SERVER_Client *client)
+static int
+add_to_tc (void *cls,
+           const GNUNET_HashCode *key,
+           void *value)
 {
-  struct HostEntry *pos;
+  struct GNUNET_SERVER_TransmitContext *tc = cls;
+  struct HostEntry *pos = value;
   struct InfoMessage *im;
   uint16_t hs;
   char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
-  struct GNUNET_SERVER_TransmitContext *tc;
-  int match;
 
-  tc = GNUNET_SERVER_transmit_context_create (client);
-  match = GNUNET_NO;
-  pos = hosts;  
-  while (pos != NULL)
+  hs = 0;
+  im = (struct InfoMessage *) buf;
+  if (pos->hello != NULL)
     {
-      if ((only == NULL) ||
-          (0 ==
-           memcmp (only, &pos->identity,
-                   sizeof (struct GNUNET_PeerIdentity))))
-        {
-          hs = 0;
-          im = (struct InfoMessage *) buf;
-          if (pos->hello != NULL)
-            {
-              hs = GNUNET_HELLO_size (pos->hello);
-              GNUNET_assert (hs <
-                             GNUNET_SERVER_MAX_MESSAGE_SIZE -
-                             sizeof (struct InfoMessage));
-              memcpy (&im[1], pos->hello, hs);
-              match = GNUNET_YES;
-            }
-          im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
-          im->header.size = htons (sizeof (struct InfoMessage) + hs);
-          im->reserved = htonl (0);
-          im->peer = pos->identity;
-          GNUNET_SERVER_transmit_context_append_message (tc,
-                                                         &im->header);
-        }
-      pos = pos->next;
+      hs = GNUNET_HELLO_size (pos->hello);
+      GNUNET_assert (hs <
+                     GNUNET_SERVER_MAX_MESSAGE_SIZE -
+                     sizeof (struct InfoMessage));
+      memcpy (&im[1], pos->hello, hs);
     }
-  if ( (only != NULL) &&
-       (match == GNUNET_NO) )
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "No `%s' message was found for peer `%4s'\n",
-                "HELLO",
-                GNUNET_i2s (only));
-  GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
-                                              GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
-  GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
+  im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
+  im->header.size = htons (sizeof (struct InfoMessage) + hs);
+  im->reserved = htonl (0);
+  im->peer = pos->identity;
+  GNUNET_SERVER_transmit_context_append_message (tc,
+                                                 &im->header);
+  return GNUNET_YES;
 }
 
 
@@ -500,7 +464,6 @@ cron_clean_data_hosts (void *cls,
   now = GNUNET_TIME_absolute_get ();
   GNUNET_DISK_directory_scan (networkIdDirectory,
                               &discard_hosts_helper, &now);
-
   GNUNET_SCHEDULER_add_delayed (tc->sched,
                                 DATA_HOST_CLEAN_FREQ,
                                 &cron_clean_data_hosts, NULL);
@@ -553,6 +516,7 @@ handle_get (void *cls,
             const struct GNUNET_MessageHeader *message)
 {
   const struct ListPeerMessage *lpm;
+  struct GNUNET_SERVER_TransmitContext *tc;
 
   lpm = (const struct ListPeerMessage *) message;
 #if DEBUG_PEERINFO
@@ -561,7 +525,14 @@ handle_get (void *cls,
               "GET",
               GNUNET_i2s (&lpm->peer));
 #endif
-  send_to_each_host (&lpm->peer, client);
+  tc = GNUNET_SERVER_transmit_context_create (client);
+  GNUNET_CONTAINER_multihashmap_get_multiple (hostmap,
+                                              &lpm->peer.hashPubKey,
+                                              &add_to_tc,
+                                              tc);
+  GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
+                                              GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+  GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 
@@ -577,12 +548,39 @@ handle_get_all (void *cls,
                 struct GNUNET_SERVER_Client *client,
                 const struct GNUNET_MessageHeader *message)
 {
+  struct GNUNET_SERVER_TransmitContext *tc;
+
 #if DEBUG_PEERINFO
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "`%s' message received\n",
               "GET_ALL");
 #endif
-  send_to_each_host (NULL, client);
+  tc = GNUNET_SERVER_transmit_context_create (client);
+  GNUNET_CONTAINER_multihashmap_iterate (hostmap,
+                                         &add_to_tc,
+                                         tc);
+  GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
+                                              GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+  GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
+}
+
+
+static int
+do_notify_entry (void *cls,
+                 const GNUNET_HashCode *key,
+                 void *value)
+{
+  struct GNUNET_SERVER_Client *client = cls;
+  struct HostEntry *he = value;
+  struct InfoMessage *msg;
+
+  msg = make_info_message (he);
+  GNUNET_SERVER_notification_context_unicast (notify_list,
+                                              client,
+                                              &msg->header,
+                                              GNUNET_NO);
+  GNUNET_free (msg);
+  return GNUNET_YES;
 }
 
 
@@ -595,12 +593,9 @@ handle_get_all (void *cls,
  */
 static void
 handle_notify (void *cls,
-            struct GNUNET_SERVER_Client *client,
-            const struct GNUNET_MessageHeader *message)
+               struct GNUNET_SERVER_Client *client,
+               const struct GNUNET_MessageHeader *message)
 {
-  struct InfoMessage *msg;
-  struct HostEntry *pos;
-
 #if DEBUG_PEERINFO
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "`%s' message received\n",
@@ -608,20 +603,22 @@ handle_notify (void *cls,
 #endif
   GNUNET_SERVER_notification_context_add (notify_list,
                                           client);
-  pos = hosts;
-  while (NULL != pos)
-    {
-      msg = make_info_message (pos);
-      GNUNET_SERVER_notification_context_unicast (notify_list,
-                                                  client,
-                                                  &msg->header,
-                                                  GNUNET_NO);
-      GNUNET_free (msg);
-      pos = pos->next;
-    }
+  GNUNET_CONTAINER_multihashmap_iterate (hostmap,
+                                         &do_notify_entry,
+                                         client);
 }
 
 
+static int
+free_host_entry (void *cls,
+                 const GNUNET_HashCode *key,
+                 void *value)
+{
+  struct HostEntry *he = value;
+  GNUNET_free (he);
+  return GNUNET_YES;
+}
+
 /**
  * Clean up our state.  Called during shutdown.
  *
@@ -634,6 +631,10 @@ shutdown_task (void *cls,
 {
   GNUNET_SERVER_notification_context_destroy (notify_list);
   notify_list = NULL;
+  GNUNET_CONTAINER_multihashmap_iterate (hostmap,
+                                         &free_host_entry,
+                                         NULL);
+  GNUNET_CONTAINER_multihashmap_destroy (hostmap);
   if (stats != NULL)
     {
       GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
@@ -666,6 +667,8 @@ run (void *cls,
      sizeof (struct GNUNET_MessageHeader)},
     {NULL, NULL, 0, 0}
   };
+
+  hostmap = GNUNET_CONTAINER_multihashmap_create (1024);
   stats = GNUNET_STATISTICS_create (sched, "peerinfo", cfg);
   notify_list = GNUNET_SERVER_notification_context_create (server, 0);
   GNUNET_assert (GNUNET_OK ==
diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c
new file mode 100755
index 000000000..1c0df0332
--- /dev/null
+++ b/src/peerinfo/perf_peerinfo_api.c
@@ -0,0 +1,217 @@
+/*
+     This file is part of GNUnet.
+     (C) 2004, 2009 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 3, or (at your
+     option) any later version.
+
+     GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file peerinfo/test_peerinfo_hammer.c
+ * @brief testcase for peerinfo_api.c, hopefully hammer the peerinfo service
+ * @author Nathan Evans
+ */
+
+#include "platform.h"
+#include "gnunet_hello_lib.h"
+#include "gnunet_getopt_lib.h"
+#include "gnunet_os_lib.h"
+#include "gnunet_peerinfo_service.h"
+#include "gnunet_program_lib.h"
+#include "gnunet_time_lib.h"
+#include "peerinfo.h"
+
+#define START_SERVICE 1
+
+#define NUM_REQUESTS 5000
+
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+static struct GNUNET_PEERINFO_IteratorContext *ic[NUM_REQUESTS];
+
+static struct GNUNET_PEERINFO_Handle *h;
+
+static unsigned int numpeers;
+
+static int
+check_it (void *cls,
+          const char *tname,
+          struct GNUNET_TIME_Absolute expiration,
+          const void *addr, uint16_t addrlen)
+{
+  if (addrlen > 0)
+    {
+#if DEBUG
+      fprintf (stderr,
+               "name: %s, addr: %s\n", 
+               tname, 
+               (const char*) addr);
+#endif
+    }
+  return GNUNET_OK;
+}
+
+
+static size_t
+address_generator (void *cls, size_t max, void *buf)
+{
+  size_t *agc = cls;
+  size_t ret;
+  char *address;
+
+  if (*agc == 0)
+    return 0;
+
+  GNUNET_asprintf(&address, "Address%d", *agc);
+
+  ret = GNUNET_HELLO_add_address ("peerinfotest",
+                                  GNUNET_TIME_relative_to_absolute
+                                  (GNUNET_TIME_UNIT_HOURS), address, strlen(address) + 1,
+                                  buf, max);
+  *agc = 0;
+  return ret;
+}
+
+
+static void
+add_peer (size_t i)
+{
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+  struct GNUNET_PeerIdentity pid;
+  struct GNUNET_HELLO_Message *h2;
+  size_t agc;
+
+  agc = 2;
+  memset (&pkey, i, sizeof (pkey));
+  GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey);
+  h2 = GNUNET_HELLO_create (&pkey, &address_generator, &i);
+  GNUNET_PEERINFO_add_peer (h, h2);
+  GNUNET_free (h2);
+}
+
+
+static void
+process (void *cls,
+         const struct GNUNET_PeerIdentity *peer,
+         const struct GNUNET_HELLO_Message *hello)
+{
+  if (peer == NULL)
+    {
+#if DEBUG
+      fprintf(stderr, "Process received NULL response\n");
+#endif
+    }
+  else
+    {
+#if DEBUG
+      fprintf(stderr, "Processed a peer\n");
+#endif
+      numpeers++;
+      if (0 && (hello != NULL))
+        GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_it, NULL);
+
+    }
+}
+
+
+static void
+run (void *cls,
+     struct GNUNET_SCHEDULER_Handle *s,
+     char *const *args,
+     const char *cfgfile, 
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  size_t i;
+  sched = s;
+  cfg = c;
+  h = GNUNET_PEERINFO_connect (sched, cfg);
+
+  for (i = 0; i < NUM_REQUESTS; i++)
+    {
+      add_peer (i);
+      ic[i] = GNUNET_PEERINFO_iterate (h,
+                                       NULL,
+                                       GNUNET_TIME_relative_multiply
+                                       (GNUNET_TIME_UNIT_SECONDS, 30),
+                                       &process, cls);
+    }
+  fprintf (stderr,
+           "Issued %u requests\n",
+           NUM_REQUESTS);
+}
+
+static int
+check ()
+{
+  int ok = 3;
+  char *const argv[] = { "test-peerinfo-hammer",
+    "-c",
+    "test_peerinfo_api_data.conf",
+#if DEBUG_PEERINFO
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+#if START_SERVICE
+  pid_t pid;
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
+                                 "gnunet-service-peerinfo",
+#if DEBUG_PEERINFO
+                                 "-L", "DEBUG",
+#endif
+                                 "-c", "test_peerinfo_api_data.conf", NULL);
+#endif
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                      argv, "test-peerinfo-api", "nohelp",
+                      options, &run, &ok);
+  fprintf (stderr,
+           "Processed %u/%u peers\n",
+           numpeers,
+           NUM_REQUESTS);
+#if START_SERVICE
+  if (0 != PLIBC_KILL (pid, SIGTERM))
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      ok = 1;
+    }
+  GNUNET_OS_process_wait(pid);
+#endif
+  return ok;
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  int ret = 0;
+
+  GNUNET_log_setup ("test_peerinfo_api",
+#if DEBUG_PEERINFO
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-peerinfo");
+  return ret;
+}
+
+/* end of test_peerinfo_hammer.c */
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index 47304d549..a3c2c99eb 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -208,7 +208,7 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-peerinfo");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-peerinfo");
   return ret;
 }
 
diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf
index a81ffccb9..998df571a 100644
--- a/src/peerinfo/test_peerinfo_api_data.conf
+++ b/src/peerinfo/test_peerinfo_api_data.conf
@@ -1,5 +1,6 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-peerinfo/
+SERVICEHOME = /tmp/test-gnunet-peerinfo/
 
 [peerinfo]
 PORT = 22354
+DEBUG = NO