[GNUnet-SVN] r11386 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-05-15 19:50:41 +0200 (Sat, 15 May 2010)
New Revision: 11386

Modified:
   gnunet/src/fs/fs.h
   gnunet/src/fs/gnunet-service-fs.c
Log:
stuff

Modified: gnunet/src/fs/fs.h
===================================================================
--- gnunet/src/fs/fs.h  2010-05-15 14:58:10 UTC (rev 11385)
+++ gnunet/src/fs/fs.h  2010-05-15 17:50:41 UTC (rev 11386)
@@ -32,6 +32,11 @@
 #include "gnunet_block_lib.h"
 
 /**
+ * Maximum size of the datastore queue for P2P operations.
+ */
+#define MAX_DATASTORE_QUEUE 16
+
+/**
  * Size of the individual blocks used for file-sharing.
  */
 #define DBLOCK_SIZE (32*1024)

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-05-15 14:58:10 UTC (rev 11385)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-05-15 17:50:41 UTC (rev 11386)
@@ -2111,7 +2111,7 @@
                            0, &query, dsize, &put[1],
                            type, prq.priority, 1 /* anonymity */, 
                            expiration, 
-                           0, 64 /* FIXME: use define */,
+                           1 + prq.priority, MAX_DATASTORE_QUEUE,
                            GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                            &put_migration_continuation, 
                            NULL);
@@ -2323,7 +2323,12 @@
                                             &query))
     {
       GNUNET_break (0);
-      /* FIXME: consider removing the block? */
+      GNUNET_DATASTORE_remove (dsh,
+                              key,
+                              size, data,
+                              -1, -1, 
+                              GNUNET_TIME_UNIT_FOREVER_REL,
+                              NULL, NULL);
       GNUNET_DATASTORE_get_next (dsh, GNUNET_YES);
       return;
     }
@@ -2671,8 +2676,8 @@
   pr->qe = GNUNET_DATASTORE_get (dsh,
                                 &gm->query,
                                 type,                         
-                                (unsigned int) preference, 64 /* FIXME */,
-                                
+                                pr->priority + 1,
+                                MAX_DATASTORE_QUEUE,                           
 
                                 timeout,
                                 &process_local_reply,
                                 pr);