[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10997 - gnunet/src/hostlist
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10997 - gnunet/src/hostlist |
Date: |
Tue, 20 Apr 2010 17:15:39 +0200 |
Author: wachs
Date: 2010-04-20 17:15:39 +0200 (Tue, 20 Apr 2010)
New Revision: 10997
Modified:
gnunet/src/hostlist/Makefile.am
gnunet/src/hostlist/hostlist-client.c
gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
gnunet/src/hostlist/test_learning_adv_peer.conf
gnunet/src/hostlist/test_learning_learn_peer.conf
Log:
Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am 2010-04-20 14:26:45 UTC (rev 10996)
+++ gnunet/src/hostlist/Makefile.am 2010-04-20 15:15:39 UTC (rev 10997)
@@ -48,6 +48,7 @@
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/arm/libgnunetarm.la \
$(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
Modified: gnunet/src/hostlist/hostlist-client.c
===================================================================
--- gnunet/src/hostlist/hostlist-client.c 2010-04-20 14:26:45 UTC (rev
10996)
+++ gnunet/src/hostlist/hostlist-client.c 2010-04-20 15:15:39 UTC (rev
10997)
@@ -497,6 +497,10 @@
{
current_hostlist->times_used++;
current_hostlist->quality = checked_add ( current_hostlist->quality,
HOSTLIST_SUCCESSFUL_DOWNLOAD);
+ GNUNET_STATISTICS_update ( stats,
+ gettext_noop("Learned URI downloaded"),
+ 1,
+ GNUNET_YES);
}
else
current_hostlist->quality = checked_sub ( current_hostlist->quality,
HOSTLIST_FAILED_DOWNLOAD );
@@ -1192,7 +1196,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("%u hostlist URIs loaded from file\n"), counter);
GNUNET_STATISTICS_set (stats,
- gettext_noop("# hostlis URIs read from file"),
+ gettext_noop("# hostlist URIs read from file"),
counter,
GNUNET_YES);
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c 2010-04-20
14:26:45 UTC (rev 10996)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c 2010-04-20
15:15:39 UTC (rev 10997)
@@ -28,6 +28,7 @@
#include "gnunet_core_service.h"
#include "gnunet_transport_service.h"
#include "gnunet_resolver_service.h"
+#include "gnunet_statistics_service.h"
#define VERBOSE GNUNET_YES
@@ -42,6 +43,7 @@
static int timeout;
static int adv_arrived;
+static int learned_hostlist_downloaded;
static struct GNUNET_SCHEDULER_Handle *sched;
@@ -55,6 +57,7 @@
struct GNUNET_MessageHeader *hello;
struct GNUNET_ARM_Handle *arm;
struct GNUNET_CORE_Handle *core;
+ struct GNUNET_STATISTICS_Handle *stats;
#if START_ARM
pid_t arm_pid;
#endif
@@ -121,14 +124,38 @@
clean_up (NULL, tc);
}
+static int
+process_stat (void *cls,
+ const char *subsystem,
+ const char *name,
+ uint64_t value,
+ int is_persistent)
+{
+
+ if ( GNUNET_YES == GNUNET_YES)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Client has successfully downloaded advertised URI \n"));
+ learned_hostlist_downloaded = GNUNET_YES;
+ }
+ if ( GNUNET_NO != learned_hostlist_downloaded )
+ shutdown_testcase();
+ return GNUNET_OK;
+}
+
/**
* Check the server statistics regularly
*/
static void
check_statistics (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Checking server stats...\n");
+ GNUNET_STATISTICS_get (learn_peer.stats,
+ "hostlist",
+ gettext_noop("Learned URI downloaded"),
+ GNUNET_TIME_UNIT_MINUTES,
+ NULL,
+ &process_stat,
+ NULL);
check_task = GNUNET_SCHEDULER_add_delayed (sched,
CHECK_INTERVALL,
&check_statistics,
@@ -191,7 +218,6 @@
"Expected URI `%s' and recieved URI `%s' differ\n",
expected_uri, recv_uri);
GNUNET_free ( expected_uri );
GNUNET_free ( hostname );
- shutdown_testcase();
return GNUNET_OK;
}
@@ -228,10 +254,11 @@
result = remove (filename);
if (result == 0)
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Hostlist hostlist file `%s' was removed\n"),filename);
+ _("Hostlist file `%s' was removed\n"),filename);
}
}
- GNUNET_free ( filename );
+ if ( NULL != filename) GNUNET_free ( filename );
+
GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
p->core = GNUNET_CORE_connect (sched, p->cfg,
@@ -243,6 +270,8 @@
NULL, GNUNET_NO,
learn_handlers );
GNUNET_assert ( NULL != p->core );
+ p->stats = GNUNET_STATISTICS_create (sched, "hostlist", p->cfg);
+ GNUNET_assert ( NULL != p->stats );
}
@@ -334,6 +363,7 @@
{
timeout = GNUNET_NO;
adv_arrived = GNUNET_NO;
+ learned_hostlist_downloaded = GNUNET_NO;
sched = s;
timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
TIMEOUT,
@@ -370,10 +400,25 @@
argv, "test-gnunet-daemon-hostlist",
"nohelp", options, &run, NULL);
- if ( (timeout == GNUNET_YES) || (adv_arrived == GNUNET_NO))
+ if (timeout == GNUNET_YES)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Testcase could not set up two communicating peers,
timeout\n");
return GNUNET_YES;
- else
- return GNUNET_NO;
+ }
+ if (adv_arrived == GNUNET_NO)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Learning peer did not recieve advertisement from server\n");
+ return GNUNET_YES;
+ }
+ if (learned_hostlist_downloaded == GNUNET_NO)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Advertisement hostlist could not be downloaded from
server\n");
+ return GNUNET_YES;
+ }
+ return GNUNET_NO;
}
int
Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf 2010-04-20 14:26:45 UTC
(rev 10996)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf 2010-04-20 15:15:39 UTC
(rev 10997)
@@ -37,7 +37,7 @@
HTTPPORT = 12981s
SERVERS = http://localhost:12980/
OPTIONS = -b -p -a
-DEBUG = YES
+DEBUG = NO
HOSTLISTFILE = hostlists_adv_peer.file
#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
Modified: gnunet/src/hostlist/test_learning_learn_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer.conf 2010-04-20 14:26:45 UTC
(rev 10996)
+++ gnunet/src/hostlist/test_learning_learn_peer.conf 2010-04-20 15:15:39 UTC
(rev 10997)
@@ -36,7 +36,7 @@
HTTPPORT = 12980
SERVERS = http://localhost:12981/
OPTIONS = -b -p -e
-DEBUG = YES
+#DEBUG = YES
HOSTLISTFILE = hostlists_learn_peer.file
#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10997 - gnunet/src/hostlist,
gnunet <=