[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10599 - in gnunet/src: core hostlist statistics testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10599 - in gnunet/src: core hostlist statistics testing |
Date: |
Mon, 15 Mar 2010 13:29:02 +0100 |
Author: grothoff
Date: 2010-03-15 13:29:02 +0100 (Mon, 15 Mar 2010)
New Revision: 10599
Modified:
gnunet/src/core/gnunet-service-core.c
gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
gnunet/src/statistics/gnunet-statistics.c
gnunet/src/testing/testing.c
Log:
increase some timeouts, decrease others
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2010-03-15 10:00:32 UTC (rev
10598)
+++ gnunet/src/core/gnunet-service-core.c 2010-03-15 12:29:02 UTC (rev
10599)
@@ -3295,6 +3295,13 @@
(n->status != PEER_STATE_KEY_CONFIRMED))
{
GNUNET_break_op (0);
+ /* blacklist briefly (?); might help recover (?) */
+ GNUNET_TRANSPORT_blacklist (sched, cfg,
+ &n->peer,
+ GNUNET_TIME_UNIT_SECONDS,
+ GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS,
+ 5),
+ NULL, NULL);
return;
}
handle_encrypted_message (n, (const struct EncryptedMessage *) message);
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist.c 2010-03-15 10:00:32 UTC
(rev 10598)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist.c 2010-03-15 12:29:02 UTC
(rev 10599)
@@ -225,8 +225,7 @@
ok++;
sched = s;
timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS,
-
15),
+ TIMEOUT,
&timeout_error,
NULL);
GNUNET_SCHEDULER_add_delayed (sched,
Modified: gnunet/src/statistics/gnunet-statistics.c
===================================================================
--- gnunet/src/statistics/gnunet-statistics.c 2010-03-15 10:00:32 UTC (rev
10598)
+++ gnunet/src/statistics/gnunet-statistics.c 2010-03-15 12:29:02 UTC (rev
10599)
@@ -30,7 +30,7 @@
#include "gnunet_statistics_service.h"
#include "statistics.h"
-#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
15)
+#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
/**
* Final status code.
@@ -89,7 +89,11 @@
struct GNUNET_STATISTICS_Handle *h = cls;
if (success != GNUNET_OK)
- ret = 1;
+ {
+ fprintf (stderr,
+ _("Failed to obtain statistics.\n"));
+ ret = 1;
+ }
if (h != NULL)
GNUNET_STATISTICS_destroy (h,
GNUNET_NO);
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2010-03-15 10:00:32 UTC (rev 10598)
+++ gnunet/src/testing/testing.c 2010-03-15 12:29:02 UTC (rev 10599)
@@ -504,6 +504,10 @@
#endif
cc = GNUNET_CLIENT_connect (d->sched, "arm", d->cfg);
GNUNET_CLIENT_service_shutdown (cc);
+ /* FIXME: replace shutdown sequence via client with
+ shutdown via signal and waitpid; then we don't need
+ to sleep here any longer... */
+ sleep (1);
/* state clean up and notifications */
if (0 != UNLINK (d->cfgfile))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10599 - in gnunet/src: core hostlist statistics testing,
gnunet <=