Changes in / [b70d24f:5f3168a]

File:

• select.c (modified) (9 diffs)

select.c

@@ -105 +105 @@
 }
 
-int owl_select_dispatch_prepare_fd_sets(fd_set *r, fd_set *e)
+int owl_select_dispatch_prepare_fd_sets(fd_set *r, fd_set *w, fd_set *e)
 {
   int i, len, max_fd;
@@ -119 +119 @@
     d = (owl_dispatch*)owl_list_get_element(dl, i);
     FD_SET(d->fd, r);
+    FD_SET(d->fd, w);
     FD_SET(d->fd, e);
     if (max_fd < d->fd) max_fd = d->fd;
@@ -148 +149 @@
 }
 
-int owl_select_aim_hack(fd_set *rfds, fd_set *wfds)
+int owl_select_aim_hack(fd_set *fds)
 {
   aim_conn_t *cur;
@@ -154 +155 @@
   int max_fd;
 
-  FD_ZERO(rfds);
-  FD_ZERO(wfds);
+  FD_ZERO(fds);
   max_fd = 0;
   sess = owl_global_get_aimsess(&g);
   for (cur = sess->connlist, max_fd = 0; cur; cur = cur->next) {
     if (cur->fd != -1) {
-      FD_SET(cur->fd, rfds);
-      if (cur->status & AIM_CONN_STATUS_INPROGRESS) {
-        /* Yes, we're checking writable sockets here. Without it, AIM
-           login is really slow. */
-        FD_SET(cur->fd, wfds);
-      }
-      
+      FD_SET(cur->fd, fds);
       if (cur->fd > max_fd)
         max_fd = cur->fd;
     }
   }
+  cur = owl_global_get_bosconn(&g);
+  if (cur->fd != -1) {
+    FD_SET(cur->fd, fds);
+    if (cur->fd > max_fd)
+      max_fd = cur->fd;
+  }
+  
   return max_fd;
 }
@@ -178 +179 @@
   int i, max_fd, aim_max_fd, aim_done;
   fd_set r;
+  fd_set w;
   fd_set e;
-  fd_set aim_rfds, aim_wfds;
+  fd_set aim_fds;
   struct timeval timeout;
 
@@ -185 +187 @@
   timeout.tv_usec = 0;
 
-  max_fd = owl_select_dispatch_prepare_fd_sets(&r, &e);
+  max_fd = owl_select_dispatch_prepare_fd_sets(&r, &w, &e);
 
   /* AIM HACK: 
@@ -198 +200 @@
    */
   aim_done = 1;
-  FD_ZERO(&aim_rfds);
-  FD_ZERO(&aim_wfds);
+  FD_ZERO(&aim_fds);
+  FD_ZERO(&w);
   if (owl_global_is_doaimevents(&g)) {
     aim_done = 0;
-    aim_max_fd = owl_select_aim_hack(&aim_rfds, &aim_wfds);
+    aim_max_fd = owl_select_aim_hack(&aim_fds);
     if (max_fd < aim_max_fd) max_fd = aim_max_fd;
     for(i = 0; i <= aim_max_fd; i++) {
-      if (FD_ISSET(i, &aim_rfds)) {
+      if (FD_ISSET(i, &aim_fds)) {
         FD_SET(i, &r);
+        FD_SET(i, &w); /* Yes, we're checking writable sockets
+                          here. Without it, AIM login is really
+                          slow. */
         FD_SET(i, &e);
       }
@@ -212 +217 @@
   }
   /* END AIM HACK */
-
-  if ( select(max_fd+1, &r, &aim_wfds, &e, &timeout) ) {
+  
+  if ( select(max_fd, &r, &w, &e, &timeout) ) {
     /* 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. */
-      if (FD_ISSET(i, &r) || FD_ISSET(i, &aim_wfds) || FD_ISSET(i, &e)) {
+      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 (!aim_done && FD_ISSET(i, &aim_fds)) {
           owl_process_aim();
           aim_done = 1;
@@ -230 +235 @@
       }
     }
+
     /* NOTE: the same dispatch function is called for both exceptional
        and read ready FDs. */