From bd986f033df429970405d94d5f95472b742066c7 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 15 Aug 1991 11:47:19 +0000 Subject: [PATCH] added epics env param --- src/libvxWorks/iocLogClient.c | 73 +++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/src/libvxWorks/iocLogClient.c b/src/libvxWorks/iocLogClient.c index 1b1d9412b..b2d54508c 100644 --- a/src/libvxWorks/iocLogClient.c +++ b/src/libvxWorks/iocLogClient.c @@ -30,7 +30,8 @@ * * Modification Log: * ----------------- - * joh 00 080791 Created + * .00 joh 080791 Created + * .01 joh 081591 Added epics env config */ #include @@ -41,7 +42,10 @@ #include #include -int iocLogFD; + +int iocLogFD = ERROR; +int iocLogDisable; + static long ioc_log_port; static struct in_addr ioc_log_addr; @@ -49,15 +53,24 @@ int iocLogInit(); int getConfig(); void failureNoptify(); - - -static int + +/* + * + * iocLogInit() + * + * + */ +int iocLogInit() { int sock; struct sockaddr_in addr; int status; + if(iocLogDisable){ + return OK; + } + status = getConfig(); if(status<0){ logMsg("iocLogClient: EPICS environment under specified\n"); @@ -91,32 +104,18 @@ iocLogInit() if (status < 0) { char name[INET_ADDR_LEN]; - inet_ntoa_b(addr, name); - logMsg("iocLogClient: unable to connect to `%s'\n", - name); + inet_ntoa_b(addr.sin_addr, name); + logMsg("iocLogClient: unable to connect to `%s' at port %d\n", + name, + addr.sin_port); printErrno(errnoGet(0)); close(sock); return ERROR; } logFdAdd(sock); + iocLogFD = sock; -#ifdef JUNKYARD - ioTaskStdSet(taskIdSelf(), 1, sock); - - while (1) { - date(); -/* - memShow(0); - i(0); - checkStack(0); -*/ - /* - * 60 min - */ - taskDelay(sysClkRateGet() * 60 * 60); - } -#endif return OK; } @@ -170,3 +169,29 @@ ENV_PARAM *pparam; logMsg( "IocLogClient: EPICS environment variable `%s' undefined\n", pparam->name); } + + + + +/* + * + * unused + * + * + */ +#ifdef JUNKYARD + ioTaskStdSet(taskIdSelf(), 1, sock); + + while (1) { + date(); +/* + memShow(0); + i(0); + checkStack(0); +*/ + /* + * 60 min + */ + taskDelay(sysClkRateGet() * 60 * 60); + } +#endif