[GNUnet-SVN] r9889 - GNUnet/src/applications/dv/module

[gnunet]

Author: nevans
Date: 2009-12-23 23:59:43 +0100 (Wed, 23 Dec 2009)
New Revision: 9889

Removed:
   GNUnet/src/applications/dv/module/dv_heaptest.c
Modified:
   GNUnet/src/applications/dv/module/Makefile.am
   GNUnet/src/applications/dv/module/dv_test.conf
Log:
get rid of dv_heaptest.c, as it evolved into only a heap testcase

Modified: GNUnet/src/applications/dv/module/Makefile.am
===================================================================
--- GNUnet/src/applications/dv/module/Makefile.am       2009-12-23 22:56:29 UTC 
(rev 9888)
+++ GNUnet/src/applications/dv/module/Makefile.am       2009-12-23 22:59:43 UTC 
(rev 9889)
@@ -32,7 +32,6 @@
 
   
 check_PROGRAMS = \
- dv_heaptest \
  dvtest
  
 TESTS = $(check_PROGRAMS)
@@ -45,11 +44,6 @@
  $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
  $(top_builddir)/src/applications/testing/libgnunettestingapi.la
 
-dv_heaptest_SOURCES = \
- dv_heaptest.c
-dv_heaptest_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
 EXTRA_DIST = \
   check.conf \
   dv_test.conf \

Deleted: GNUnet/src/applications/dv/module/dv_heaptest.c
===================================================================
--- GNUnet/src/applications/dv/module/dv_heaptest.c     2009-12-23 22:56:29 UTC 
(rev 9888)
+++ GNUnet/src/applications/dv/module/dv_heaptest.c     2009-12-23 22:59:43 UTC 
(rev 9889)
@@ -1,156 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2008 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
- 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.
- */
-
-/**
- * @author Nathan Evans
- * @file util/containers/heaptest.c
- * @brief Test of heap operations in churny like conditions...
- */
-
-#include "gnunet_util.h"
-#include "gnunet_util_crypto.h"
-#include "platform.h"
-#include "../../../util/crypto/hostkey_gcrypt.c"
-
-#define MAX_SIZE 100
-#define TESTS 75
-#define DEBUG GNUNET_NO
-
-/* Test struct so we have something to actually
- * put into the heap */
-
-struct GNUNET_neighbor
-{
-
-  /**
-   * Identity of neighbor.
-   */
-  unsigned int neighbor;
-
-  /**
-   * Cost to neighbor
-   */
-  unsigned int cost;
-};
-
-
-int
-main (int argc, char **argv)
-{
-
-  struct GNUNET_CONTAINER_Heap *minHeap;
-  struct GNUNET_CONTAINER_Heap *maxHeap;
-  int i;
-  int ret;
-  int cur_pos = 0;
-  unsigned int temp_rand;
-  unsigned int temp_node;
-  unsigned int temp_id;
-
-  struct GNUNET_neighbor *neighbors[TESTS];
-  struct GNUNET_CONTAINER_HeapNode *min_nodes[TESTS];
-  struct GNUNET_CONTAINER_HeapNode *max_nodes[TESTS];
-
-  ret = GNUNET_OK;
-  maxHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MAX);
-  minHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
-
-  for (i = 0; i < TESTS; i++)
-    {
-      neighbors[i] = NULL;
-    }
-
-  for (i = 0; i < TESTS; i++)
-    {
-      temp_rand = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 5);
-      while ((cur_pos <= 1) && (temp_rand != 0))
-        temp_rand = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 5);
-
-      switch (temp_rand)
-        {
-        case 0:
-        case 1:
-          temp_rand = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 100) + 1;
-          temp_id =
-            GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 100000) + 1;
-#if DEBUG
-          fprintf (stderr, "Adding node with cost %d\n", temp_rand);
-#endif
-          neighbors[cur_pos] =
-            GNUNET_malloc (sizeof (struct GNUNET_dv_neighbor));
-          neighbors[cur_pos]->neighbor = temp_id;
-          neighbors[cur_pos]->cost = temp_rand;
-          max_nodes[cur_pos] =
-            GNUNET_CONTAINER_heap_insert (maxHeap, neighbors[cur_pos],
-                                          temp_rand);
-          min_nodes[cur_pos] =
-            GNUNET_CONTAINER_heap_insert (minHeap, neighbors[cur_pos],
-                                          temp_rand);
-          cur_pos++;
-          break;
-
-        case 2:
-          temp_node = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, cur_pos);
-          temp_rand = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 100) + 1;
-#if DEBUG
-          fprintf (stderr, "Updating node %d (cost %d) with new cost %d\n",
-                   temp_node + 1, neighbors[temp_node]->cost, temp_rand);
-#endif
-          GNUNET_CONTAINER_heap_update_cost (maxHeap, max_nodes[temp_node],
-                                             temp_rand);
-          GNUNET_CONTAINER_heap_update_cost (minHeap, min_nodes[temp_node],
-                                             temp_rand);
-          neighbors[temp_node]->cost = temp_rand;
-          break;
-        case 3:
-#if DEBUG
-          fprintf (stderr, "Removing node %d with cost %d\n", cur_pos,
-                   neighbors[cur_pos - 1]->cost);
-#endif
-          GNUNET_CONTAINER_heap_remove_node (maxHeap, max_nodes[cur_pos - 1]);
-          GNUNET_CONTAINER_heap_remove_node (minHeap, min_nodes[cur_pos - 1]);
-          GNUNET_free (neighbors[cur_pos - 1]);
-          neighbors[cur_pos - 1] = NULL;
-          cur_pos--;
-          break;
-        case 4:
-          break;
-        }
-
-      if (ret != GNUNET_OK)
-        return GNUNET_SYSERR;
-
-    }
-  while (GNUNET_CONTAINER_heap_get_size (maxHeap) > 0)
-    {
-      GNUNET_CONTAINER_heap_remove_root (maxHeap);
-    }
-
-  while (GNUNET_CONTAINER_heap_get_size (minHeap) > 0)
-    {
-      GNUNET_CONTAINER_heap_remove_root (minHeap);
-    }
-
-  GNUNET_CONTAINER_heap_destroy (maxHeap);
-  GNUNET_CONTAINER_heap_destroy (minHeap);
-  return 0;
-}
-
-/* end of heaptest.c */

Modified: GNUnet/src/applications/dv/module/dv_test.conf
===================================================================
--- GNUnet/src/applications/dv/module/dv_test.conf      2009-12-23 22:56:29 UTC 
(rev 9888)
+++ GNUnet/src/applications/dv/module/dv_test.conf      2009-12-23 22:59:43 UTC 
(rev 9889)
@@ -6,3 +6,5 @@
 BASE_CONFIG=gnunetd_dv.conf
 TOPOLOGY=2
 PERCENTAGE=.45
+#PREPEND_EXECUTABLE=xterm -e gdb --args # use this to open each gnunetd in
+                                       # it's own xterm, useful for debugging