[GNUnet-SVN] r8970 - in GNUnet/src: applications/dhtlog_mysql include

[gnunet]

Author: nevans
Date: 2009-09-08 17:45:51 -0600 (Tue, 08 Sep 2009)
New Revision: 8970

Modified:
   GNUnet/src/applications/dhtlog_mysql/dhtlog_mysql.c
   GNUnet/src/include/gnunet_dhtlog_service.h
Log:
logging addition

Modified: GNUnet/src/applications/dhtlog_mysql/dhtlog_mysql.c
===================================================================
--- GNUnet/src/applications/dhtlog_mysql/dhtlog_mysql.c 2009-09-08 23:42:30 UTC 
(rev 8969)
+++ GNUnet/src/applications/dhtlog_mysql/dhtlog_mysql.c 2009-09-08 23:45:51 UTC 
(rev 8970)
@@ -69,7 +69,7 @@
                           "VALUES (?, ?, ?)"
 static struct GNUNET_MysqlStatementHandle *insert_dhtkey;
 
-#define UPDATE_TRIALS_STMT "UPDATE trials set endtime=NOW(), 
totalMessagesDropped = ?, totalBytesDropped = ? where trialuid = ?"
+#define UPDATE_TRIALS_STMT "UPDATE trials set endtime=NOW(), 
totalMessagesDropped = ?, totalBytesDropped = ?, unknownPeers = ?, where 
trialuid = ?"
 static struct GNUNET_MysqlStatementHandle *update_trial;
 
 #define UPDATE_CONNECTIONS_STMT "UPDATE trials set totalConnections = ? where 
trialuid = ?"
@@ -157,6 +157,7 @@
              "`message` text NOT NULL,"
              "`totalMessagesDropped` int(10) unsigned NOT NULL,"
              "`totalBytesDropped` int(10) unsigned NOT NULL,"
+             "`unknownPeers` int(10) unsigned NOT NULL,"
              "PRIMARY KEY  (`trialuid`),"
              "UNIQUE KEY `trialuid` (`trialuid`)"
              ") ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1"))
@@ -241,7 +242,8 @@
            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, int maxnetbps, char *message)
+           int malicious_droppers, unsigned long long maxnetbps,
+           char *message)
 {
   int ret;
   unsigned long long m_len;
@@ -462,7 +464,8 @@
 int
 update_trials (unsigned long long trialuid,
                unsigned long long totalMessagesDropped,
-               unsigned long long totalBytesDropped)
+               unsigned long long totalBytesDropped,
+               unsigned long long unknownPeers)
 {
   int ret;
 #if DEBUG_DHTLOG
@@ -482,6 +485,9 @@
                                                   &totalBytesDropped,
                                                   GNUNET_YES,
                                                   MYSQL_TYPE_LONGLONG,
+                                                  &unknownPeers,
+                                                  GNUNET_YES,
+                                                  MYSQL_TYPE_LONGLONG,
                                                   &trialuid, GNUNET_YES, -1)))
     {
       if (ret == GNUNET_SYSERR)

Modified: GNUnet/src/include/gnunet_dhtlog_service.h
===================================================================
--- GNUnet/src/include/gnunet_dhtlog_service.h  2009-09-08 23:42:30 UTC (rev 
8969)
+++ GNUnet/src/include/gnunet_dhtlog_service.h  2009-09-08 23:45:51 UTC (rev 
8970)
@@ -86,14 +86,16 @@
                        float logNMultiplier, int puts, int gets,
                        int concurrent, int settle_time, int num_rounds,
                        int malicious_getters, int malicious_putters,
-                       int malicious_droppers, int maxnetbps, char *message);
+                       int malicious_droppers, unsigned long long maxnetbps,
+                       char *message);
 
   /*
    * Update the trial information with the ending time and dropped message 
stats
    */
   int (*update_trial) (unsigned long long trialuid,
                        unsigned long long totalMessagesDropped,
-                       unsigned long long totalBytesDropped);
+                       unsigned long long totalBytesDropped,
+                       unsigned long long unknownPeers);
 
   /*
    * Update the trial information with the total connections