From 765753e7bceca1c41feaf834bbbd5f5e8745d5d0 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 31 May 2000 21:53:59 +0000
Subject: [PATCH] added local channel list and split mutex to avoid deadlock

---
 src/ca/iocinf.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h
index 908a3efdd..9f90c5492 100644
--- a/src/ca/iocinf.h
+++ b/src/ca/iocinf.h
@@ -224,6 +224,7 @@ public:
     unsigned            claimPending:1; /* T if claim msg was sent      */
     unsigned            previousConn:1; /* T if connected in the past   */
 private:
+
     unsigned long       count;
     unsigned short      typeCode;
     unsigned            f_connected:1;
@@ -407,7 +408,7 @@ public:
     virtual void removeFromChanList (nciu *chan) = 0;
     virtual void disconnect (nciu *chan) = 0;
 
-    tsDLList<nciu> chidList;
+    tsDLList <nciu> chidList;
 };
 
 class udpiiu;
@@ -742,8 +743,6 @@ public:
     unsigned readSequence () const;
     int pend (double timeout, int early);
     bool ioComplete () const;
-    void lock ();
-    void unlock ();
     void exceptionNotify (int status, const char *pContext,
         const char *pFileName, unsigned lineNo);
     void exceptionNotify (int status, const char *pContext,
@@ -790,15 +789,16 @@ public:
     unsigned short          ca_server_port;
     char                    ca_sprintf_buf[256];
     char                    ca_new_err_code_msg_buf[128u];
-    unsigned                ca_manage_conn_active:1; 
-    unsigned                ca_flush_pending:1;
 
     ELLLIST                 ca_taskVarList;
 private:
     cacServiceList          services;
-    osiMutex                iiuListLock;
+    osiMutex                defaultMutex;
+    osiMutex                iiuListMutex;
     tsDLList <tcpiiu>       iiuListIdle;
     tsDLList <tcpiiu>       iiuListRecvPending;
+    tsDLList 
+        <cacLocalChannelIO> localChanList;
     chronIntIdResTable 
         < baseNMIU >        ioTable;
     chronIntIdResTable