[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14724 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14724 - gnunet/src/fs |
Date: |
Fri, 25 Mar 2011 14:17:52 +0100 |
Author: grothoff
Date: 2011-03-25 14:17:52 +0100 (Fri, 25 Mar 2011)
New Revision: 14724
Modified:
gnunet/src/fs/gnunet-service-fs.h
gnunet/src/fs/gnunet-service-fs_pr.c
gnunet/src/fs/test_fs_download.c
gnunet/src/fs/test_fs_download_indexed.c
Log:
handle indexed data correctly:
Modified: gnunet/src/fs/gnunet-service-fs.h
===================================================================
--- gnunet/src/fs/gnunet-service-fs.h 2011-03-25 12:49:27 UTC (rev 14723)
+++ gnunet/src/fs/gnunet-service-fs.h 2011-03-25 13:17:52 UTC (rev 14724)
@@ -33,7 +33,7 @@
#include "gnunet_block_lib.h"
#include "fs.h"
-#define DEBUG_FS GNUNET_NO
+#define DEBUG_FS GNUNET_YES
/**
Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c 2011-03-25 12:49:27 UTC (rev
14723)
+++ gnunet/src/fs/gnunet-service-fs_pr.c 2011-03-25 13:17:52 UTC (rev
14724)
@@ -1080,7 +1080,9 @@
pr->llc_cont_cls = cont_cls;
pr->qe = GNUNET_DATASTORE_get (GSF_dsh,
&pr->public_data.query,
- pr->public_data.type,
+ pr->public_data.type ==
GNUNET_BLOCK_TYPE_FS_DBLOCK
+ ? GNUNET_BLOCK_TYPE_ANY
+ : pr->public_data.type,
1 /* queue priority */,
1 /* max queue size */,
GNUNET_TIME_UNIT_FOREVER_REL,
Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c 2011-03-25 12:49:27 UTC (rev 14723)
+++ gnunet/src/fs/test_fs_download.c 2011-03-25 13:17:52 UTC (rev 14724)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2004, 2005, 2006, 2008, 2009 Christian Grothoff (and other
contributing authors)
+ (C) 2004, 2005, 2006, 2008, 2009, 2011 Christian Grothoff (and other
contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -153,7 +153,7 @@
printf ("Publishing complete, %llu kbps.\n",
(unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL));
GAUGER ("FS",
- "Publishing speed",
+ "Publishing speed (insertion)",
(unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL),
"kb/s");
fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst");
@@ -174,7 +174,7 @@
printf ("Download complete, %llu kbps.\n",
(unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL));
GAUGER ("FS",
- "Local download speed",
+ "Local download speed (inserted)",
(unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL),
"kb/s");
GNUNET_SCHEDULER_add_now (&abort_download_task,
Modified: gnunet/src/fs/test_fs_download_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_download_indexed.c 2011-03-25 12:49:27 UTC (rev
14723)
+++ gnunet/src/fs/test_fs_download_indexed.c 2011-03-25 13:17:52 UTC (rev
14724)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2004, 2005, 2006, 2008, 2009 Christian Grothoff (and other
contributing authors)
+ (C) 2004, 2005, 2006, 2008, 2009, 2011 Christian Grothoff (and other
contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -28,6 +28,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_arm_service.h"
#include "gnunet_fs_service.h"
+#include <gauger.h>
#define VERBOSE GNUNET_NO
@@ -151,6 +152,10 @@
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
printf ("Publishing complete, %llu kbps.\n",
(unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL));
+ GAUGER ("FS",
+ "Publishing speed (indexing)",
+ (unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL),
+ "kb/s");
fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst");
start = GNUNET_TIME_absolute_get ();
download = GNUNET_FS_download_start (fs,
@@ -168,6 +173,10 @@
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
printf ("Download complete, %llu kbps.\n",
(unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL));
+ GAUGER ("FS",
+ "Local download speed (indexed)",
+ (unsigned long long) (FILESIZE * 1000LL /
(1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL),
+ "kb/s");
GNUNET_SCHEDULER_add_now (&abort_download_task,
NULL);
break;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14724 - gnunet/src/fs,
gnunet <=