EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

error messages improved

Browse Source 
Do not queue lock request when not connected
Do not call lock callback when unlock fails
This commit is contained in:
zimoch
2013-10-23 14:31:00 +00:00
parent 9e48ad3e61
commit e36013d64e
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/AsynDriverInterface.cc
View File

@ -22,11 +22,6 @@
#include "StreamError.h" #include "StreamError.h"
#include "StreamBuffer.h" #include "StreamBuffer.h"
#include <epicsVersion.h>
#ifdef BASE_VERSION
#define EPICS_3_13
#endif
#ifdef EPICS_3_13 #ifdef EPICS_3_13
#include <assert.h> #include <assert.h>
#include <wdLib.h> #include <wdLib.h>
@ -500,13 +495,20 @@ lockRequest(unsigned long lockTimeout_ms)
status = pasynManager->isConnected(pasynUser, &connected); status = pasynManager->isConnected(pasynUser, &connected);
if (status != asynSuccess) if (status != asynSuccess)
{ {
error("%s: pasynManager->isConnected() failed: %s\n", error("%s lockRequest: pasynManager->isConnected() failed: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
return false; return false;
} }
if (!connected)
{
const char *portname;
pasynManager->getPortName(pasynUser, &portname);
error("%s lockRequest: asyn port %s is not connected\n",
clientName(), portname);
return false;
}
status = pasynManager->queueRequest(pasynUser, status = pasynManager->queueRequest(pasynUser,
connected ? priority() : asynQueuePriorityConnect, priority(), lockTimeout);
lockTimeout);
if (status != asynSuccess) if (status != asynSuccess)
{ {
error("%s lockRequest: pasynManager->queueRequest() failed: %s\n", error("%s lockRequest: pasynManager->queueRequest() failed: %s\n",
@ -534,7 +536,7 @@ connectToAsynPort()
connected ? "yes" : "no"); connected ? "yes" : "no");
if (status != asynSuccess) if (status != asynSuccess)
{ {
error("%s: pasynManager->isConnected() failed: %s\n", error("%s connectToAsynPort: pasynManager->isConnected() failed: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
return false; return false;
} }
@ -578,7 +580,7 @@ connectToAsynPort()
clientName(), asynStatusStr[status]); clientName(), asynStatusStr[status]);
if (status != asynSuccess) if (status != asynSuccess)
{ {
error("%s: pasynCommon->connect() failed: %s\n", error("%s connectToAsynPort: pasynCommon->connect() failed: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
return false; return false;
} }
@ -605,17 +607,24 @@ lockHandler()
status = pasynManager->isConnected(pasynUser, &connected); status = pasynManager->isConnected(pasynUser, &connected);
if (status != asynSuccess) if (status != asynSuccess)
{ {
error("%s: pasynManager->isConnected() failed: %s\n", error("%s lockHandler: pasynManager->isConnected() failed: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
lockCallback(StreamIoFault); lockCallback(StreamIoFault);
return; return;
} }
if (!connected) lockCallback(StreamIoFault); if (!connected)
{
const char *portname;
pasynManager->getPortName(pasynUser, &portname);
error("%s lockHandler: asyn port %s is not connected\n",
clientName(), portname);
lockCallback(StreamIoFault);
}
status = pasynManager->blockProcessCallback(pasynUser, false); status = pasynManager->blockProcessCallback(pasynUser, false);
if (status != asynSuccess) if (status != asynSuccess)
{ {
error("%s: pasynManager->blockProcessCallback() failed: %s\n", error("%s lockHandler: pasynManager->blockProcessCallback() failed: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
lockCallback(StreamIoFault); lockCallback(StreamIoFault);
return; return;
@ -634,9 +643,8 @@ unlock()
status = pasynManager->unblockProcessCallback(pasynUser, false); status = pasynManager->unblockProcessCallback(pasynUser, false);
if (status != asynSuccess) if (status != asynSuccess)
{ {
error("%s: pasynManager->unblockProcessCallback() failed: %s\n", error("%s unlock: pasynManager->unblockProcessCallback() failed: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
lockCallback(StreamIoFault);
return false; return false;
} }
return true; return true;
@ -740,7 +748,7 @@ writeHandler()
"device is %sconnected\n", "device is %sconnected\n",
clientName(),connected?"":"dis"); clientName(),connected?"":"dis");
if (!connected) { if (!connected) {
error("%s: connection closed in write\n", error("%s: write failed because connection was closed by device\n",
clientName()); clientName());
writeCallback(StreamIoFault); writeCallback(StreamIoFault);
return; return;