[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59473] trunk/blender/source/blender/ blenlib/intern: revert bucket size change (edgehash was this way for years, since r26206, ghash since r57657)

[Campbell Barton]

Revision: 59473
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59473
Author:   campbellbarton
Date:     2013-08-24 15:09:57 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
revert bucket size change (edgehash was this way for years, since r26206, ghash since r57657)
having 2 free buckets for each entry is faster but uses more memory.

use the original size, best case 3 entries per bucket.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=26206
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57657

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
    trunk/blender/source/blender/blenlib/intern/edgehash.c

Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-08-24 15:02:12 UTC (rev 59472)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-08-24 15:09:57 UTC (rev 59473)
@@ -88,7 +88,7 @@
 
 BLI_INLINE bool ghash_test_expand_buckets(const unsigned int nentries, const unsigned int nbuckets)
 {
-	return (nentries > nbuckets / 2);
+	return (nentries > nbuckets * 3);
 }
 
 BLI_INLINE unsigned int ghash_keyhash(GHash *gh, const void *key)

Modified: trunk/blender/source/blender/blenlib/intern/edgehash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/edgehash.c	2013-08-24 15:02:12 UTC (rev 59472)
+++ trunk/blender/source/blender/blenlib/intern/edgehash.c	2013-08-24 15:09:57 UTC (rev 59473)
@@ -88,7 +88,7 @@
 
 BLI_INLINE bool edgehash_test_expand_buckets(const unsigned int nentries, const unsigned int nbuckets)
 {
-	return (nentries > nbuckets / 2);
+	return (nentries > nbuckets * 3);
 }
 
 BLI_INLINE unsigned int edgehash_keyhash(EdgeHash *eh, unsigned int v0, unsigned int v1)