Changeset 7ca5d3e3f8c76c75f3200773de375d80ac951461

Timestamp:

10/27/09 15:08:19 (4 weeks ago)

Author:

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

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> / 2009-10-27T15:02:36Z-0400

Parents:

a01ed7cdca6315ea934496b953495210530f61f7

Children:

338e5235f0585384ca0db9d54211b880de159b37, ad0deddb4298f15386cb0fca17ff0b2265b9ba7d

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> / 2009-10-27T15:08:19Z-0400

Message:

Remove obsolete dispatch simplifications

This should have been part of the I/O Dispatch API changeset that was
just merged, had I noticed it when ripping out the old API.

Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>

Files:

• select.c (modified) (1 diff)

select.c

@@ -458 +458 @@
 
   if(ret > 0) {
-    /* Merge fd_sets and clear AIM FDs. */
-    for(i = 0; i <= max_fd; i++) {
-      /* Merge all interesting FDs into one set, since we have a
-         single dispatch per FD. */
+    /* AIM HACK: process all AIM events at once. */
+    for(i = 0; !aim_done && i <= max_fd; i++) {
       if (FD_ISSET(i, &r) || FD_ISSET(i, &w) || FD_ISSET(i, &e)) {
-        /* AIM HACK: no separate dispatch, just process here if
-           needed, and only once per run through. */
-        if (!aim_done && (FD_ISSET(i, &aim_rfds) || FD_ISSET(i, &aim_wfds))) {
+        if (FD_ISSET(i, &aim_rfds) || FD_ISSET(i, &aim_wfds)) {
           owl_process_aim();
           aim_done = 1;
         }
-        else {
-          FD_SET(i, &r);
-        }
-      }
-    }
-    /* NOTE: the same dispatch function is called for both exceptional
-       and read ready FDs. */
+      }
+    }
     owl_select_io_dispatch(&r, &w, &e, max_fd);
   }