[GNUnet-SVN] r8908 - GNUnet/src/applications/dhtlog_mysql

[gnunet]

Author: nevans
Date: 2009-08-31 11:10:36 -0600 (Mon, 31 Aug 2009)
New Revision: 8908

Modified:
   GNUnet/src/applications/dhtlog_mysql/dhtlog_mysql.c
   GNUnet/src/applications/dhtlog_mysql/dhtlog_test.c
Log:
more logging options

Modified: GNUnet/src/applications/dhtlog_mysql/dhtlog_mysql.c
===================================================================
--- GNUnet/src/applications/dhtlog_mysql/dhtlog_mysql.c 2009-08-31 17:09:31 UTC 
(rev 8907)
+++ GNUnet/src/applications/dhtlog_mysql/dhtlog_mysql.c 2009-08-31 17:10:36 UTC 
(rev 8908)
@@ -61,8 +61,8 @@
                           "VALUES (?, ?, ?)"
 static struct GNUNET_MysqlStatementHandle *insert_node;
 
-#define INSERT_TRIALS_STMT "INSERT INTO trials (starttime, numnodes, topology, 
puts, gets, concurrent, settle_time, num_rounds, malicious_getters, 
malicious_putters, malicious_droppers, message) "\
-                          "VALUES (NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
+#define INSERT_TRIALS_STMT "INSERT INTO trials (starttime, numnodes, topology, 
topology_modifier, logNMultiplier, puts, gets, concurrent, settle_time, 
num_rounds, malicious_getters, malicious_putters, malicious_droppers, message) 
"\
+                          "VALUES (NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 
?)"
 static struct GNUNET_MysqlStatementHandle *insert_trial;
 
 #define INSERT_DHTKEY_STMT "INSERT INTO dhtkeys (dhtkey, trialuid, keybits) "\
@@ -238,6 +238,7 @@
  */
 int
 add_trial (unsigned long long *trialuid, int num_nodes, int topology,
+           float topology_modifier, float logNMultiplier,
            int puts, int gets, int concurrent, int settle_time,
            int num_rounds, int malicious_getters, int malicious_putters,
            int malicious_droppers, char *message)
@@ -254,6 +255,10 @@
                                                   MYSQL_TYPE_LONG,
                                                   &topology,
                                                   GNUNET_YES,
+                                                  MYSQL_TYPE_FLOAT,
+                                                  &topology_modifier,
+                                                  MYSQL_TYPE_FLOAT,
+                                                  &logNMultiplier,
                                                   MYSQL_TYPE_LONG,
                                                   &puts,
                                                   GNUNET_YES,

Modified: GNUnet/src/applications/dhtlog_mysql/dhtlog_test.c
===================================================================
--- GNUnet/src/applications/dhtlog_mysql/dhtlog_test.c  2009-08-31 17:09:31 UTC 
(rev 8907)
+++ GNUnet/src/applications/dhtlog_mysql/dhtlog_test.c  2009-08-31 17:10:36 UTC 
(rev 8908)
@@ -63,7 +63,8 @@
   memset (&k1, 0, sizeof (GNUNET_HashCode));
   memset (&k2, 1, sizeof (GNUNET_HashCode));
 
-  ret = api->insert_trial (&trialuid, i, 5, 0, 0, 0, 0);
+  ret =
+    api->insert_trial (&trialuid, i, 5, .75, .25, 0, 0, 0, 0, 0, 0, 0, 0, "");
   fprintf (stderr, "Trial uid is %llu\n", trialuid);
 
   if (ret != GNUNET_OK)
@@ -96,21 +97,21 @@
   fprintf (stderr, "Sql uid for dht query is %llu\n", sqlqueryuid);
 
   ret =
-    api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 3, 1, &p1, &k2,
+    api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 3, 1, 0, &p1, &k2,
                        &p4, &p3);
   fprintf (stderr, "Sql uid for dht route is %llu\n", sqlrouteuid);
   ret =
-    api->insert_route (&sqlrouteuid, sqlqueryuid, 2, 7, 0, &p3, &k1,
+    api->insert_route (&sqlrouteuid, sqlqueryuid, 2, 7, 0, 0, &p3, &k1,
                        &p4, &p2);
   fprintf (stderr, "Sql uid for dht route is %llu\n", sqlrouteuid);
   ret =
-    api->insert_route (&sqlrouteuid, sqlqueryuid, 3, 9, 1, &p3, &k2,
+    api->insert_route (&sqlrouteuid, sqlqueryuid, 3, 9, 1, 0, &p3, &k2,
                        &p2, NULL);
   fprintf (stderr, "Sql uid for dht route is %llu\n", sqlrouteuid);
 
   sleep (1);
   fprintf (stderr, "Updating trial %llu with endtime of now\n", trialuid);
-  ret = api->update_trial (trialuid);
+  ret = api->update_trial (trialuid, 0, 0);
 
   if (ret != GNUNET_OK)
     {