From 19481259fd2d27058b1ed68775b82e802a4c9ec5 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 11 Aug 1993 17:53:24 +0000 Subject: [PATCH] V5 switches out --- src/ca/V5_vxWorks_patch.c | 2 -- src/ca/access.c | 67 +++++++++++++-------------------------- src/ca/flow_control.c | 3 -- src/ca/iocinf.c | 6 +--- src/ca/iocinf.h | 6 +--- src/ca/os_depen.h | 7 ---- src/ca/service.c | 3 -- 7 files changed, 24 insertions(+), 70 deletions(-) diff --git a/src/ca/V5_vxWorks_patch.c b/src/ca/V5_vxWorks_patch.c index c15eb4982..3c0bd7ac9 100644 --- a/src/ca/V5_vxWorks_patch.c +++ b/src/ca/V5_vxWorks_patch.c @@ -1,4 +1,3 @@ -#ifdef V5_vxWorks static char *sccsId = "@(#)V5_vxWorks_patch.c 1.2\t7/27/92"; @@ -64,4 +63,3 @@ int taskVarGetPatch (tid, pVar) return (ERROR); } -#endif diff --git a/src/ca/access.c b/src/ca/access.c index d6d64b271..f7253e0eb 100644 --- a/src/ca/access.c +++ b/src/ca/access.c @@ -111,7 +111,7 @@ /************************************************************************/ /*_end */ -static char *sccsId = "$Id$\t$Date$"; +static char *sccsId = "@(#)access.c 1.34\t8/5/93"; /* * allocate error message string array @@ -372,11 +372,7 @@ int ca_task_initialize FASTLOCKINIT(&client_lock); FASTLOCKINIT(&event_lock); -# ifdef V5_vxWorks io_done_sem = semBCreate(SEM_Q_PRIORITY, SEM_EMPTY); -# else - io_done_sem = semCreate(); -# endif if(!io_done_sem){ abort(); } @@ -585,11 +581,9 @@ ca_add_task_variable() ca_printf("CAC: adding delete hook\n"); # endif -# ifdef V5_vxWorks - status = taskVarInit(); - if (status != OK) - return ERROR; -# endif + status = taskVarInit(); + if (status != OK) + return ERROR; status = taskDeleteHookAdd(ca_task_exit_tcb); if (status != OK) { logMsg("ca_init_task: could not add CA delete routine\n"); @@ -636,7 +630,6 @@ int ca_task_exit * */ #ifdef vxWorks -#ifdef V5_vxWorks static void ca_task_exit_tcb(ptcb) WIND_TCB *ptcb; @@ -654,14 +647,6 @@ WIND_TCB *ptcb; */ ca_task_exit_tid((int) ptcb); } -#else -static void -ca_task_exit_tcb(ptcbx) -TCBX *ptcbx; -{ - ca_task_exit_tid((int) ptcbx->taskId); -} -#endif #endif @@ -697,13 +682,8 @@ ca_process_exit() # if defined(vxWorks) -# ifdef V5_vxWorks - ca_temp = (struct ca_static *) + ca_temp = (struct ca_static *) taskVarGetPatch(tid, &ca_static); -# else - ca_temp = (struct ca_static *) - taskVarGet(tid, &ca_static); -# endif if (ca_temp == (struct ca_static *) ERROR){ # if DEBUG @@ -804,11 +784,19 @@ ca_process_exit() * event blocks */ for (i = 0; i < ca_temp->ca_nxtiiu; i++) { - if (ca_temp->ca_iiu[i].conn_up) - if (socket_close(ca_temp->ca_iiu[i].sock_chan) < 0) + if (ca_temp->ca_iiu[i].conn_up){ + if(fd_register_func){ + (*fd_register_func)( + fd_register_arg, + ca_temp->ca_iiu[i].sock_chan, + FALSE); + } + if (socket_close(ca_temp->ca_iiu[i].sock_chan) < 0){ ca_signal( ECA_INTERNAL, "Corrupt iiu list- at close"); + } + } free((char *)ca_temp->ca_iiu[i].send); free((char *)ca_temp->ca_iiu[i].recv); } @@ -851,16 +839,12 @@ ca_process_exit() ca_signal(ECA_INTERNAL, "couldnt free memory"); if(FASTLOCKFREE(&ca_temp->ca_event_lock) < 0) ca_signal(ECA_INTERNAL, "couldnt free memory"); -# ifdef V5_vxWorks - status = semDelete(ca_temp->ca_io_done_sem); - if(status < 0){ - ca_signal( - ECA_INTERNAL, - "couldnt free sem"); - } -# else - semDelete(ca_temp->ca_io_done_sem); -# endif + status = semDelete(ca_temp->ca_io_done_sem); + if(status < 0){ + ca_signal( + ECA_INTERNAL, + "couldnt free sem"); + } # endif free((char *)ca_temp); @@ -2336,14 +2320,7 @@ int early; } #else # if defined(vxWorks) -# ifdef V5_vxWorks - semTake(io_done_sem, LOCALTICKS); -# else - { - int dummy; - vrtxPend(&io_done_sem->count, LOCALTICKS, &dummy); - } -# endif + semTake(io_done_sem, LOCALTICKS); # else # if defined(VMS) { diff --git a/src/ca/flow_control.c b/src/ca/flow_control.c index 37a44432a..bbe9d0218 100644 --- a/src/ca/flow_control.c +++ b/src/ca/flow_control.c @@ -40,9 +40,6 @@ static char *sccsId = "@(#)flow_control.c 1.7\t6/2/93"; # include # include # include -# ifndef V5_vxWorks -# include -# endif #else # if defined(VMS) # include diff --git a/src/ca/iocinf.c b/src/ca/iocinf.c index b715b3041..69de5240b 100644 --- a/src/ca/iocinf.c +++ b/src/ca/iocinf.c @@ -97,11 +97,7 @@ static char *sccsId = "$Id$\t$Date$"; # else # if defined(vxWorks) # include -# ifdef V5_vxWorks -# include -# else -# include -# endif +# include # include # include # include diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h index 2a44939ab..7be73b4b5 100644 --- a/src/ca/iocinf.h +++ b/src/ca/iocinf.h @@ -66,11 +66,7 @@ static char *iocinfhSccsId = "@(#)iocinf.h 1.15\t6/2/93"; # include # else # if defined(vxWorks) -# ifdef V5_vxWorks -# include -# else -# include -# endif +# include # include # else DONT_COMPILE diff --git a/src/ca/os_depen.h b/src/ca/os_depen.h index 8c757dbeb..9a4c57467 100644 --- a/src/ca/os_depen.h +++ b/src/ca/os_depen.h @@ -49,9 +49,6 @@ static char *os_depenhSccsId = "@(#)os_depen.h 1.12\t2/19/93"; # ifndef INCtaskLibh # include # endif -# ifndef V5_vxWorks - IMPORT ULONG taskIdCurrent; -# endif # else # if defined(VMS) # else @@ -201,12 +198,8 @@ static char *os_depenhSccsId = "@(#)os_depen.h 1.12\t2/19/93"; #if defined(vxWorks) -#ifdef V5_vxWorks # define POST_IO_EV semGive(io_done_sem) #else -# define POST_IO_EV vrtxPost(&io_done_sem->count, TRUE) -#endif -#else # if defined(VMS) # define POST_IO_EV sys$setef(io_done_flag) # else diff --git a/src/ca/service.c b/src/ca/service.c index 486f30473..33a46dba9 100644 --- a/src/ca/service.c +++ b/src/ca/service.c @@ -80,9 +80,6 @@ static char *sccsId = "@(#)service.c 1.17\t6/2/93"; # else # if defined(vxWorks) # include -# ifndef V5_vxWorks -# include -# endif # else @@@@ dont compile @@@@ # endif