fixing #3799: only unindex if DB operations succeeded previously in the first place...

[oweals/gnunet.git] / src / fs / gnunet-service-fs_cp.h

diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h
index 5b20c7cd2113dbefa6a4d7c57f7c666760d11f74..3ca27e814dfae4f8b8164e2c7aa4d486392a4fb4 100644 (file)
--- a/src/fs/gnunet-service-fs_cp.h
+++ b/src/fs/gnunet-service-fs_cp.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 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
@@ -34,18 +34,15 @@
  * Maximum number of outgoing messages we queue per peer.
  *
  * Performance measurements for 2 peer setup for 50 MB file
- * (with MAX_DATASTORE_QUEUE = 1 and RETRY_PROBABILITY_INV = 1):
+ * (using perf_gnunet_service_fs_p2p):
  *
- *   2: 1700 kb/s, 1372 kb/s
- *   8: 2117 kb/s, 1284 kb/s, 1112 kb/s
- *  16: 3500 kb/s, 3200 kb/s, 3388 kb/s
- *  32: 3441 kb/s, 3163 kb/s, 3277 kb/s
- * 128: 1700 kb/s; 2010 kb/s, 3383 kb/s, 1156 kb/s
+ *  24: 2-3 MB/s # ~ 24 MB RAM
+ * 256:   8 MB/s # ~256 MB RAM
  *
- * Conclusion: 16 seems to be a pretty good value (stable
- * and high performance, no excessive memory use).
+ * Conclusion: 24 should suffice (reasonable
+ * performance, no excessive memory use).
  */
-#define MAX_QUEUE_PER_PEER 16
+#define MAX_QUEUE_PER_PEER 24
 
 /**
  * Length of the P2P success tracker.  Note that having a very long
@@ -66,11 +63,6 @@
 struct GSF_PeerPerformanceData
 {
 
-  /**
-   * Transport performance data.
-   */
-  struct GNUNET_ATS_Information *atsi;
-
   /**
    * List of the last clients for which this peer successfully
    * answered a query.