[GNUnet-SVN] r12507 - gnunet/src/include

[gnunet]

Author: nevans
Date: 2010-08-10 17:18:18 +0200 (Tue, 10 Aug 2010)
New Revision: 12507

Modified:
   gnunet/src/include/gnunet_core_service.h
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/include/gnunet_testing_lib.h
Log:
testing function definitions, minor stuff

Modified: gnunet/src/include/gnunet_core_service.h
===================================================================
--- gnunet/src/include/gnunet_core_service.h    2010-08-10 15:17:00 UTC (rev 
12506)
+++ gnunet/src/include/gnunet_core_service.h    2010-08-10 15:18:18 UTC (rev 
12507)
@@ -87,7 +87,7 @@
 
 
 /**
- * Method called whenever a given peer either disconnects.
+ * Method called whenever a peer disconnects.
  *
  * @param cls closure
  * @param peer peer identity this notification is about

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2010-08-10 15:17:00 UTC (rev 
12506)
+++ gnunet/src/include/gnunet_protocols.h       2010-08-10 15:18:18 UTC (rev 
12507)
@@ -566,6 +566,11 @@
 #define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 151
 
 /**
+ * P2P DHT PING request type
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_PING 152
+
+/**
  * Hostlist advertisement message
  */
 #define GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT 160

Modified: gnunet/src/include/gnunet_testing_lib.h
===================================================================
--- gnunet/src/include/gnunet_testing_lib.h     2010-08-10 15:17:00 UTC (rev 
12506)
+++ gnunet/src/include/gnunet_testing_lib.h     2010-08-10 15:18:18 UTC (rev 
12507)
@@ -33,6 +33,7 @@
 #define GNUNET_TESTING_LIB_H
 
 #include "gnunet_util_lib.h"
+#include "gnunet_statistics_service.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -615,8 +616,34 @@
                               GNUNET_TESTING_NotifyCompletion cb,
                               void *cb_cls);
 
+/**
+ * Callback function to process statistic values.
+ *
+ * @param cls closure
+ * @param peer the peer the statistics belong to
+ * @param subsystem name of subsystem that created the statistic
+ * @param name the name of the datum
+ * @param value the current value
+ * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
+ * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ */
+typedef int (*GNUNET_TESTING_STATISTICS_Iterator) (void *cls,
+                                                   const struct 
GNUNET_PeerIdentity *peer,
+                                                   const char *subsystem,
+                                                   const char *name,
+                                                   uint64_t value,
+                                                   int is_persistent);
 
 /**
+ * Iterate over all (running) peers in the peer group, retrieve
+ * all statistics from each.
+ */
+void
+GNUNET_TESTING_get_statistics (struct GNUNET_TESTING_PeerGroup *pg,
+                               GNUNET_STATISTICS_Callback cont,
+                               GNUNET_TESTING_STATISTICS_Iterator proc, void 
*cls);
+
+/**
  * Topologies supported for testbeds.
  */
 enum GNUNET_TESTING_Topology