github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-16 08:26:41 +00:00
Code Issues Projects Releases Wiki Activity

dm: Add teardown callback for mevent in uart_core

Browse Source 
To avoid the race issue for mevent in uart, we introduce the
teardown callback to handle resource free case.

Tracked-On: #1877
Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Yin Fengwei 2018-12-17 10:26:47 +08:00 committed by wenlingz
parent 72d1fa503a
commit 8f57c61da9
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
devicemodel/hw/uart_core.c
View File

@ -119,6 +119,7 @@ struct uart_vdev {
}; };
static void uart_drain(int fd, enum ev_type ev, void *arg); static void uart_drain(int fd, enum ev_type ev, void *arg);
static void uart_deinit(struct uart_vdev *uart);
static void static void
ttyclose(void) ttyclose(void)
@ -266,12 +267,34 @@ rxfifo_numchars(struct uart_vdev *uart)
return fifo->num; return fifo->num;
} }
static void
uart_mevent_teardown(void *param)
{
struct uart_vdev *uart = param;
uart->mev = 0;
ttyclose();
if (uart->tty.fd_in == STDIN_FILENO) {
stdio_in_use = false;
} else {
close(uart->tty.fd_in);
}
uart->tty.fd_in = -1;
uart->tty.fd_out = -1;
uart->tty.opened = false;
uart_deinit(uart);
}
static void static void
uart_opentty(struct uart_vdev *uart) uart_opentty(struct uart_vdev *uart)
{ {
ttyopen(&uart->tty); ttyopen(&uart->tty);
if (isatty(uart->tty.fd_in)) { if (isatty(uart->tty.fd_in)) {
uart->mev = mevent_add(uart->tty.fd_in, EVF_READ, uart_drain, uart, NULL, NULL); uart->mev = mevent_add(uart->tty.fd_in, EVF_READ,
uart_drain, uart, uart_mevent_teardown, uart);
assert(uart->mev != NULL); assert(uart->mev != NULL);
} }
} }
@ -284,11 +307,10 @@ uart_closetty(struct uart_vdev *uart)
mevent_delete_close(uart->mev); mevent_delete_close(uart->mev);
else else
mevent_delete(uart->mev); mevent_delete(uart->mev);
/* uart deinit will be invoked in mevent teardown callback */
uart->mev = 0; } else {
uart_mevent_teardown(uart);
} }
ttyclose();
} }
static uint8_t static uint8_t
@ -718,7 +740,6 @@ uart_set_backend(uart_intr_func_t intr_assert, uart_intr_func_t intr_deassert,
goto fail_tty_backend; goto fail_tty_backend;
uart_opentty(uart); uart_opentty(uart);
return uart; return uart;
fail_tty_backend: fail_tty_backend:
@ -749,14 +770,4 @@ uart_release_backend(struct uart_vdev *uart, const char *opts)
return; return;
uart_closetty(uart); uart_closetty(uart);
if (strcmp("stdio", opts) == 0) {
stdio_in_use = false;
} else
close(uart->tty.fd_in);
uart->tty.fd_in = -1;
uart->tty.fd_out = -1;
uart->tty.opened = false;
uart_deinit(uart);
} }