From 9b385480d035443944dfb880098166b84e2dd973 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 7 Dec 2018 13:51:35 -0600 Subject: [PATCH] Rename new *QueuePrintStatus() and *QueueStatus iocsh commands to *Show Also added symbol decorations for Windows builds. --- src/ioc/db/callback.c | 2 +- src/ioc/db/callback.h | 2 +- src/ioc/db/dbIocRegister.c | 36 ++++++++++++++++++------------------ src/ioc/db/dbScan.c | 2 +- src/ioc/db/dbScan.h | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/ioc/db/callback.c b/src/ioc/db/callback.c index 1b6c24906..fe6db815b 100644 --- a/src/ioc/db/callback.c +++ b/src/ioc/db/callback.c @@ -130,7 +130,7 @@ int callbackQueueStatus(const int reset, callbackQueueStats *result) return ret; } -void callbackQueuePrintStatus(const int reset) +void callbackQueueShow(const int reset) { callbackQueueStats stats; if (callbackQueueStatus(reset, &stats) == -1) { diff --git a/src/ioc/db/callback.h b/src/ioc/db/callback.h index dd13cdb81..720cf337d 100644 --- a/src/ioc/db/callback.h +++ b/src/ioc/db/callback.h @@ -81,7 +81,7 @@ epicsShareFunc void callbackRequestProcessCallbackDelayed( CALLBACK *pCallback, int Priority, void *pRec, double seconds); epicsShareFunc int callbackSetQueueSize(int size); epicsShareFunc int callbackQueueStatus(const int reset, callbackQueueStats *result); -void callbackQueuePrintStatus(const int reset); +epicsShareFunc void callbackQueueShow(const int reset); epicsShareFunc int callbackParallelThreads(int count, const char *prio); #ifdef __cplusplus diff --git a/src/ioc/db/dbIocRegister.c b/src/ioc/db/dbIocRegister.c index cecf75608..c40af92c1 100644 --- a/src/ioc/db/dbIocRegister.c +++ b/src/ioc/db/dbIocRegister.c @@ -296,15 +296,15 @@ static void scanOnceSetQueueSizeCallFunc(const iocshArgBuf *args) scanOnceSetQueueSize(args[0].ival); } -/* scanOnceQueueStatus */ -static const iocshArg scanOnceQueueStatusArg0 = { "reset",iocshArgInt}; -static const iocshArg * const scanOnceQueueStatusArgs[1] = - {&scanOnceQueueStatusArg0}; -static const iocshFuncDef scanOnceQueueStatusFuncDef = - {"scanOnceQueueStatus",1,scanOnceQueueStatusArgs}; -static void scanOnceQueueStatusCallFunc(const iocshArgBuf *args) +/* scanOnceQueueShow */ +static const iocshArg scanOnceQueueShowArg0 = { "reset",iocshArgInt}; +static const iocshArg * const scanOnceQueueShowArgs[1] = + {&scanOnceQueueShowArg0}; +static const iocshFuncDef scanOnceQueueShowFuncDef = + {"scanOnceQueueShow",1,scanOnceQueueShowArgs}; +static void scanOnceQueueShowCallFunc(const iocshArgBuf *args) { - scanOnceQueuePrintStatus(args[0].ival); + scanOnceQueueShow(args[0].ival); } /* scanppl */ @@ -346,15 +346,15 @@ static void callbackSetQueueSizeCallFunc(const iocshArgBuf *args) callbackSetQueueSize(args[0].ival); } -/* callbackQueueStatus */ -static const iocshArg callbackQueueStatusArg0 = { "reset", iocshArgInt}; -static const iocshArg * const callbackQueueStatusArgs[1] = - {&callbackQueueStatusArg0}; -static const iocshFuncDef callbackQueueStatusFuncDef = - {"callbackQueueStatus",1,callbackQueueStatusArgs}; -static void callbackQueueStatusCallFunc(const iocshArgBuf *args) +/* callbackQueueShow */ +static const iocshArg callbackQueueShowArg0 = { "reset", iocshArgInt}; +static const iocshArg * const callbackQueueShowArgs[1] = + {&callbackQueueShowArg0}; +static const iocshFuncDef callbackQueueShowFuncDef = + {"callbackQueueShow",1,callbackQueueShowArgs}; +static void callbackQueueShowCallFunc(const iocshArgBuf *args) { - callbackQueuePrintStatus(args[0].ival); + callbackQueueShow(args[0].ival); } /* callbackParallelThreads */ @@ -463,14 +463,14 @@ void dbIocRegister(void) iocshRegister(&dbLockShowLockedFuncDef,dbLockShowLockedCallFunc); iocshRegister(&scanOnceSetQueueSizeFuncDef,scanOnceSetQueueSizeCallFunc); - iocshRegister(&scanOnceQueueStatusFuncDef,scanOnceQueueStatusCallFunc); + iocshRegister(&scanOnceQueueShowFuncDef,scanOnceQueueShowCallFunc); iocshRegister(&scanpplFuncDef,scanpplCallFunc); iocshRegister(&scanpelFuncDef,scanpelCallFunc); iocshRegister(&postEventFuncDef,postEventCallFunc); iocshRegister(&scanpiolFuncDef,scanpiolCallFunc); iocshRegister(&callbackSetQueueSizeFuncDef,callbackSetQueueSizeCallFunc); - iocshRegister(&callbackQueueStatusFuncDef,callbackQueueStatusCallFunc); + iocshRegister(&callbackQueueShowFuncDef,callbackQueueShowCallFunc); iocshRegister(&callbackParallelThreadsFuncDef,callbackParallelThreadsCallFunc); /* Needed before callback system is initialized */ diff --git a/src/ioc/db/dbScan.c b/src/ioc/db/dbScan.c index e0e14e0d2..9224ed504 100644 --- a/src/ioc/db/dbScan.c +++ b/src/ioc/db/dbScan.c @@ -744,7 +744,7 @@ int scanOnceQueueStatus(const int reset, scanOnceQueueStats *result) return ret; } -void scanOnceQueuePrintStatus(const int reset) +void scanOnceQueueShow(const int reset) { scanOnceQueueStats stats; if (scanOnceQueueStatus(reset, &stats) == -1) { diff --git a/src/ioc/db/dbScan.h b/src/ioc/db/dbScan.h index 830d3a8dc..622103c3b 100644 --- a/src/ioc/db/dbScan.h +++ b/src/ioc/db/dbScan.h @@ -65,7 +65,7 @@ epicsShareFunc int scanOnce(struct dbCommon *); epicsShareFunc int scanOnceCallback(struct dbCommon *, once_complete cb, void *usr); epicsShareFunc int scanOnceSetQueueSize(int size); epicsShareFunc int scanOnceQueueStatus(const int reset, scanOnceQueueStats *result); -void scanOnceQueuePrintStatus(const int reset); +epicsShareFunc void scanOnceQueueShow(const int reset); /*print periodic lists*/ epicsShareFunc int scanppl(double rate);