[gnumeric] Lookup caches: account for the sizes only when finally inserting into cache

[Morten Welinder <mortenw src gnome org>]

commit e61fee8216bff4b79a2cb97dc39f95d0b7c7c31b
Author: Morten Welinder <terra gnome org>
Date:   Sat Mar 22 21:33:54 2014 -0400

    Lookup caches: account for the sizes only when finally inserting into cache

 plugins/fn-lookup/functions.c |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/plugins/fn-lookup/functions.c b/plugins/fn-lookup/functions.c
index 2a43e23..9982935 100644
--- a/plugins/fn-lookup/functions.c
+++ b/plugins/fn-lookup/functions.c
@@ -361,6 +361,13 @@ get_linear_lookup_cache (GnmFuncEvalInfo *ei,
 static void
 linear_lookup_cache_commit (LinearLookupInfo *pinfo)
 {
+       /*
+        * It is possible to have an entry for the key already in the
+        * cache.  In that case we fail to deduct from total_cache_size
+        * but it really doesn't matter.
+        */
+       total_cache_size += g_hash_table_size (pinfo->h);
+
        g_hash_table_replace (*pinfo->cache, pinfo->key_copy, pinfo->h);
 }
 
@@ -448,6 +455,13 @@ get_bisection_lookup_cache (GnmFuncEvalInfo *ei,
 static void
 bisection_lookup_cache_commit (BisectionLookupInfo *pinfo)
 {
+       /*
+        * It is possible to have an entry for the key already in the
+        * cache.  In that case we fail to deduct from total_cache_size
+        * but it really doesn't matter.
+        */
+       total_cache_size += pinfo->item->n;
+
        g_hash_table_replace (*pinfo->cache, pinfo->key_copy, pinfo->item);
 }
 
@@ -542,7 +556,6 @@ find_index_linear_equal_string (GnmFuncEvalInfo *ei,
                        if (!g_hash_table_lookup_extended (h, vc, NULL, NULL)) {
                                char *sc = g_string_chunk_insert (lookup_string_pool, vc);
                                g_hash_table_insert (h, sc, GINT_TO_POINTER (lp));
-                               total_cache_size++;
                        }
 
                        g_free (vc);
@@ -591,7 +604,6 @@ find_index_linear_equal_float (GnmFuncEvalInfo *ei,
                                gnm_float *fp = go_mem_chunk_alloc (lookup_float_pool);
                                *fp = f2;
                                g_hash_table_insert (h, fp, GINT_TO_POINTER (lp));
-                               total_cache_size++;
                        }
                }
 
@@ -692,8 +704,6 @@ find_index_bisection (GnmFuncEvalInfo *ei,
                bc->data = g_renew (LookupBisectionCacheItemElem,
                                    bc->data,
                                    bc->n);
-               total_cache_size += bc->n;
-
                bisection_lookup_cache_commit (&info);
        }