epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

inplement safeDoubleToFloat

Browse Source
This commit is contained in:
Marty Kraimer
2001-06-20 15:29:43 +00:00
parent 3a74d55e6c
commit 558e7a3947
5 changed files with 72 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/db/dbConvert.c
+21 -4
View File
@@ -34,6 +34,8 @@
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
#include <float.h>
#include "dbDefs.h"
#include "errlog.h"
@@ -47,6 +49,19 @@
#include "recSup.h"
#include "recGbl.h"
/*safe double to float conversion*/
static void safeDoubleToFloat(double *pd,float *pf)
{
double abs = fabs(*pd);
if(abs>=FLT_MAX) {
if(*pd>0.0) *pf = FLT_MAX; else *pf = -FLT_MAX;
} else if(abs<=FLT_MIN) {
if(*pd>0.0) *pf = FLT_MIN; else *pf = -FLT_MIN;
} else {
*pf = *pd;
}
}
/* DATABASE ACCESS GET CONVERSION SUPPORT */
static long getStringString (
@@ -1896,12 +1911,13 @@ static long getDoubleFloat(
double *psrc=(double *)(paddr->pfield);
if(nRequest==1 && offset==0) {
*pbuffer = *psrc;
safeDoubleToFloat(psrc,pbuffer);
return(0);
}
psrc += offset;
while (nRequest) {
*pbuffer++ = *psrc++;
safeDoubleToFloat(psrc,pbuffer);
++psrc; ++pbuffer;
if(++offset==no_elements) psrc=(double *)paddr->pfield;
nRequest--;
}
@@ -4105,12 +4121,13 @@ static long putDoubleFloat(
float *pdest=(float *)(paddr->pfield);
if(nRequest==1 && offset==0) {
*pdest = *pbuffer;
safeDoubleToFloat(pbuffer,pdest);
return(0);
}
pdest += offset;
while (nRequest) {
*pdest++ = *pbuffer++;
safeDoubleToFloat(pbuffer,pdest);
++pbuffer; ++pdest;
if(++offset==no_elements) pdest=(float *)paddr->pfield;
nRequest--;
}
src/db/dbFastLinkConv.c
+13 -1
View File
@@ -37,6 +37,8 @@
#include <taskLib.h>
#include <vxLib.h>
#include <tickLib.h>
#include <math.h>
#include <float.h>
#include "dbDefs.h"
#include "errlog.h"
@@ -937,7 +939,17 @@ static long cvt_d_f(
double *from,
float *to,
struct dbAddr *paddr)
{ *to=*from; return(0); }
{
double abs = fabs(*from);
if(abs>=FLT_MAX) {
if(*from>0.0) *to = FLT_MAX; else *to = -FLT_MAX;
} else if(abs<=FLT_MIN) {
if(*from>0.0) *to = FLT_MIN; else *to = -FLT_MIN;
} else {
*to = *from;
}
return(0);
}
/* Convert Double to Double */
static long cvt_d_d(
src/db/dbNotify.c
+9 -3
View File
@@ -220,10 +220,11 @@ static void notifyCallback(CALLBACK *pcallback)
precord = ppn->paddr->precord;
dbScanLock(precord);
if(ppn->callbackState==callbackCanceled) {
dbScanUnlock(precord);
ppn->restart = FALSE;
ppn->callbackState = callbackNotActive;
semGive((SEM_ID)ppn->waitForCallback);
if(ppn->waitForCallback)
semGive((SEM_ID)ppn->waitForCallback);
dbScanUnlock(precord);
return;
}
if(ppn->callbackState==callbackActive) {
@@ -234,6 +235,8 @@ static void notifyCallback(CALLBACK *pcallback)
dbScanUnlock(precord);
(ppn->userCallback)(ppn);
}
} else {
dbScanUnlock(precord);
}
}
@@ -251,14 +254,17 @@ void dbNotifyCancel(PUTNOTIFY *ppn)
dbScanLock(precord);
notifyCancel(ppn);
if(ppn->callbackState == callbackActive) {
ppn->waitForCallback = (void *)semBCreate(SEM_Q_FIFO,SEM_FULL);
ppn->waitForCallback = (void *)semBCreate(SEM_Q_FIFO,SEM_EMPTY);
ppn->callbackState = callbackCanceled;
dbScanUnlock(precord);
if(semTake((SEM_ID)ppn->waitForCallback,sysClkRateGet()*10)!=OK) {
errMessage(0,"dbNotifyCancel had semTake timeout");
ppn->callbackState = callbackNotActive;
}
dbScanLock(precord);
semDelete((SEM_ID)ppn->waitForCallback);
ppn->waitForCallback = 0;
dbScanUnlock(precord);
} else {
dbScanUnlock(precord);
}
src/db/db_access.c
+28 -18
View File
@@ -52,6 +52,8 @@
#include <fioLib.h>
#include <string.h>
#include <types.h>
#include <math.h>
#include <float.h>
#include "dbDefs.h"
#include "errlog.h"
@@ -60,7 +62,6 @@
#include "dbCommon.h"
#include "errMdef.h"
#include "recSup.h"
#include "alarm.h"
extern struct dbBase *pdbbase;
@@ -483,9 +484,18 @@ struct dbr_ctrl_double{
double value; /* current value */
};
/*safe double to float conversion*/
static void safeDoubleToFloat(double *pd,float *pf)
{
double abs = fabs(*pd);
if(abs>=FLT_MAX) {
if(*pd>0.0) *pf = FLT_MAX; else *pf = -FLT_MAX;
} else if(abs<=FLT_MIN) {
if(*pd>0.0) *pf = FLT_MIN; else *pf = -FLT_MIN;
} else {
*pf = *pd;
}
}
/* From $cs/dblib/src/dbiocsubs.c
* subroutines
@@ -1059,12 +1069,12 @@ void *pfl
pold->precision = new.precision;
strncpy(pold->units,new.units,MAX_UNITS_SIZE);
pold->units[MAX_UNITS_SIZE-1] = '\0';
pold->upper_disp_limit = new.upper_disp_limit;
pold->lower_disp_limit = new.lower_disp_limit;
pold->upper_alarm_limit = new.upper_alarm_limit;
pold->upper_warning_limit = new.upper_warning_limit;
pold->lower_warning_limit = new.lower_warning_limit;
pold->lower_alarm_limit = new.lower_alarm_limit;
safeDoubleToFloat(&new.upper_disp_limit,&pold->upper_disp_limit);
safeDoubleToFloat(&new.lower_disp_limit,&pold->lower_disp_limit);
safeDoubleToFloat(&new.upper_alarm_limit,&pold->upper_alarm_limit);
safeDoubleToFloat(&new.upper_warning_limit,&pold->upper_warning_limit);
safeDoubleToFloat(&new.lower_warning_limit,&pold->lower_warning_limit);
safeDoubleToFloat(&new.lower_alarm_limit,&pold->lower_alarm_limit);
options=0;
nRequest=no_elements;
status = dbGetField(paddr,DBR_FLOAT,&(pold->value),&options,
@@ -1232,14 +1242,14 @@ void *pfl
pold->precision = new.precision;
strncpy(pold->units,new.units,MAX_UNITS_SIZE);
pold->units[MAX_UNITS_SIZE-1] = '\0';
pold->upper_disp_limit = new.upper_disp_limit;
pold->lower_disp_limit = new.lower_disp_limit;
pold->upper_alarm_limit = new.upper_alarm_limit;
pold->upper_warning_limit = new.upper_warning_limit;
pold->lower_warning_limit = new.lower_warning_limit;
pold->lower_alarm_limit = new.lower_alarm_limit;
pold->upper_ctrl_limit = new.upper_ctrl_limit;
pold->lower_ctrl_limit = new.lower_ctrl_limit;
safeDoubleToFloat(&new.upper_disp_limit,&pold->upper_disp_limit);
safeDoubleToFloat(&new.lower_disp_limit,&pold->lower_disp_limit);
safeDoubleToFloat(&new.upper_alarm_limit,&pold->upper_alarm_limit);
safeDoubleToFloat(&new.upper_warning_limit,&pold->upper_warning_limit);
safeDoubleToFloat(&new.lower_warning_limit,&pold->lower_warning_limit);
safeDoubleToFloat(&new.lower_alarm_limit,&pold->lower_alarm_limit);
safeDoubleToFloat(&new.upper_ctrl_limit,&pold->upper_ctrl_limit);
safeDoubleToFloat(&new.lower_ctrl_limit,&pold->lower_ctrl_limit);
options=0;
nRequest=no_elements;
status = dbGetField(paddr,DBR_FLOAT,&(pold->value),&options,
src/db/iocInit.c
+1
View File
@@ -227,6 +227,7 @@ int iocInit(char * pResourceFilename)
* Process all records that have their "process at initialization"
* field set (pini).
*/
taskDelay(sysClkRateGet());
if (initialProcess() != 0)
epicsPrintf("iocInit: initialProcess Failed\n");