[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14727 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14727 - gnunet/src/fs |
Date: |
Fri, 25 Mar 2011 16:13:45 +0100 |
Author: grothoff
Date: 2011-03-25 16:13:45 +0100 (Fri, 25 Mar 2011)
New Revision: 14727
Modified:
gnunet/src/fs/gnunet-service-fs_pr.c
gnunet/src/fs/test_fs_download.c
gnunet/src/fs/test_fs_namespace.c
gnunet/src/fs/test_fs_namespace_data.conf
Log:
polishing
Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c 2011-03-25 14:29:08 UTC (rev
14726)
+++ gnunet/src/fs/gnunet-service-fs_pr.c 2011-03-25 15:13:45 UTC (rev
14727)
@@ -958,7 +958,7 @@
{
#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No further local repsonses available.\n");
+ "No further local responses available.\n");
#endif
pr->qe = NULL;
if (NULL != (cont = pr->llc_cont))
Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c 2011-03-25 14:29:08 UTC (rev 14726)
+++ gnunet/src/fs/test_fs_download.c 2011-03-25 15:13:45 UTC (rev 14727)
@@ -150,7 +150,7 @@
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
- printf ("Publishing complete, %llu kbps.\n",
+ printf ("Publishing complete, %llu kb/s.\n",
(unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL));
GAUGER ("FS",
"Publishing speed (insertion)",
@@ -171,7 +171,7 @@
GNUNET_assert (download != NULL);
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
- printf ("Download complete, %llu kbps.\n",
+ printf ("Download complete, %llu kb/s.\n",
(unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL));
GAUGER ("FS",
"Local download speed (inserted)",
Modified: gnunet/src/fs/test_fs_namespace.c
===================================================================
--- gnunet/src/fs/test_fs_namespace.c 2011-03-25 14:29:08 UTC (rev 14726)
+++ gnunet/src/fs/test_fs_namespace.c 2011-03-25 15:13:45 UTC (rev 14727)
@@ -22,16 +22,13 @@
* @file fs/test_fs_namespace.c
* @brief Test for fs_namespace.c
* @author Christian Grothoff
- *
- * TODO:
- * - add timeout task
*/
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_arm_service.h"
#include "gnunet_fs_service.h"
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
#define START_ARM GNUNET_YES
@@ -49,6 +46,8 @@
static struct GNUNET_FS_SearchContext *ksk_search;
+static GNUNET_SCHEDULER_TaskIdentifier kill_task;
+
static int update_started;
static int err;
@@ -91,6 +90,8 @@
GNUNET_OS_process_close (p->arm_proc);
p->arm_proc = NULL;
#endif
+ if (GNUNET_SCHEDULER_NO_TASK != kill_task)
+ GNUNET_SCHEDULER_cancel (kill_task);
GNUNET_CONFIGURATION_destroy (p->cfg);
}
@@ -132,6 +133,19 @@
}
+static void
+do_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ fprintf (stderr,
+ "Operation timed out\n");
+ kill_task = GNUNET_SCHEDULER_NO_TASK;
+ abort_sks_search_task (NULL, tc);
+ abort_ksk_search_task (NULL, tc);
+}
+
+
+
static void *
progress_cb (void *cls,
const struct GNUNET_FS_ProgressInfo *event)
@@ -370,6 +384,9 @@
expiration,
"root",
&adv_cont, NULL);
+ kill_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ &do_timeout,
+ NULL);
GNUNET_FS_uri_destroy (ksk_uri);
GNUNET_FS_namespace_delete (ns, GNUNET_NO);
GNUNET_CONTAINER_meta_data_destroy (meta);
Modified: gnunet/src/fs/test_fs_namespace_data.conf
===================================================================
--- gnunet/src/fs/test_fs_namespace_data.conf 2011-03-25 14:29:08 UTC (rev
14726)
+++ gnunet/src/fs/test_fs_namespace_data.conf 2011-03-25 15:13:45 UTC (rev
14727)
@@ -37,7 +37,7 @@
PORT = 42471
HOSTNAME = localhost
IDENTITY_DIR = $SERVICEHOME/pseudos/
-# DEBUG = YES
+DEBUG = YES
[testing]
WEAKRANDOM = YES
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14727 - gnunet/src/fs,
gnunet <=