Changes from patch in lp:1539791

This commit is contained in:
Andrew Johnson
2016-02-23 15:43:26 -06:00
parent 61e61aab24
commit e18eca80db
8 changed files with 55 additions and 16 deletions

View File

@@ -20,3 +20,6 @@ variable(dbQuietMacroWarnings,int)
variable(dbTemplateMaxVars,int)
# Default number of parallel callback threads
variable(callbackParallelThreadsDefault,int)
# Real-time operation
variable(dbThreadRealtimeLock,int)

View File

@@ -36,7 +36,7 @@
#include "caeventmask.h"
#define epicsExportSharedSymbols
#include "epicsExport.h" /* defines epicsExportSharedSymbols */
#include "alarm.h"
#include "asDbLib.h"
#include "callback.h"
@@ -86,7 +86,9 @@ static void initDatabase(void);
static void initialProcess(void);
static void exitDatabase(void *dummy);
int dbThreadRealtimeLock = 1;
epicsExportAddress(int, dbThreadRealtimeLock);
/*
* Initialize EPICS on the IOC.
*/
@@ -186,6 +188,10 @@ int iocBuild(void)
rsrv_init();
status = iocBuild_3();
if (dbThreadRealtimeLock)
epicsThreadRealtimeLock();
if (!status) iocBuildMode = buildRSRV;
return status;
}