Changeset 4f2166b

Timestamp:

Oct 19, 2009, 10:14:15 PM (14 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

dbf94e9

Parents:

cc1a6d4

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (10/13/09 03:01:31)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (10/19/09 22:14:15)

Message:

Add a pre-select action list.

Allow us to add actions that should be performed before calling
pselect(). If the action performs any useful work, it should return
non-zero. If any of the actions return a non-zero value, the timeout
for pselect() will be set to 0s, so that we can process all of these
actions again in case they are interacting with one another, while
still keeping an eye on our file descriptors and timers.

Files:

• global.c (modified) (2 diffs)
• owl.h (modified) (2 diffs)
• select.c (modified) (3 diffs)

global.c

@@ -113 +113 @@
   owl_message_init_fmtext_cache();
   owl_list_create(&(g->dispatchlist));
+  owl_list_create(&(g->psa_list));
   g->timerlist = NULL;
   g->interrupted = FALSE;
@@ -953 +954 @@
 }
 
+owl_list *owl_global_get_psa_list(owl_global *g)
+{
+  return &(g->psa_list);
+}
+
 GList **owl_global_get_timerlist(owl_global *g)
 {

owl.h

@@ -504 +504 @@
   void *data;
 } owl_dispatch;
+
+typedef struct _owl_ps_action {
+  int needs_gc;
+  int (*callback)(struct _owl_ps_action *, void *);
+  void (*destroy)(struct _owl_ps_action *);
+  void *data;
+} owl_ps_action;
 
 typedef struct _owl_popexec {
@@ -584 +591 @@
   owl_obarray obarray;
   owl_list dispatchlist;
+  owl_list psa_list;
   GList *timerlist;
   owl_timer *aim_nop_timer;

select.c

@@ -2 +2 @@
 
 static int dispatch_active = 0;
+static int psa_active = 0;
 
 int _owl_select_timer_cmp(const owl_timer *t1, const owl_timer *t2) {
@@ -353 +354 @@
 }
 
+owl_ps_action *owl_select_add_pre_select_action(int (*cb)(owl_ps_action *, void *), void (*destroy)(owl_ps_action *), void *data)
+{
+  owl_ps_action *a = owl_malloc(sizeof(owl_ps_action));
+  owl_list *psa_list = owl_global_get_psa_list(&g);
+  a->needs_gc = 0;
+  a->callback = cb;
+  a->destroy = destroy;
+  a->data = data;
+  owl_list_append_element(psa_list, a);
+  return a;
+}
+
+void owl_select_psa_gc(void)
+{
+  int i;
+  owl_list *psa_list;
+  owl_ps_action *a;
+
+  psa_list = owl_global_get_psa_list(&g);
+  for (i = owl_list_get_size(psa_list) - 1; i >= 0; i--) {
+    a = owl_list_get_element(psa_list, i);
+    if (a->needs_gc) {
+      owl_list_remove_element(psa_list, i);
+      if (a->destroy) {
+        a->destroy(a);
+      }
+      owl_free(a);
+    }
+  }
+}
+
+void owl_select_remove_pre_select_action(owl_ps_action *a)
+{
+  a->needs_gc = 1;
+  if (!psa_active)
+    owl_select_psa_gc();
+}
+
+int owl_select_do_pre_select_actions(void)
+{
+  int i, len, ret;
+  owl_list *psa_list;
+
+  psa_active = 1;
+  ret = 0;
+  psa_list = owl_global_get_psa_list(&g);
+  len = owl_list_get_size(psa_list);
+  for (i = 0; i < len; i++) {
+    owl_ps_action *a = owl_list_get_element(psa_list, i);
+    if (a->callback != NULL && a->callback(a, a->data)) {
+      ret = 1;
+    }
+  }
+  psa_active = 0;
+  owl_select_psa_gc();
+  return ret;
+}
+
 void owl_select(void)
 {
@@ -400 +459 @@
   /* END AIM HACK */
 
+  if (owl_select_do_pre_select_actions()) {
+    timeout.tv_sec = 0;
+    timeout.tv_nsec = 0;
+  }
+
   ret = pselect(max_fd+1, &r, &aim_wfds, &e, &timeout, &mask);