uvos/SerialTerminal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make exit not racey

Browse Source
This commit is contained in:
uvos
2023-04-03 21:34:00 +02:00
parent a981f9dc3d
commit 5de7877d74
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
main.cpp
View File

@ -22,14 +22,14 @@ void intHandler(int dummy)
static void printUsage() static void printUsage()
{ {
std::cout<<"usage mulitplexer [option]\n\ std::cout<<"usage mulitplexer [option]\n"
Available options:\n\ <<"Available options:\n"
-h, --help print this help\n\ <<"-h, --help print this help\n"
-p, --serialport serial port device to use\n\ <<"-p, --serialport serial port device to use\n"
-P, --port tcp port to use\n\ <<"-P, --port tcp port to use\n"
-b, --baud set baud rate with termios id\n\ <<"-b, --baud set baud rate with termios id\n"
-r, --rates list Available baud rates\n\ <<"-r, --rates list Available baud rates\n"
-s, --sinkless run without serial port\n"; <<"-s, --sinkless run without serial port\n";
} }
@ -69,7 +69,7 @@ static int parseCmdArgs(int argc, char** argv, Config *config)
return 0; return 0;
} }
void recvThreadFunction(int serial, int signal) void recvThreadFunction(int serial, int exitfd)
{ {
int pollQue = epoll_create1(0); int pollQue = epoll_create1(0);
struct epoll_event ev = {}; struct epoll_event ev = {};
@ -78,14 +78,14 @@ void recvThreadFunction(int serial, int signal)
ev.data.fd = serial; ev.data.fd = serial;
epoll_ctl(pollQue, EPOLL_CTL_ADD, serial, &ev); epoll_ctl(pollQue, EPOLL_CTL_ADD, serial, &ev);
ev.events = EPOLLIN; ev.events = EPOLLIN;
ev.data.fd = signal; ev.data.fd = exitfd;
epoll_ctl(pollQue, EPOLL_CTL_ADD, signal, &ev); epoll_ctl(pollQue, EPOLL_CTL_ADD, exitfd, &ev);
struct epoll_event event; struct epoll_event event;
int ret; int ret;
while((ret = epoll_wait(pollQue, &event, 1, -1)) > 0) while((ret = epoll_wait(pollQue, &event, 1, -1)) > 0)
{ {
if(event.data.fd == signal) if(event.data.fd == exitfd)
break; break;
std::this_thread::sleep_for(std::chrono::milliseconds(100)); std::this_thread::sleep_for(std::chrono::milliseconds(100));
char buffer[4096]; char buffer[4096];
@ -148,7 +148,15 @@ int main(int argc, char* argv[])
signal(SIGTERM, intHandler); signal(SIGTERM, intHandler);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
std::thread readThread(recvThreadFunction, serial, sigfd); int exitPipe[2];
int ret = pipe(exitPipe);
if(ret)
{
std::cout<<"Could not create pipe\n";
return 3;
}
std::thread readThread(recvThreadFunction, serial, exitPipe[0]);
rl_catch_signals = 0; rl_catch_signals = 0;
rl_callback_handler_install ("> ", cb_linehandler); rl_callback_handler_install ("> ", cb_linehandler);
@ -163,13 +171,17 @@ int main(int argc, char* argv[])
epoll_ctl(pollQue, EPOLL_CTL_ADD, sigfd, &ev); epoll_ctl(pollQue, EPOLL_CTL_ADD, sigfd, &ev);
struct epoll_event event; struct epoll_event event;
int ret;
while((ret = epoll_wait(pollQue, &event, 1, -1)) > 0) while((ret = epoll_wait(pollQue, &event, 1, -1)) > 0)
{ {
if(event.data.fd == sigfd) if(event.data.fd == sigfd)
{
write(exitPipe[1], "\n", 1);
break; break;
}
else else
{
rl_callback_read_char(); rl_callback_read_char();
}
} }
readThread.join(); readThread.join();