Changeset eab2ac4

Timestamp:

2006-09-25T07:42:39Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ebe7b36

Parents:

a214954

Message:

Saner garbage collection for node cache.

File:

• protocols/jabber/jabber.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -179 +179 @@
 {
         struct jabber_data *jd = gc->proto_data;
-        struct xt_node *c, *prev;
+        struct xt_node *c, *tmp;
         
         /* Just any whitespace character is enough as a keepalive for XMPP sessions. */
@@ -194 +194 @@
         /* This horrible loop is explained in xmltree.c. Makes me wonder if maybe I
            didn't choose the perfect data structure... */
-        for( prev = NULL, c = jd->node_cache->children; c; prev = c, c = c ? c->next : jd->node_cache->children )
-        {
-                if( c->flags == 0 )
-                {
-                        c->flags ++;
-                }
-                else
-                {
-                        if( prev )
-                                prev->next = c->next;
-                        else
-                                jd->node_cache->children = c->next;
-                        
-                        xt_free_node( c );
-                        c = prev;
-                }
+        for( c = jd->node_cache->children; c; c =  c->next )
+                if( !( c->flags & XT_SEEN ) )
+                        break;
+        
+        /* Now c points at the first unflagged node (or at NULL). Clean up
+           everything until that point. */
+        while( jd->node_cache->children != c )
+        {
+                /*
+                printf( "Cleaning up:\n" );
+                xt_print( jd->node_cache->children );
+                */
+                
+                tmp = jd->node_cache->children->next;
+                xt_free_node( jd->node_cache->children );
+                jd->node_cache->children = tmp;
+        }
+        
+        /* Now flag the ones that were still unflagged. */
+        for( c = jd->node_cache->children; c; c = c->next )
+        {
+                /*
+                printf( "Flagged:\n" );
+                xt_print( c );
+                */
+                
+                c->flags |= XT_SEEN;
         }
 }