norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uterm: vt: mark vts as dead during deallocation

Browse Source 
To avoid useless checks wether a vt is valid we simply mark it as dead and
centralize the checks in the API entry point.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-08-12 10:16:55 +02:00
parent 4029539cd1
commit 4c1da1069d
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/uterm.h
View File

@ -60,6 +60,7 @@ enum uterm_vt_action {
enum uterm_vt_mode {
UTERM_VT_REAL,
UTERM_VT_FAKE,
UTERM_VT_DEAD,
};
typedef int (*uterm_vt_cb) (struct uterm_vt *vt, unsigned int action,

32
src/uterm_vt.c
View File

@ -110,9 +110,6 @@ static void real_enter(struct uterm_vt *vt, struct signalfd_siginfo *info)
struct vt_stat vts;
int ret;
if (vt->real_fd < 0)
return;
ret = ioctl(vt->real_fd, VT_GETSTATE, &vts);
if (ret || vts.v_active != vt->real_num)
return;
@ -132,9 +129,6 @@ static void real_leave(struct uterm_vt *vt, struct signalfd_siginfo *info)
struct vt_stat vts;
int ret;
if (vt->real_fd < 0)
return;
ret = ioctl(vt->real_fd, VT_GETSTATE, &vts);
if (ret || vts.v_active != vt->real_num)
return;
@ -154,9 +148,6 @@ static void real_input(struct ev_fd *fd, int mask, void *data)
{
struct uterm_vt *vt = data;
if (vt->real_fd < 0)
return;
/* we ignore input from the VT because we get it from evdev */
tcflush(vt->real_fd, TCIFLUSH);
}
@ -211,9 +202,6 @@ static int real_open(struct uterm_vt *vt)
int ret;
sigset_t mask;
if (vt->real_fd >= 0)
return -EALREADY;
log_debug("open vt %p", vt);
ret = open_tty(-1, &vt->real_fd, &vt->real_num);
@ -286,15 +274,11 @@ err_eloop:
vt->real_efd = NULL;
err_fd:
close(vt->real_fd);
vt->real_fd = -1;
return ret;
}
static void real_close(struct uterm_vt *vt)
{
if (vt->real_fd < 0)
return;
log_debug("closing vt %p", vt);
ioctl(vt->real_fd, KDSETMODE, KD_TEXT);
tcsetattr(vt->real_fd, TCSANOW, &vt->real_saved_attribs);
@ -312,7 +296,7 @@ static int real_activate(struct uterm_vt *vt)
{
int ret;
if (vt->real_fd < 0 || vt->real_num < 0)
if (vt->real_num < 0)
return -EINVAL;
ret = ioctl(vt->real_fd, VT_ACTIVATE, vt->real_num);
@ -341,9 +325,6 @@ static int real_deactivate(struct uterm_vt *vt)
int ret;
struct vt_stat vts;
if (vt->real_fd < 0)
return -EINVAL;
if (vt->real_saved_num < 0)
return 0;
@ -462,12 +443,17 @@ err_free:
void uterm_vt_deallocate(struct uterm_vt *vt)
{
if (!vt || !vt->vtm)
unsigned int mode;
if (!vt || !vt->vtm || vt->mode == UTERM_VT_DEAD)
return;
if (vt->mode == UTERM_VT_REAL) {
mode = vt->mode;
vt->mode = UTERM_VT_DEAD;
if (mode == UTERM_VT_REAL) {
real_close(vt);
} else {
} else if (mode == UTERM_VT_FAKE) {
ev_eloop_unregister_idle_cb(vt->vtm->eloop, vt_idle_event,
vt);
vt_call(vt, UTERM_VT_DEACTIVATE);