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

added constants

Browse Source
This commit is contained in:
Jeff Hill
2002-10-23 22:15:41 +00:00
parent 8b83921bdf
commit 2074b99342
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libCom/fdmgr/fdManager.cpp
View File

@@ -38,6 +38,9 @@
epicsShareDef fdManager fileDescriptorManager;
const unsigned mSecPerSec = 1000u;
const unsigned uSecPerSec = 1000u * mSecPerSec;
//
// fdManager::fdManager()
//
@@ -117,8 +120,8 @@ epicsShareFunc void fdManager::process (double delay)
++iter;
}
tv.tv_sec = static_cast<long> (minDelay);
tv.tv_usec = static_cast<long> ((minDelay-tv.tv_sec)*epicsTime::uSecPerSec);
tv.tv_sec = static_cast<long> ( minDelay );
tv.tv_usec = static_cast<long> ( (minDelay-tv.tv_sec) * uSecPerSec );
/*
* win32 requires this (others will

6
src/libCom/fdmgr/fdmgr.cpp
View File

@@ -31,6 +31,8 @@
static const fdRegType fdiToFdRegType[] = {fdrRead, fdrWrite, fdrException};
static const unsigned fdiToFdRegTypeNElements = sizeof (fdiToFdRegType) / sizeof (fdiToFdRegType[0]);
const unsigned mSecPerSec = 1000u;
const unsigned uSecPerSec = 1000u * mSecPerSec;
class fdRegForOldFdmgr : public fdReg {
public:
@@ -171,7 +173,7 @@ extern "C" epicsShareFunc fdctx * epicsShareAPI fdmgr_init (void)
extern "C" epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout (
fdctx *pfdctx, struct timeval *ptimeout, pCallBackFDMgr pFunc, void *pParam)
{
double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (epicsTime::uSecPerSec);
double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (uSecPerSec);
oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
timerForOldFdmgr *pTimer;
unsigned id = fdmgrNoAlarm;
@@ -298,7 +300,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( // X aCC 361
extern "C" epicsShareFunc int epicsShareAPI fdmgr_pend_event (fdctx *pfdctx, struct timeval *ptimeout)
{
oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (epicsTime::uSecPerSec);
double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (uSecPerSec);
try {
pfdm->process (delay);