[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9764 - GNUnet/src/applications/fs/gap
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9764 - GNUnet/src/applications/fs/gap |
Date: |
Tue, 15 Dec 2009 14:10:56 +0100 |
Author: grothoff
Date: 2009-12-15 14:10:56 +0100 (Tue, 15 Dec 2009)
New Revision: 9764
Modified:
GNUnet/src/applications/fs/gap/gap.c
GNUnet/src/applications/fs/gap/querymanager.c
GNUnet/src/applications/fs/gap/test_star_topology.c
Log:
fixes
Modified: GNUnet/src/applications/fs/gap/gap.c
===================================================================
--- GNUnet/src/applications/fs/gap/gap.c 2009-12-15 13:07:26 UTC (rev
9763)
+++ GNUnet/src/applications/fs/gap/gap.c 2009-12-15 13:10:56 UTC (rev
9764)
@@ -215,14 +215,9 @@
req->have_more += GNUNET_GAP_HAVE_MORE_INCREMENT;
want_more = GNUNET_SYSERR;
}
- if (stats != NULL)
- {
- stats->change (stat_trust_earned, req->value_offered);
- req->value_offered = 0;
- }
req->remaining_value = 0;
GNUNET_cron_add_job (cron,
- send_delayed,
+ &send_delayed,
GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK,
GNUNET_GAP_TTL_DECREMENT), 0, msg);
ret =
@@ -271,7 +266,7 @@
GNUNET_CronTime minTTL;
unsigned int total;
int ret;
-
+
GNUNET_GE_ASSERT (NULL, query_count > 0);
GNUNET_mutex_lock (GNUNET_FS_lock);
index = get_table_index (&queries[0]);
@@ -489,9 +484,9 @@
blocked[block_count++] = rl->response_target;
GNUNET_FS_PT_change_rc (rl->response_target, 1);
- rl->value_offered = 0;
if (stats != NULL)
stats->change (stat_trust_earned, rl->value_offered);
+ rl->value_offered = 0;
if (rl->type != GNUNET_ECRS_BLOCKTYPE_DATA)
GNUNET_FS_SHARED_mark_response_seen (&hc, rl);
GNUNET_FS_PLAN_success (rid, NULL, rl->response_target, rl);
@@ -499,7 +494,6 @@
rl_value = rl->value;
total_priority -= rl->value;
rl->value = 0;
-
if (rl->type == GNUNET_ECRS_BLOCKTYPE_DATA)
{
if (prev == NULL)
Modified: GNUnet/src/applications/fs/gap/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/gap/querymanager.c 2009-12-15 13:07:26 UTC
(rev 9763)
+++ GNUnet/src/applications/fs/gap/querymanager.c 2009-12-15 13:10:56 UTC
(rev 9764)
@@ -547,6 +547,7 @@
primary_query,
expirationTime, size, data, &value))
{
+ value++; // FIXME...
if (prev != NULL)
prev->next = rl->next;
else
@@ -585,7 +586,7 @@
struct ClientDataList *cl;
struct ClientDataList *prev;
struct RequestList *rl;
-
+
GNUNET_mutex_lock (GNUNET_FS_lock);
cl = clients;
prev = NULL;
Modified: GNUnet/src/applications/fs/gap/test_star_topology.c
===================================================================
--- GNUnet/src/applications/fs/gap/test_star_topology.c 2009-12-15 13:07:26 UTC
(rev 9763)
+++ GNUnet/src/applications/fs/gap/test_star_topology.c 2009-12-15 13:10:56 UTC
(rev 9764)
@@ -99,11 +99,14 @@
return NULL;
}
buf = GNUNET_malloc_large (size);
- memset (buf, size + size / 253, size);
- for (i = 0; i < (int) (size - 42 - sizeof (GNUNET_HashCode));
- i += sizeof (GNUNET_HashCode))
- GNUNET_hash (&buf[i + sizeof (GNUNET_HashCode)], 42,
- (GNUNET_HashCode *) & buf[i]);
+ memset (buf, size + size / 253, sizeof(GNUNET_HashCode));
+ for (i = 0; i < (size / sizeof (GNUNET_HashCode))-1;i++)
+ {
+ buf[i*sizeof (GNUNET_HashCode)] = i;
+ GNUNET_hash (&buf[i * sizeof (GNUNET_HashCode)],
+ sizeof (GNUNET_HashCode),
+ (GNUNET_HashCode *) &buf[(i+1) * sizeof(GNUNET_HashCode)]);
+ }
WRITE (fd, buf, size);
GNUNET_free (buf);
GNUNET_disk_file_close (ectx, name, fd);
@@ -148,16 +151,20 @@
fd = GNUNET_disk_file_open (ectx, tmpName, O_RDONLY);
if (fd == -1)
{
+ GNUNET_GE_BREAK (NULL, 0);
GNUNET_free (tmpName);
return GNUNET_SYSERR;
}
buf = GNUNET_malloc (size);
in = GNUNET_malloc (size);
- memset (buf, size + size / 253, size);
- for (i = 0; i < (int) (size - 42 - sizeof (GNUNET_HashCode));
- i += sizeof (GNUNET_HashCode))
- GNUNET_hash (&buf[i + sizeof (GNUNET_HashCode)], 42,
- (GNUNET_HashCode *) & buf[i]);
+ memset (buf, size + size / 253, sizeof(GNUNET_HashCode));
+ for (i = 0; i < (size / sizeof (GNUNET_HashCode))-1;i++)
+ {
+ buf[i*sizeof (GNUNET_HashCode)] = i;
+ GNUNET_hash (&buf[i * sizeof (GNUNET_HashCode)],
+ sizeof (GNUNET_HashCode),
+ (GNUNET_HashCode *) &buf[(i+1) *
sizeof(GNUNET_HashCode)]);
+ }
if (size != READ (fd, in, size))
ret = GNUNET_SYSERR;
else if (0 == memcmp (buf, in, size))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9764 - GNUnet/src/applications/fs/gap,
gnunet <=