[gnome-builder] egg-task-cache: fix eviction GSource



commit c3db3d29f3fc2076d46548a0455fa641603d445b
Author: Christian Hergert <christian hergert me>
Date:   Tue May 12 23:47:17 2015 -0700

    egg-task-cache: fix eviction GSource
    
    *timeout was already -1, so we wouldn't overwrite with the eviction
    timeout for the cache item.

 contrib/egg/egg-task-cache.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/contrib/egg/egg-task-cache.c b/contrib/egg/egg-task-cache.c
index 185d213..9270683 100644
--- a/contrib/egg/egg-task-cache.c
+++ b/contrib/egg/egg-task-cache.c
@@ -101,12 +101,12 @@ evict_source_prepare (GSource *source,
       now = g_source_get_time (source);
       item = egg_heap_peek (ev->heap, gpointer);
 
-      if (item->evict_at < now)
+      if (item->evict_at <= now)
         return TRUE;
 
       evict_at = (item->evict_at - now) / 1000L;
 
-      if (evict_at < *timeout)
+      if (*timeout == -1)
         {
           *timeout = evict_at;
           return FALSE;
@@ -491,7 +491,7 @@ egg_task_cache_do_eviction (gpointer user_data)
 
       item = egg_heap_peek (self->evict_heap, gpointer);
 
-      if (item->evict_at < now)
+      if (item->evict_at <= now)
         {
           egg_heap_extract (self->evict_heap, NULL);
           egg_task_cache_evict_full (self, item->key, FALSE);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]