From 68ba5201ee1a4d3a618cd3a364eac83e84682723 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 26 Nov 1991 15:36:13 +0000
Subject: [PATCH] flush prior to each send

---
 src/ca/iocinf.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/ca/iocinf.c b/src/ca/iocinf.c
index 88ba66dd1..ed541bff1 100644
--- a/src/ca/iocinf.c
+++ b/src/ca/iocinf.c
@@ -18,12 +18,15 @@
 /*			each message					*/
 /*	071291	joh	no longer sends id at TCP connect		*/
 /*	082791	joh	split send_msg() into two subroutines		*/
-/*	110491	joh	call recv_msg to free up deadlock only if 	*/
-/*			client blocks on send as before			*/
 /*	110491	joh	mark all channels disconnected prior to		*/
 /*			calling the first connection handler on		*/
 /*			disconnect					*/
 /*	110491	joh	allow cac_send_msg() to be called recursively	*/
+/*	110691	joh	call recv_msg to free up deadlock prior to 	*/
+/*			each send until a better solution is found	*/
+/*			(checking only when the socket blocks causes	*/
+/*			does not leave enough margin to fix the		*/
+/*			problem once it is detected)			*/
 /*									*/
 /*_begin								*/
 /************************************************************************/
@@ -605,7 +608,17 @@ void cac_send_msg()
  	 *
 	 */
 	while(TRUE){
-
+		/*
+		 * Ensure we do not accumulate extra recv
+		 * messages (for TCP)
+		 *
+		 * frees up push pull deadlock only
+		 * if recv not already in progress
+		 */
+#		ifdef 	UNIX
+			if(post_msg_active==0)
+				recv_msg_select(&notimeout);
+#		endif
 
 		done = TRUE;
   		for(piiu=iiu; piiu<&iiu[nxtiiu]; piiu++){
@@ -619,7 +632,6 @@ void cac_send_msg()
 			}
     		}
 
-
 #ifndef UNIX
 		break;
 #else
@@ -745,15 +757,6 @@ register struct ioc_in_use 	*piiu;
 					cnt);
 				piiu->send->stk = cnt;
 			}
-			/*
-			 * Ensure we do not accumulate extra recv
-			 * messages (for TCP)
-			 *
-			 * frees up push pull deadlock only
-			 * if recv not already in progress
-			 */
-			if(post_msg_active==0)
-				recv_msg_select(&notimeout);
 
 			return ERROR;
 		}