Changeset 20aced3

Timestamp:

May 16, 2010, 1:15:25 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

2cfc6d7

Parents:

c314f39

git-author:

David Benjamin <davidben@mit.edu> (05/14/10 20:22:01)

git-committer:

David Benjamin <davidben@mit.edu> (05/16/10 01:15:25)

Message:

Use GQueue instead of owl_list for the incoming message queue

Otherwise, we process the queue in O(N^2) time. This isn't actually a
bottleneck, but it becomes one whenever we create fake messages in bulk
for testing purposes.

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

• global.c (modified) (3 diffs)
• owl.h (modified) (1 diff)

global.c

@@ -53 +53 @@
   g->filterlist = NULL;
   owl_list_create(&(g->puntlist));
-  owl_list_create(&(g->messagequeue));
+  g->messagequeue = g_queue_new();
   owl_dict_create(&(g->styledict));
   g->curmsg_vert_offset=0;
@@ -862 +862 @@
 void owl_global_messagequeue_addmsg(owl_global *g, owl_message *m)
 {
-  owl_list_append_element(&(g->messagequeue), m);
+  g_queue_push_tail(g->messagequeue, m);
 }
 
@@ -873 +873 @@
   owl_message *out;
 
-  if (owl_list_get_size(&(g->messagequeue))==0) return(NULL);
-  out=owl_list_get_element(&(g->messagequeue), 0);
-  owl_list_remove_element(&(g->messagequeue), 0);
-  return(out);
+  if (g_queue_is_empty(g->messagequeue))
+    return NULL;
+  out = g_queue_pop_head(g->messagequeue);
+  return out;
 }
 
 int owl_global_messagequeue_pending(owl_global *g)
 {
-  if (owl_list_get_size(&(g->messagequeue))==0) return(0);
-  return(1);
+  return !g_queue_is_empty(g->messagequeue);
 }
 

owl.h

@@ -606 +606 @@
   char *aim_screenname_for_filters;     /* currently logged in AIM screen name */
   owl_buddylist buddylist;  /* list of logged in AIM buddies */
-  owl_list messagequeue;    /* for queueing up aim and other messages */
+  GQueue *messagequeue;     /* for queueing up aim and other messages */
   owl_dict styledict;       /* global dictionary of available styles */
   char *response;           /* response to the last question asked */