diff --git a/src/ca/posix_depen.c b/src/ca/posix_depen.c index 25a4a9299..97370c2fd 100644 --- a/src/ca/posix_depen.c +++ b/src/ca/posix_depen.c @@ -29,6 +29,9 @@ * Modification Log: * ----------------- * $Log$ + * Revision 1.15 1995/08/22 00:22:07 jhill + * Dont recompute connection timers if the time stamp hasnt changed + * * */ @@ -54,41 +57,6 @@ void cac_gettimeval(struct timeval *pt) assert(status == 0); } - -/* - * CAC_MUX_IO() - * - * Asynch notification of incomming messages under UNIX - * 1) Wait no longer than timeout - * 2) Return early if nothing outstanding - * - * - */ -void cac_mux_io(struct timeval *ptimeout) -{ - int count; - struct timeval timeout; - - cac_clean_iiu_list(); - - /* - * manage search timers and detect disconnects - */ - manage_conn(TRUE); - - timeout = *ptimeout; - do{ - count = cac_select_io( - &timeout, - CA_DO_RECVS | CA_DO_SENDS); - - ca_process_input_queue(); - timeout.tv_sec = 0; - timeout.tv_usec = 0; - } - while(count>0); -} - /* * cac_block_for_io_completion() diff --git a/src/ca/vms_depen.c b/src/ca/vms_depen.c index 4f6d319c4..23075bcf0 100644 --- a/src/ca/vms_depen.c +++ b/src/ca/vms_depen.c @@ -29,6 +29,9 @@ * Modification Log: * ----------------- * $Log$ + * Revision 1.17 1995/08/22 00:27:56 jhill + * added cvs style mod log + * * */ @@ -56,44 +59,6 @@ void cac_gettimeval(struct timeval *pt) assert(status==0); } - -/* - * CAC_MUX_IO() - * - * Wait for send ready under VMS - * 1) Wait no longer than timeout - * - * Under VMS all recv's and input processing - * handled by ASTs - */ -void cac_mux_io(struct timeval *ptimeout) -{ - int count; - struct timeval timeout; - - cac_clean_iiu_list(); - - /* - * manage search timers and detect disconnects - */ - manage_conn(TRUE); - - timeout = *ptimeout; - do{ - count = cac_select_io( - &timeout, - CA_DO_RECVS | CA_DO_SENDS); - - ca_process_input_queue(); - - timeout.tv_sec = 0; - timeout.tv_usec = 0; - } - while(count>0); - -} - - /* * cac_block_for_io_completion() diff --git a/src/ca/vxWorks_depen.c b/src/ca/vxWorks_depen.c index 508b526fd..d23cdf4c3 100644 --- a/src/ca/vxWorks_depen.c +++ b/src/ca/vxWorks_depen.c @@ -29,6 +29,9 @@ * Modification Log: * ----------------- * $Log$ + * Revision 1.19 1995/08/22 00:27:58 jhill + * added cvs style mod log + * * */ @@ -86,40 +89,6 @@ void cac_gettimeval(struct timeval *pt) pt->tv_usec = ((current-sec*rate)*USEC_PER_SEC)/rate; } - -/* - * CAC_MUX_IO() - * - * Asynch notification of send unblocked for vxWorks - * 1) Wait no longer than timeout - * 2) Return early if nothing outstanding - * - * - */ -void cac_mux_io(struct timeval *ptimeout) -{ - int count; - struct timeval timeout; - -#if NOASYNCRECV - cac_clean_iiu_list(); -#endif - timeout = *ptimeout; - do{ - count = cac_select_io( - &timeout, - CA_DO_SENDS | CA_DO_RECVS); - timeout.tv_usec = 0; - timeout.tv_sec = 0; - } - while(count>0); - -#if NOASYNCRECV - ca_process_input_queue(); - manage_conn(TRUE); -#endif -} - /* * cac_block_for_io_completion() @@ -878,12 +847,9 @@ void cac_recv_task(int tid) #else cac_clean_iiu_list(); - timeout.tv_usec = 50000; + timeout.tv_usec = 10000; timeout.tv_sec = 0; - count = cac_select_io( - &timeout, - CA_DO_SENDS | CA_DO_RECVS); - + count = cac_select_io(&timeout, CA_DO_RECVS); ca_process_input_queue(); manage_conn(TRUE); #endif diff --git a/src/ca/windows_depen.c b/src/ca/windows_depen.c index 2a3acf0fb..83c1f707f 100644 --- a/src/ca/windows_depen.c +++ b/src/ca/windows_depen.c @@ -62,42 +62,6 @@ void cac_gettimeval(struct timeval *pt) pt->tv_usec = st.wMilliseconds*1000; } - -/* - * CAC_MUX_IO() - * - * Asynch notification of incomming messages under UNIX - * 1) Wait no longer than timeout - * 2) Return early if nothing outstanding - * - * - */ -void cac_mux_io(struct timeval *ptimeout) -{ - int count; - struct timeval timeout; - - cac_clean_iiu_list(); - - timeout = *ptimeout; - do{ - count = cac_select_io( - &timeout, - CA_DO_RECVS | CA_DO_SENDS); - - ca_process_input_queue(); - - /* - * manage search timers and detect disconnects - */ - manage_conn(TRUE); - - timeout.tv_sec = 0; - timeout.tv_usec = 0; - } - while(count>0); -} - /* * cac_block_for_io_completion()