eddy/mountcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove pthread_kill/pthread_cancel from signals (if thread wasn't run, these functions cause segfault)

Browse Source
This commit is contained in:
Edward V. Emelianov 2025-08-12 11:48:48 +03:00
parent 22097610f9
commit e59f9a05b2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibSidServo/examples/dump.c
View File

@ -73,7 +73,7 @@ void logmnt(FILE *fcoords, mountdata_t *m){
} }
// write data // write data
fprintf(fcoords, "%12.6f %10.6f %10.6f %10.6f %10.6f %10.6f %10.6f %10u\n", fprintf(fcoords, "%12.6f %10.6f %10.6f %10.6f %10.6f %10.6f %10.6f %10u\n",
m->motXposition.t, RAD2DEG(m->motXposition.val), RAD2DEG(m->motYposition.val), m->encXposition.t, RAD2DEG(m->motXposition.val), RAD2DEG(m->motYposition.val),
RAD2DEG(m->encXposition.val), RAD2DEG(m->encYposition.val), RAD2DEG(m->encXposition.val), RAD2DEG(m->encYposition.val),
RAD2DEG(m->encXspeed.val), RAD2DEG(m->encYspeed.val), RAD2DEG(m->encXspeed.val), RAD2DEG(m->encYspeed.val),
m->millis); m->millis);

3
LibSidServo/examples/goto.c
View File

@ -61,12 +61,13 @@ static FILE* fcoords = NULL;
static pthread_t dthr; static pthread_t dthr;
void signals(int sig){ void signals(int sig){
pthread_cancel(dthr);
if(sig){ if(sig){
signal(sig, SIG_IGN); signal(sig, SIG_IGN);
DBG("Get signal %d, quit.\n", sig); DBG("Get signal %d, quit.\n", sig);
} }
DBG("Quit");
Mount.quit(); Mount.quit();
DBG("close");
if(fcoords) fclose(fcoords); if(fcoords) fclose(fcoords);
exit(sig); exit(sig);
} }

1
LibSidServo/examples/scmd_traectory.c
View File

@ -75,7 +75,6 @@ static sl_option_t cmdlnopts[] = {
}; };
void signals(int sig){ void signals(int sig){
pthread_cancel(dthr);
if(sig){ if(sig){
signal(sig, SIG_IGN); signal(sig, SIG_IGN);
DBG("Get signal %d, quit.\n", sig); DBG("Get signal %d, quit.\n", sig);

2
LibSidServo/serial.c
View File

@ -593,7 +593,7 @@ void closeSerial(){
DBG("close encoder's fd"); DBG("close encoder's fd");
close(encfd[0]); close(encfd[0]);
encfd[0] = -1; encfd[0] = -1;
if(Conf.SepEncoder == 2){ if(Conf.SepEncoder == 2 && encfd[1] > -1){
close(encfd[1]); close(encfd[1]);
encfd[1] = -1; encfd[1] = -1;
} }