Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
per cookie.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22392 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2007-10-01 01:41:46 +00:00
parent 66c03dc3a9
commit eb138dc9c4
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/add-ons/kernel/drivers/tty/tty.cpp
View File

@ -783,6 +783,7 @@ reset_tty(struct tty *tty, int32 index, bool isMaster)
tty->index = index; tty->index = index;
tty->lock = NULL; tty->lock = NULL;
tty->settings = &gTTYSettings[index]; tty->settings = &gTTYSettings[index];
tty->select_pool = NULL;
tty->is_master = isMaster; tty->is_master = isMaster;
tty->pending_eof = 0; tty->pending_eof = 0;
} }
@ -916,7 +917,6 @@ init_tty_cookie(tty_cookie *cookie, struct tty *tty, struct tty *otherTTY,
cookie->tty = tty; cookie->tty = tty;
cookie->other_tty = otherTTY; cookie->other_tty = otherTTY;
cookie->open_mode = openMode; cookie->open_mode = openMode;
cookie->select_pool = NULL;
cookie->thread_count = 0; cookie->thread_count = 0;
cookie->closed = false; cookie->closed = false;
@ -1051,16 +1051,6 @@ tty_close_cookie(struct tty_cookie *cookie)
tty_close(cookie->tty); tty_close(cookie->tty);
} }
// 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 // 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) if (cookie->tty->open_count == 0 && cookie->other_tty->open_count > 0)
tty_notify_select_event(cookie->other_tty, B_SELECT_WRITE); tty_notify_select_event(cookie->other_tty, B_SELECT_WRITE);
@ -1072,13 +1062,8 @@ tty_notify_select_event(struct tty *tty, uint8 event)
{ {
TRACE(("tty_notify_select_event(%p, %u)\n", tty, event)); TRACE(("tty_notify_select_event(%p, %u)\n", tty, event));
for (TTYCookieList::Iterator it = tty->cookies.GetIterator(); if (tty->select_pool)
it.HasNext();) { notify_select_event_pool(tty->select_pool, event);
tty_cookie *cookie = it.Next();
if (cookie->select_pool)
notify_select_event_pool(cookie->select_pool, event);
}
} }
@ -1705,7 +1690,7 @@ tty_select(tty_cookie *cookie, uint8 event, uint32 ref, selectsync *sync)
otherTTY = NULL; otherTTY = NULL;
// add the event to the TTY's pool // 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); event);
if (error != B_OK) { if (error != B_OK) {
TRACE(("tty_select() done: add_select_sync_pool_entry() failed: %lx\n", TRACE(("tty_select() done: add_select_sync_pool_entry() failed: %lx\n",
@ -1784,6 +1769,6 @@ tty_deselect(tty_cookie *cookie, uint8 event, selectsync *sync)
// lock the TTY (guards the select sync pool, among other things) // lock the TTY (guards the select sync pool, among other things)
MutexLocker ttyLocker(tty->lock); 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);
} }

2
src/add-ons/kernel/drivers/tty/tty_private.h
View File

@ -110,7 +110,6 @@ struct tty_cookie : DoublyLinkedListLinkImpl<tty_cookie> {
struct tty *tty; struct tty *tty;
struct tty *other_tty; struct tty *other_tty;
uint32 open_mode; uint32 open_mode;
select_sync_pool *select_pool;
int32 thread_count; int32 thread_count;
sem_id blocking_semaphore; sem_id blocking_semaphore;
bool closed; bool closed;
@ -130,6 +129,7 @@ struct tty {
int32 index; int32 index;
struct mutex* lock; struct mutex* lock;
tty_settings* settings; tty_settings* settings;
select_sync_pool* select_pool;
RequestQueue reader_queue; RequestQueue reader_queue;
RequestQueue writer_queue; RequestQueue writer_queue;
TTYCookieList cookies; TTYCookieList cookies;