eddy/tty_term
1
0
Fork 0
mirror of https://github.com/eddyem/tty_term.git synced 2026-06-21 19:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

mutexes, correct disconnect/out

Browse Source
This commit is contained in:
Edward Emelianov
2020-12-23 11:18:11 +03:00
parent b87fb2e22a
commit a33179c02a
3 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main.c
View File

@@ -28,11 +28,15 @@
static ttyd dtty = {.dev = NULL, .mutex = PTHREAD_MUTEX_INITIALIZER};
//FILE *fd;
void signals(int signo){
if(dtty.dev){
pthread_mutex_lock(&dtty.mutex);
close_tty(&dtty.dev);
}
//fprintf(fd, "stop\n");
//fflush(fd);
deinit_ncurses();
deinit_readline();
exit(signo);
@@ -48,6 +52,8 @@ int main(int argc, char **argv){
WARN("Can't open device %s", G->ttyname);
signals(1);
}
//fd = fopen("loglog", "w");
//fprintf(fd, "start\n");
init_ncurses();
init_readline();
const char *EOL = "\n";
@@ -69,9 +75,9 @@ int main(int argc, char **argv){
if(pthread_create(&writer, NULL, cmdline, (void*)&dtty)) ERR("pthread_create()");
settimeout(G->tmoutms);
while(1){
//if(0 == pthread_mutex_lock(&dtty.mutex)){
if(0 == pthread_mutex_lock(&dtty.mutex)){
int l = Read_tty(dtty.dev);
if(l){
if(l > 0){
char *buf = dtty.dev->buf;
char *eol = NULL, *estr = buf + l;
do{
@@ -84,9 +90,13 @@ int main(int argc, char **argv){
add_ttydata(buf);
}
}while(eol && buf < estr);
}else if(l < 0) signals(9);
// pthread_mutex_unlock(&dtty.mutex);
//}
}else if(l < 0){
pthread_mutex_unlock(&dtty.mutex);
ERRX("Device disconnected");
}
pthread_mutex_unlock(&dtty.mutex);
usleep(1000);
}
}
// never reached
return 0;