[Unison-hackers] [unison-svn] r384 - trunk/src

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2009-08-07 07:39:21 -0400 (Fri, 07 Aug 2009)
New Revision: 384

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/transfer.ml
Log:
* Transfer by rsync algorithm: fix the hashtable size limit to be
  below the maximum length of an array.


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2009-08-03 17:09:46 UTC (rev 383)
+++ trunk/src/RECENTNEWS	2009-08-07 11:39:21 UTC (rev 384)
@@ -1,5 +1,11 @@
 CHANGES FROM VERSION 2.37.5
 
+* Transfer by rsync algorithm: fix the hashtable size limit to be
+  below the maximum length of an array.
+
+-------------------------------
+CHANGES FROM VERSION 2.37.5
+
 * GTK UI:
   - pop up a summary window when the replicas are not fully
     synchronized after transport

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2009-08-03 17:09:46 UTC (rev 383)
+++ trunk/src/mkProjectInfo.ml	2009-08-07 11:39:21 UTC (rev 384)
@@ -100,3 +100,4 @@
 
 
 
+

Modified: trunk/src/transfer.ml
===================================================================
--- trunk/src/transfer.ml	2009-08-03 17:09:46 UTC (rev 383)
+++ trunk/src/transfer.ml	2009-08-07 11:39:21 UTC (rev 384)
@@ -468,10 +468,10 @@
 
   (*** CUSTOM HASH TABLE ***)
 
-  (* Maximum number of entries in the hash table.
+  (* Half the maximum number of entries in the hash table.
      MUST be a power of 2 !
      Typical values are around an average 2 * fileSize / blockSize. *)
-  let hashTableMaxLength = 2048 * 1024
+  let hashTableMaxLength = 1024 * 1024
 
   let rec upperPowerOfTwo n n2 =
     if (n2 >= n) || (n2 = hashTableMaxLength) then