Changeset 22392

Timestamp:

09/30/07 21:41:46 (14 months ago)

Author:

bonefish

Message:

Moved the select_sync_pool from tty_cookie to tty. No need to have one
per cookie.

Location:

haiku/trunk/src/add-ons/kernel/drivers/tty

Files:

• tty.cpp (modified) (6 diffs)
• tty_private.h (modified) (2 diffs)

haiku/trunk/src/add-ons/kernel/drivers/tty/tty.cpp

@@ -784 +784 @@
         tty->lock = NULL;
         tty->settings = &gTTYSettings[index];
+        tty->select_pool = NULL;
         tty->is_master = isMaster;
         tty->pending_eof = 0;
@@ -917 +918 @@
         cookie->other_tty = otherTTY;
         cookie->open_mode = openMode;
-        cookie->select_pool = NULL;
         cookie->thread_count = 0;
         cookie->closed = false;
@@ -1052 +1052 @@
         }
 
-        // notify all pending selects and clean up the pool
-        if (cookie->select_pool) {
-                notify_select_event_pool(cookie->select_pool, B_SELECT_READ);
-                notify_select_event_pool(cookie->select_pool, B_SELECT_WRITE);
-                notify_select_event_pool(cookie->select_pool, B_SELECT_ERROR);
-
-                delete_select_sync_pool(cookie->select_pool);
-                cookie->select_pool = NULL;
-        }
-
         // notify a select write event on the other tty, if we've closed this tty
         if (cookie->tty->open_count == 0 && cookie->other_tty->open_count > 0)
@@ -1073 +1063 @@
         TRACE(("tty_notify_select_event(%p, %u)\n", tty, event));
 
-        for (TTYCookieList::Iterator it = tty->cookies.GetIterator();
-                 it.HasNext();) {
-                tty_cookie *cookie = it.Next();
-
-                if (cookie->select_pool)
-                        notify_select_event_pool(cookie->select_pool, event);
-        }
+        if (tty->select_pool)
+                notify_select_event_pool(tty->select_pool, event);
 }
 
@@ -1706 +1691 @@
 
         // add the event to the TTY's pool
-        status_t error = add_select_sync_pool_entry(&cookie->select_pool, sync, ref,
+        status_t error = add_select_sync_pool_entry(&tty->select_pool, sync, ref,
                 event);
         if (error != B_OK) {
@@ -1785 +1770 @@
         MutexLocker ttyLocker(tty->lock);
 
-        return remove_select_sync_pool_entry(&cookie->select_pool, sync, event);
-}
-
+        return remove_select_sync_pool_entry(&tty->select_pool, sync, event);
+}
+

haiku/trunk/src/add-ons/kernel/drivers/tty/tty_private.h

@@ -111 +111 @@
         struct tty                      *other_tty;
         uint32                          open_mode;
-        select_sync_pool        *select_pool;
         int32                           thread_count;
         sem_id                          blocking_semaphore;
@@ -131 +130 @@
         struct mutex*           lock;
         tty_settings*           settings;
+        select_sync_pool*       select_pool;
         RequestQueue            reader_queue;
         RequestQueue            writer_queue;