Skip to content

Fix for SPiiPlusAuxIO segfaults at IOC exit #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmpeters merged 1 commit into from
Feb 3, 2026
Merged

Fix for SPiiPlusAuxIO segfaults at IOC exit #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions acsMotionApp/src/SPiiPlusAuxDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ static void SPiiPlusAuxIOThreadC(void *pPvt)

static void shutdownCallback(void *pPvt)
{
SPiiPlusController *pC = static_cast<SPiiPlusController *>(pPvt);
SPiiPlusAuxIO *pAux = static_cast<SPiiPlusAuxIO *>(pPvt);

pC->lock();
pC->shuttingDown_ = 1;
pC->unlock();
pAux->lock();
pAux->shuttingDown_ = 1;
pAux->unlock();
}

SPiiPlusAuxIO::SPiiPlusAuxIO(const char *ACSAuxPortName, const char* asynPortName, int numChannels, double pollPeriod)
Expand All @@ -52,7 +52,7 @@ SPiiPlusAuxIO::SPiiPlusAuxIO(const char *ACSAuxPortName, const char* asynPortNam
pComm_ = new SPiiPlusComm(ACSCommPortName, asynPortName, numChannels);

/* Set an EPICS exit handler that will shut down polling before asyn kills the IP sockets */
epicsAtExit(shutdownCallback, pC_);
epicsAtExit(shutdownCallback, this);

/*
* MP4U controllers have significantly larger arrays for the AIN, AOUT, IN and OUT commands than the controller
Expand Down
1 change: 0 additions & 1 deletion acsMotionApp/src/SPiiPlusAuxDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class epicsShareClass SPiiPlusAuxIO : public asynPortDriver {
#define LAST_SPIIPLUS_AUXIO_PARAM analogOutput_

private:
SPiiPlusController *pC_;
double pollPeriod_;
int forceCallback_;
double ain_[MAX_SIGNALS];
Expand Down
Loading