[GNUnet-SVN] r13004 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2010-09-16 16:12:23 +0200 (Thu, 16 Sep 2010)
New Revision: 13004

Modified:
   gnunet/src/dht/dht.h
   gnunet/src/dht/dhtlog.h
Log:
sql related changes

Modified: gnunet/src/dht/dht.h
===================================================================
--- gnunet/src/dht/dht.h        2010-09-16 14:11:49 UTC (rev 13003)
+++ gnunet/src/dht/dht.h        2010-09-16 14:12:23 UTC (rev 13004)
@@ -38,11 +38,17 @@
 
 #define DHT_BLOOM_K 6
 
+/**
+ * How many requests to remember for forwarding responses.
+ */
 #define MAX_OUTSTANDING_FORWARDS 100
 
+/**
+ * How long to remember requests so we can forward responses.
+ */
 #define DHT_FORWARD_TIMEOUT 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
 
-#define DHT_REPUBLISH_FREQUENCY 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 60)
+#define DEFAULT_DHT_REPUBLISH_FREQUENCY 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 60)
 
 #define DHT_SEND_PRIORITY 4
 
@@ -231,22 +237,6 @@
   char bloomfilter[DHT_BLOOM_SIZE];
 
   /**
-   * FIXME: add DHT logging for analysis!
-   */
-#if LOG_SQL
-  /*
-   * Unique query id for sql database interaction.
-   */
-  uint64_t queryuid;
-
-  /*
-   * Unique trial id for sql database interaction
-   */
-  uint64_t trialuid;
-
-#endif
-
-  /**
    * The key to search for
    */
   GNUNET_HashCode key;

Modified: gnunet/src/dht/dhtlog.h
===================================================================
--- gnunet/src/dht/dhtlog.h     2010-09-16 14:11:49 UTC (rev 13003)
+++ gnunet/src/dht/dhtlog.h     2010-09-16 14:12:23 UTC (rev 13004)
@@ -275,6 +275,16 @@
                        const char *section, uint64_t value);
 
   /*
+   * Inserts the specified round into the dhttests.rounds table
+   *
+   * @param round_type the type of round that is being started
+   * @param round_count counter for the round (if applicable)
+   *
+   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+   */
+  int (*insert_round) (unsigned int round_type, unsigned int round_count);
+
+  /*
    * Update dhttests.trials table with total connections information
    *
    * @param trialuid the trialuid to update