diff --git a/src/ca/acctst.c b/src/ca/acctst.c index 17a23d3b0..327152c1e 100644 --- a/src/ca/acctst.c +++ b/src/ca/acctst.c @@ -7,6 +7,9 @@ static char *sccsId = "@(#) $Id$"; /* * $Log$ + * Revision 1.42 1996/12/12 18:51:41 jhill + * doc + * * Revision 1.41 1996/12/11 01:10:33 jhill * added additional vector tests * @@ -45,10 +48,6 @@ static char *sccsId = "@(#) $Id$"; * */ -#ifdef VMS -#include -#endif - /* * ANSI */ @@ -57,10 +56,11 @@ static char *sccsId = "@(#) $Id$"; #include #include #include - -#include "os_depen.h" - #include + +/* + * CA + */ #include #define EVENT_ROUTINE null_event @@ -110,6 +110,8 @@ dbr_float_t epsilon, unsigned iterations); #ifdef vxWorks +#include +#include int acctst(char *pname) { @@ -166,9 +168,6 @@ int doacctst(char *pname) conn_cb_count = 0; printf("begin\n"); -#ifdef VMS - lib$init_timer(); -#endif /*VMS*/ printf("CA Client V%s\n", ca_version()); @@ -360,14 +359,6 @@ int doacctst(char *pname) fflush(stdout); } -#ifdef VMS - lib$show_timer(); -#endif /*VMS*/ - -#ifdef VMS - lib$init_timer(); -#endif /*VMS*/ - printf("Read Access=%d Write Access=%d\n", ca_read_access(chix1), ca_write_access(chix1)); @@ -759,51 +750,71 @@ int doacctst(char *pname) * if multiple elements are present */ if (VALID_DB_REQ(chix1->type)) { - if (ca_element_count(chix1)>1u) { - dbr_float_t *pRF, *pWF, *pEF, *pT; + if (ca_element_count(chix1)>1u && ca_read_access(chix1)) { + dbr_float_t *pRF, *pWF, *pEF, *pT1, *pT2; - printf("Performing array test..."); + printf("Performing %u element array test...", + ca_element_count(chix1)); fflush(stdout); - pRF = (dbr_float_t *) calloc(ca_element_count(chix1), sizeof(*pRF)); + pRF = (dbr_float_t *) calloc(ca_element_count(chix1), + sizeof(*pRF)); assert(pRF!=NULL); - pWF = (dbr_float_t *)calloc(ca_element_count(chix1), sizeof(*pWF)); + pWF = (dbr_float_t *)calloc(ca_element_count(chix1), + sizeof(*pWF)); assert(pWF!=NULL); + /* + * write some random numbers into the array + */ if (ca_write_access(chix1)) { - pT = pWF; - while(pRF