i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: fix construction/destruction

Browse Source 
There is no need to construct and destruct nested objects. The new and
delete calls on the struct will take care of it. However, some fields
have C functions for construction/destruction and these should be
called.

Change-Id: I09d5930f499ef3fa4ff580d482c682172b00b6a3
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4603
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Adrien Destugues
2021-10-21 14:49:15 +00:00
committed by waddlesplash
parent 441e6e676d
commit c0ec37dcbc
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/generic/tty/tty.cpp
+7 -16
View File
@@ -1291,11 +1291,6 @@ tty_create(tty_service_func func, bool isMaster)
tty->service_func = func; tty->service_func = func;
// construct the queues
new(&tty->reader_queue) RequestQueue;
new(&tty->writer_queue) RequestQueue;
new(&tty->cookies) TTYCookieList;
return tty; return tty;
} }
@@ -1303,12 +1298,10 @@ tty_create(tty_service_func func, bool isMaster)
void void
tty_destroy(struct tty* tty) tty_destroy(struct tty* tty)
{ {
// destroy the queues TRACE(("tty_destroy(%p)\n", tty));
tty->reader_queue.~RequestQueue();
tty->writer_queue.~RequestQueue();
tty->cookies.~TTYCookieList();
uninit_line_buffer(tty->input_buffer); uninit_line_buffer(tty->input_buffer);
delete_select_sync_pool(tty->select_pool);
mutex_destroy(&tty->lock);
delete tty; delete tty;
} }
@@ -1435,13 +1428,11 @@ tty_close_cookie(tty_cookie* cookie)
} }
requestLocker.Unlock(); requestLocker.Unlock();
// notify a select write event on the other tty, if we've closed this tty
if (cookie->other_tty->open_count > 0)
tty_notify_select_event(cookie->other_tty, B_SELECT_WRITE);
} }
// notify pending select()s and cleanup the select sync pool
// 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)
tty_notify_select_event(cookie->other_tty, B_SELECT_WRITE);
} }