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

tip toe around sun pro compiler bug

Browse Source
This commit is contained in:
Jeff Hill
2000-02-08 22:10:23 +00:00
parent a23d093e29
commit fb62ba0dc2
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,6 @@
#include "fdManager.h"
#include "fdmgr.h"
static const fdRegType fdiToFdRegType[] = {fdrRead, fdrWrite, fdrException};
static const unsigned fdiToFdRegTypeNElements = sizeof (fdiToFdRegType) / sizeof (fdiToFdRegType[0]);
@@ -54,17 +53,17 @@ public:
class doubleDelete {};
epicsShareFunc fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType type,
const bool onceOnly, fdManager &manager, void (*pFunc) (void *pParam), void *pParam);
const bool onceOnly, fdManager &manager, pCallBackFDMgr pFunc, void *pParam);
epicsShareFunc ~fdRegForOldFdmgr ();
private:
void (*pFunc) (void *pParam);
pCallBackFDMgr pFunc;
void *pParam;
epicsShareFunc virtual void callBack ();
};
epicsShareFunc fdRegForOldFdmgr::fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType typeIn,
const bool onceOnlyIn, fdManager &managerIn, void (*pFuncIn) (void *pParam), void *pParamIn) :
const bool onceOnlyIn, fdManager &managerIn, pCallBackFDMgr pFuncIn, void *pParamIn) :
fdReg (fdIn, typeIn, onceOnlyIn, managerIn),
pFunc (pFuncIn),
pParam (pParamIn)
@@ -105,6 +104,7 @@ private:
chronIntIdResTable <osiTimerForOldFdmgr> resTbl;
};
//
// osiTimer
//
@@ -119,7 +119,7 @@ public:
//
// create an active timer that will expire in delay seconds
//
epicsShareFunc osiTimerForOldFdmgr (oldFdmgr &fdmgr, double delay, void (*pFunc) (void *pParam), void *pParam);
epicsShareFunc osiTimerForOldFdmgr (oldFdmgr &fdmgr, double delay, pCallBackFDMgr pFunc, void *pParam);
epicsShareFunc ~osiTimerForOldFdmgr ();
//
@@ -134,13 +134,13 @@ public:
private:
oldFdmgr &fdmgr;
void (*pFunc) (void *pParam);
pCallBackFDMgr pFunc;
void *pParam;
unsigned id;
};
osiTimerForOldFdmgr::osiTimerForOldFdmgr (oldFdmgr &fdmgrIn,
double delayIn, void (*pFuncIn) (void *pParam), void *pParamIn) :
double delayIn, pCallBackFDMgr pFuncIn, void *pParamIn) :
fdmgr (fdmgrIn), osiTimer (delayIn, fdmgrIn.timerQueueRef ()),
pFunc (pFuncIn), pParam(pParamIn)
{
@@ -205,7 +205,7 @@ extern "C" epicsShareFunc fdctx * epicsShareAPI fdmgr_init (void)
}
extern "C" epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout (
fdctx *pfdctx, struct timeval *ptimeout, void (*pFunc)(void *pParam), void *pParam)
fdctx *pfdctx, struct timeval *ptimeout, pCallBackFDMgr pFunc, void *pParam)
{
double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <double> (osiTime::uSecPerSec);
oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
@@ -221,7 +221,8 @@ extern "C" epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout (
pTimer = new osiTimerForOldFdmgr (*pfdm, delay, pFunc, pParam);
# else
try {
pTimer = new osiTimerForOldFdmgr (*pfdm, delay, pFunc, pParam);
pTimer = new osiTimerForOldFdmgr
(*pfdm, delay, pFunc, pParam);
}
catch (...)
{
@@ -273,7 +274,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_timeout (fdctx *pfdctx,
}
extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback (
fdctx *pfdctx, SOCKET fd, enum fdi_type fdi, void (*pFunc)(void *pParam), void *pParam)
fdctx *pfdctx, SOCKET fd, enum fdi_type fdi, pCallBackFDMgr pFunc, void *pParam)
{
oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
fdRegForOldFdmgr *pfdrbc;

18
src/libCom/fdmgr/fdmgr.h
View File

@@ -42,10 +42,6 @@
#ifndef includeFdmgrH
#define includeFdmgrH
#ifdef __cplusplus
extern "C" {
#endif
#include "ellLib.h"
#include "bucketLib.h"
#include "osiSock.h"
@@ -53,10 +49,15 @@ extern "C" {
#include "osiThread.h"
#include "shareLib.h"
#ifdef __cplusplus
extern "C" {
#endif
enum fdi_type {fdi_read, fdi_write, fdi_excp};
enum alarm_list_type {alt_invalid, alt_alarm, alt_expired, alt_free};
typedef void fdctx;
typedef void (*pCallBackFDMgr)(void *);
/*
* C "typedef" name "alarm" was changed to "fdmgrAlarm" to avoid collisions
@@ -82,7 +83,7 @@ typedef void fdctx;
typedef unsigned fdmgrAlarmId;
#define NEW_FDMGR_ALARMID
#ifdef __STDC__
#if defined(__STDC__) || defined(__cplusplus)
/*
*
@@ -101,8 +102,7 @@ epicsShareFunc fdctx * epicsShareAPI fdmgr_init(void);
epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout(
fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
struct timeval *ptimeout, /* relative delay from current time */
void (*func)(void *pParam),
/* function (handler) to call */
pCallBackFDMgr pfunc, /* function (handler) to call */
void *param /* first parameter passed to the func */
);
@@ -136,7 +136,7 @@ epicsShareFunc int epicsShareAPI fdmgr_add_callback(
fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
SOCKET fd, /* file descriptor */
enum fdi_type fdi, /* file descriptor interest type */
void (*pfunc)(void *pParam), /* function (handler) to call */
pCallBackFDMgr pfunc, /* function (handler) to call */
void *param /* first parameter passed to the func */
);
@@ -180,7 +180,7 @@ SOCKET fd
epicsShareFunc int epicsShareAPI fdmgr_add_fd(
fdctx *pfdctx, /* fd mgr ctx from fdmgr_init() */
SOCKET fd,
void (*pfunc)(void *pParam),
pCallBackFDMgr pfunc, /* function (handler) to call */
void *param
);