Changeset 979cfb4

Timestamp:

2008-02-03T13:54:19Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8c1eb80

Parents:

0fbda193

Message:

Saner garbage collection of cached packets in the Jabber module. Now
cached packets are removed after about ten minues instead of something
between one and two minutes. Closes one issue in #354.

Location:

protocols/jabber

Files:

• jabber.h (modified) (2 diffs)
• jabber_util.c (modified) (2 diffs)

protocols/jabber/jabber.h

@@ -95 +95 @@
 struct jabber_cache_entry
 {
+        time_t saved_at;
         struct xt_node *node;
         jabber_cache_event func;
@@ -140 +141 @@
 #define JABBER_PACKET_ID "BeeP"
 #define JABBER_CACHED_ID "BeeC"
+
+/* The number of seconds to keep cached packets before garbage collecting
+   them. This gc is done on every keepalive (every minute). */
+#define JABBER_CACHE_MAX_AGE 600
 
 /* RFC 392[01] stuff */

protocols/jabber/jabber_util.c

@@ -142 +142 @@
         entry->node = node;
         entry->func = func;
+        entry->saved_at = time( NULL );
         g_hash_table_insert( jd->node_cache, xt_find_attr( node, "id" ), entry );
 }
@@ -163 +164 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        
-        g_hash_table_foreach_remove( jd->node_cache, jabber_cache_clean_entry, NULL );
-}
-
-gboolean jabber_cache_clean_entry( gpointer key, gpointer entry_, gpointer nullpointer )
+        time_t threshold = time( NULL ) - JABBER_CACHE_MAX_AGE;
+        
+        g_hash_table_foreach_remove( jd->node_cache, jabber_cache_clean_entry, &threshold );
+}
+
+gboolean jabber_cache_clean_entry( gpointer key, gpointer entry_, gpointer threshold_ )
 {
         struct jabber_cache_entry *entry = entry_;
-        struct xt_node *node = entry->node;
-        
-        if( node->flags & XT_SEEN )
-                return TRUE;
-        else
-        {
-                node->flags |= XT_SEEN;
-                return FALSE;
-        }
+        time_t *threshold = threshold_;
+        
+        return entry->saved_at < *threshold;
 }