fixed for USB device

This commit is contained in:
2026-10-13 12:25:49 +03:00
parent 93885e70b7
commit 5785cf2fad
2 changed files with 27 additions and 11 deletions

View File

@@ -138,30 +138,39 @@ int main(int argc, char **argv){
ERRX("Cannot write into '%s'", G.headerfile); ERRX("Cannot write into '%s'", G.headerfile);
telname(G.telescope_name); telname(G.telescope_name);
sl_check4running(NULL, G.pidfile); sl_check4running(NULL, G.pidfile);
#ifndef EBUG
if(sl_daemonize()) ERR("Can't daemonize!"); if(sl_daemonize()) ERR("Can't daemonize!");
#endif
sl_loglevel_e lvl = G.verbose + LOGLEVEL_ERR; sl_loglevel_e lvl = G.verbose + LOGLEVEL_ERR;
if(lvl >= LOGLEVEL_AMOUNT) lvl = LOGLEVEL_AMOUNT - 1; if(lvl >= LOGLEVEL_AMOUNT) lvl = LOGLEVEL_AMOUNT - 1;
if(G.logfile) OPENLOG(G.logfile, lvl, 1); if(G.logfile) OPENLOG(G.logfile, lvl, 1);
LOGMSG("Started"); LOGMSG("Started");
if(!term_open(G.termpath, G.serspeed, G.sertmout)){
LOGERR("Can't open %s", G.termpath);
ERRX("Fatal error");
}
signal(SIGTERM, signals); signal(SIGTERM, signals);
signal(SIGINT, signals); signal(SIGINT, signals);
signal(SIGQUIT, signals); signal(SIGQUIT, signals);
signal(SIGTSTP, SIG_IGN); signal(SIGTSTP, SIG_IGN);
signal(SIGUSR1, SIG_IGN); signal(SIGUSR1, SIG_IGN);
signal(SIGUSR2, SIG_IGN); signal(SIGUSR2, SIG_IGN);
int pause = 1;
while(1){ // guard for dead processes while(1){ // guard for dead processes
childpid = fork(); childpid = fork();
double runat = sl_dtime();
if(childpid){ if(childpid){
LOGMSG("create child with PID %d\n", childpid);
DBG("Created child with PID %d\n", childpid); DBG("Created child with PID %d\n", childpid);
wait(NULL); usleep(100000); // let child to test connection
WARNX("Child %d died\n", childpid); if(0 == waitpid(childpid, NULL, WNOHANG)){ // child is still alive
LOGWARN("Child %d died\n", childpid); LOGMSG("Created child with PID %d\n", childpid);
sleep(1); wait(NULL);
}
double dt = sl_dtime() - runat;
WARNX("Child %d died after %gs\n", childpid, dt);
if(dt > pause){ // child's life was long enough
DBG("pause=%d, TTL=%g", pause, dt);
LOGWARN("Child %d died after %gs of life\n", childpid, dt);
pause = 1;
}else if((pause *= 2) > 60) pause = 60; // increase pause up to 1 minute when there's no connection to telescope
DBG("sleep %ds", pause);
sleep(pause);
}else{ }else{
prctl(PR_SET_PDEATHSIG, SIGTERM); // send SIGTERM to child when parent dies prctl(PR_SET_PDEATHSIG, SIGTERM); // send SIGTERM to child when parent dies
break; // go out to normal functional break; // go out to normal functional
@@ -170,6 +179,9 @@ int main(int argc, char **argv){
// react for USRx only in child // react for USRx only in child
signal(SIGUSR1, signals); signal(SIGUSR1, signals);
signal(SIGUSR2, signals); signal(SIGUSR2, signals);
if(!term_open(G.termpath, G.serspeed, G.sertmout)){
ERRX("Fatal error");
}
runserver(G.isunix, G.node, G.maxclients); runserver(G.isunix, G.node, G.maxclients);
LOGERR("Server error -> exit"); LOGERR("Server error -> exit");
return 0; return 0;

View File

@@ -40,7 +40,7 @@ void term_close(){
int term_open(char *path, int speed, double usec){ int term_open(char *path, int speed, double usec){
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
if(dev) sl_tty_close(&dev); if(dev) sl_tty_close(&dev);
LOGMSG("Try to open serial %s at speed %d", path, speed); LOGDBG("Try to open serial %s at speed %d", path, speed);
DBG("Init serial"); DBG("Init serial");
dev = sl_tty_new(path, speed, 4096); dev = sl_tty_new(path, speed, 4096);
DBG("Open serial"); DBG("Open serial");
@@ -61,7 +61,7 @@ int term_open(char *path, int speed, double usec){
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
rtn: rtn:
if(dev) return TRUE; if(dev) return TRUE;
LOGERR("Can't open %s with speed %d. Exit.", path, speed); LOGDBG("Can't open %s with speed %d. Exit.", path, speed);
return FALSE; return FALSE;
} }
@@ -125,6 +125,10 @@ static char *nonblk_read(char ans[ANSLEN]){
static int nonblk_write(const char *buf, int length){ static int nonblk_write(const char *buf, int length){
if(!buf || length < 1) return 0; if(!buf || length < 1) return 0;
if(0 == sl_tty_write(dev->comfd, buf, length)) return length; if(0 == sl_tty_write(dev->comfd, buf, length)) return length;
else{
LOGERR("Serial device disconnected");
ERR("Can't write");
}
return 0; return 0;
} }