epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

errlog crashes if called from interruot context

Browse Source
This commit is contained in:
Marty Kraimer
2005-03-17 20:41:00 +00:00
parent 2dc1e77174
commit 3fe2c5f343
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libCom/error/errlog.c
View File

@@ -114,13 +114,14 @@ epicsShareFunc int errlogPrintf( const char *pFormat, ...)
{
va_list pvar;
int nchar;
int isOkToBlock = epicsThreadIsOkToBlock();
int isOkToBlock;
if(epicsInterruptIsInterruptContext()) {
epicsInterruptContextMessage
("errlogPrintf called from interrupt level\n");
return 0;
}
isOkToBlock = epicsThreadIsOkToBlock();
errlogInit(0);
if(pvtData.atExit || (isOkToBlock && pvtData.toConsole)) {
va_start(pvar, pFormat);
@@ -139,7 +140,7 @@ epicsShareFunc int errlogVprintf(
{
int nchar;
char *pbuffer;
int isOkToBlock = epicsThreadIsOkToBlock();
int isOkToBlock;
if(epicsInterruptIsInterruptContext()) {
epicsInterruptContextMessage
@@ -148,6 +149,7 @@ epicsShareFunc int errlogVprintf(
}
errlogInit(0);
if(pvtData.atExit) return 0;
isOkToBlock = epicsThreadIsOkToBlock();
pbuffer = msgbufGetFree(isOkToBlock);
if(!pbuffer) return(0);
nchar = tvsnPrint(pbuffer,MAX_MESSAGE_SIZE,pFormat?pFormat:"",pvar);
@@ -203,7 +205,7 @@ epicsShareFunc int errlogSevPrintf(
{
va_list pvar;
int nchar;
int isOkToBlock = epicsThreadIsOkToBlock();
int isOkToBlock;
if(epicsInterruptIsInterruptContext()) {
epicsInterruptContextMessage
@@ -212,6 +214,7 @@ epicsShareFunc int errlogSevPrintf(
}
errlogInit(0);
if(pvtData.sevToLog>severity) return(0);
isOkToBlock = epicsThreadIsOkToBlock();
if(pvtData.atExit || (isOkToBlock && pvtData.toConsole)) {
fprintf(stdout,"sevr=%s ",errlogGetSevEnumString(severity));
va_start(pvar, pFormat);
@@ -231,9 +234,8 @@ epicsShareFunc int errlogSevVprintf(
char *pnext;
int nchar;
int totalChar=0;
int isOkToBlock = epicsThreadIsOkToBlock();
int isOkToBlock;
if(pvtData.sevToLog>severity) return(0);
if(epicsInterruptIsInterruptContext()) {
epicsInterruptContextMessage
("errlogSevVprintf called from interrupt level\n");
@@ -241,6 +243,7 @@ epicsShareFunc int errlogSevVprintf(
}
errlogInit(0);
if(pvtData.atExit) return 0;
isOkToBlock = epicsThreadIsOkToBlock();
pnext = msgbufGetFree(isOkToBlock);
if(!pnext) return(0);
nchar = sprintf(pnext,"sevr=%s ",errlogGetSevEnumString(severity));
@@ -328,7 +331,7 @@ epicsShareFunc void errPrintf(long status, const char *pFileName,
char *pnext;
int nchar;
int totalChar=0;
int isOkToBlock = epicsThreadIsOkToBlock();
int isOkToBlock;
char name[256];
if(epicsInterruptIsInterruptContext()) {
@@ -336,6 +339,7 @@ epicsShareFunc void errPrintf(long status, const char *pFileName,
return;
}
errlogInit(0);
isOkToBlock = epicsThreadIsOkToBlock();
if(status==0) status = errno;
if(status>0) {
errSymLookup(status,name,sizeof(name));