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

Merged Michael Davidsaver's 'minor-fixes' branch.

Browse Source
This commit is contained in:
Andrew Johnson
2010-04-02 16:51:04 -05:00
parent e56d4c2337 356ee58927
commit c3b19955f5
8 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RTEMS/base/Makefile
-1
View File
@@ -16,7 +16,6 @@ SRCS += rtems_init.c
SRCS += rtems_config.c
SRCS += rtems_netconfig.c
SRCS += rtems_util.c
SRCS += rtems_dummyreg.c
SRCS += setBootConfigFromNVRAM.c
SRCS += epicsRtemsInitHookPre.c
SRCS += epicsRtemsInitHookPost.c
src/RTEMS/base/rtems_dummyreg.c
-17
View File
@@ -1,17 +0,0 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Saskatchewan
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
* Provide a dummy version of iocshRegister to be used with test applications.
*/
#include <iocsh.h>
void
iocshRegister(const iocshFuncDef *piocshFuncDef, iocshCallFunc func)
{
printf ("No iocsh -- %s not registered\n", piocshFuncDef->name);
}
src/db/dbLock.c
+6
View File
@@ -236,6 +236,12 @@ void epicsShareAPI dbScanLock(dbCommon *precord)
epicsMutexLockStatus status;
epicsThreadId idSelf = epicsThreadGetIdSelf();
/*
* If this assertion is failing it is likely because iocInit
* has not completed. It must complete before normal record
* processing is possible. Consider using an initHook to
* detect when this occurs.
*/
assert(dbLockIsInitialized);
while(1) {
epicsMutexMustLock(lockSetModifyLock);
src/db/dbNotify.c
+14 -16
View File
@@ -46,8 +46,6 @@
#include "epicsTime.h"
#include "cantProceed.h"
#define STATIC static
/*putNotify.state values */
typedef enum {
putNotifyNotActive,
@@ -86,15 +84,15 @@ typedef struct notifyGlobal {
ELLLIST freeList;
}notifyGlobal;
STATIC notifyGlobal *pnotifyGlobal = 0;
static notifyGlobal *pnotifyGlobal = 0;
/*Local routines*/
STATIC void putNotifyInit(putNotify *ppn);
STATIC void putNotifyCleanup(putNotify *ppn);
STATIC void restartCheck(putNotifyRecord *ppnr);
STATIC void callUser(dbCommon *precord,putNotify *ppn);
STATIC void notifyCallback(CALLBACK *pcallback);
STATIC void putNotifyCommon(putNotify *ppn,dbCommon *precord);
static void putNotifyInit(putNotify *ppn);
static void putNotifyCleanup(putNotify *ppn);
static void restartCheck(putNotifyRecord *ppnr);
static void callUser(dbCommon *precord,putNotify *ppn);
static void notifyCallback(CALLBACK *pcallback);
static void putNotifyCommon(putNotify *ppn,dbCommon *precord);
#define ellSafeAdd(list,listnode) \
{ \
@@ -110,7 +108,7 @@ STATIC void putNotifyCommon(putNotify *ppn,dbCommon *precord);
(listnode)->isOnList=0; \
}
STATIC void putNotifyInit(putNotify *ppn)
static void putNotifyInit(putNotify *ppn)
{
putNotifyPvt *pputNotifyPvt;
@@ -135,7 +133,7 @@ STATIC void putNotifyInit(putNotify *ppn)
ppn->pputNotifyPvt = pputNotifyPvt;
}
STATIC void putNotifyCleanup(putNotify *ppn)
static void putNotifyCleanup(putNotify *ppn)
{
putNotifyPvt *pputNotifyPvt = (putNotifyPvt *)ppn->pputNotifyPvt;
@@ -144,7 +142,7 @@ STATIC void putNotifyCleanup(putNotify *ppn)
ppn->pputNotifyPvt = 0;
}
STATIC void restartCheck(putNotifyRecord *ppnr)
static void restartCheck(putNotifyRecord *ppnr)
{
dbCommon *precord = ppnr->precord;
putNotify *pfirst;
@@ -167,7 +165,7 @@ STATIC void restartCheck(putNotifyRecord *ppnr)
callbackRequest(&pputNotifyPvt->callback);
}
STATIC void callUser(dbCommon *precord,putNotify *ppn)
static void callUser(dbCommon *precord,putNotify *ppn)
{
putNotifyPvt *pputNotifyPvt = (putNotifyPvt *)ppn->pputNotifyPvt;
@@ -198,7 +196,7 @@ STATIC void callUser(dbCommon *precord,putNotify *ppn)
return;
}
STATIC void putNotifyCommon(putNotify *ppn,dbCommon *precord)
static void putNotifyCommon(putNotify *ppn,dbCommon *precord)
{
long status=0;
dbFldDes *pfldDes = ppn->paddr->pfldDes;
@@ -245,7 +243,7 @@ STATIC void putNotifyCommon(putNotify *ppn,dbCommon *precord)
callUser(precord,ppn);
}
STATIC void notifyCallback(CALLBACK *pcallback)
static void notifyCallback(CALLBACK *pcallback)
{
putNotify *ppn=NULL;
dbCommon *precord;
@@ -459,7 +457,7 @@ typedef struct tpnInfo {
putNotify *ppn;
}tpnInfo;
STATIC void dbtpnCallback(putNotify *ppn)
static void dbtpnCallback(putNotify *ppn)
{
putNotifyStatus status = ppn->status;
tpnInfo *ptpnInfo = (tpnInfo *)ppn->usrPvt;
src/gdd/aitConvert.cc
+1 -1
View File
@@ -100,7 +100,7 @@ bool putDoubleToString (
if ( nChar < 1 ) {
return false;
}
assert ( nChar < strSize );
assert ( size_t(nChar) < strSize );
#else
int nChar = epicsSnprintf (
pString, strSize-1, "%g", in );
src/libCom/osi/epicsMutex.cpp
+4 -6
View File
@@ -33,11 +33,9 @@
#include "epicsMutex.h"
#include "epicsThread.h"
#define STATIC static
STATIC int firstTime = 1;
STATIC ELLLIST mutexList;
STATIC ELLLIST freeList;
static int firstTime = 1;
static ELLLIST mutexList;
static ELLLIST freeList;
struct epicsMutexParm {
ELLNODE node;
@@ -49,7 +47,7 @@ struct epicsMutexParm {
int lineno;
};
STATIC epicsMutexOSD * epicsMutexGlobalLock;
static epicsMutexOSD * epicsMutexGlobalLock;
// vxWorks 5.4 gcc fails during compile when I use std::exception
src/libCom/timer/epicsTimer.cpp
+5 -3
View File
@@ -18,6 +18,8 @@
#include <string>
#include <stdexcept>
#include "epicsMath.h"
#define epicsExportSharedSymbols
#include "epicsTimer.h"
#include "epicsGuard.h"
@@ -127,7 +129,7 @@ epicsShareFunc epicsTimerNotify::expireStatus::expireStatus
throw std::logic_error
( "no timer restart was requested, but a delay was specified?" );
}
if ( this->delay < 0.0 ) {
if ( this->delay < 0.0 || !finite(this->delay) ) {
throw std::logic_error
( "timer restart was requested, but a negative delay was specified?" );
}
@@ -135,12 +137,12 @@ epicsShareFunc epicsTimerNotify::expireStatus::expireStatus
epicsShareFunc bool epicsTimerNotify::expireStatus::restart () const
{
return this->delay >= 0.0;
return this->delay >= 0.0 && finite(this->delay);
}
epicsShareFunc double epicsTimerNotify::expireStatus::expirationDelay () const
{
if ( this->delay < 0.0 ) {
if ( this->delay < 0.0 || !finite(this->delay) ) {
throw std::logic_error
( "no timer restart was requested, but you are asking for a restart delay?" );
}
src/softIoc/Makefile
+2
View File
@@ -30,5 +30,7 @@ DB += softIocExit.db
include $(TOP)/configure/RULES
softMain$(OBJ) : $(COMMON_DIR)/epicsInstallDir.h
$(COMMON_DIR)/epicsInstallDir.h: $(INSTALL_BIN)/makeInstallDir.pl
$(PERL) $< $(INSTALL_LOCATION) > $@