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

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2009-06-10 04:22:52 -0400 (Wed, 10 Jun 2009)
New Revision: 352

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/transfer.ml
Log:
* Fixed bug resulting in slow performances when transferring a file
  using our rsync implementation from a 64-bit architecture to a
  32-bit architecture.


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2009-06-09 15:46:38 UTC (rev 351)
+++ trunk/src/RECENTNEWS	2009-06-10 08:22:52 UTC (rev 352)
@@ -1,5 +1,12 @@
 CHANGES FROM VERSION 2.35.-17
 
+* Fixed bug resulting in slow performances when transferring a file
+  using our rsync implementation from a 64-bit architecture to a
+  32-bit architecture.
+
+-------------------------------
+CHANGES FROM VERSION 2.35.-17
+
 * Bumped minor version: many incompatible protocol changes
 
 * Message lengths are checksummed to guard against protocol corruption

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2009-06-09 15:46:38 UTC (rev 351)
+++ trunk/src/mkProjectInfo.ml	2009-06-10 08:22:52 UTC (rev 352)
@@ -160,3 +160,4 @@
 
 
 
+

Modified: trunk/src/transfer.ml
===================================================================
--- trunk/src/transfer.ml	2009-06-09 15:46:38 UTC (rev 351)
+++ trunk/src/transfer.ml	2009-06-10 08:22:52 UTC (rev 352)
@@ -449,6 +449,10 @@
         [] ->
           ()
       | (cs, fp) :: r ->
+          (* Negative 31-bits integers are sign-extended when
+             unmarshalled on a 64-bit architecture, so we
+             truncate them back to 31 bits. *)
+          let cs = cs land 0x7fffffff in
           let h = (hash cs) land (hashTableLength - 1) in
           hashTable.(h) <- (k, cs, fp)::(hashTable.(h));
           addList (k + 1) r