Changeset 3ecd78b

Timestamp:

Sep 18, 2010, 3:14:30 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

de6f317

Parents:

8402a093

git-author:

David Benjamin <davidben@mit.edu> (09/14/10 16:52:41)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 15:14:30)

Message:

Move the event loop to owl_select as owl_select_run_loop

Also adds a function to quit the select loop so that owl_function_quit
needn't exit() directly. main should be allowed to clean up after
itself.

Files:

• functions.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• select.c (modified) (2 diffs)

functions.c

@@ -976 +976 @@
 
   owl_function_debugmsg("Quitting Owl");
-  exit(0);
+  owl_select_quit_loop();
 }
 

owl.c

@@ -584 +584 @@
 
   owl_function_debugmsg("startup: entering main loop");
-  /* main loop */
-  while (1) {
-    /* select on FDs we know about. */
-    owl_select();
-  }
-}
+  owl_select_run_loop();
+  return 0;
+}

select.c

@@ -3 +3 @@
 static int dispatch_active = 0;
 static int psa_active = 0;
+static int loop_active = 0;
 
 int _owl_select_timer_cmp(const owl_timer *t1, const owl_timer *t2) {
@@ -436 +437 @@
   }
 }
+
+void owl_select_run_loop(void)
+{
+  loop_active = 1;
+  while (loop_active) {
+    owl_select();
+  }
+}
+
+void owl_select_quit_loop(void)
+{
+  loop_active = 0;
+}