From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 4 Sep 2000 08:29:22 +0000 (+0000)
Subject: Fixed memory leak(s). Added re-use of associations, rather than
X-Git-Tag: YAZPP.0.3~85
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=804e399b3394762e87f54d8b1c6e0fe882f9e03b;p=yazpp-moved-to-github.git

Fixed memory leak(s). Added re-use of associations, rather than
re-init, when maximum number of targets are in use.
---

diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp
index fafac44..84f4238 100644
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-pdu-assoc.cpp,v $
- * Revision 1.10  2000-08-10 08:42:42  adam
+ * Revision 1.11  2000-09-04 08:29:22  adam
+ * Fixed memory leak(s). Added re-use of associations, rather than
+ * re-init, when maximum number of targets are in use.
+ *
+ * Revision 1.10  2000/08/10 08:42:42  adam
  * Fixes for {set,get}_APDU_log.
  *
  * Revision 1.9  1999/12/06 13:52:45  adam
@@ -117,7 +121,7 @@ void Yaz_PDU_Assoc::socketNotify(int event)
 		return;
 	    if (res < 0)
 	    {
-		logf(LOG_FATAL, "cs_listen failed");
+		logf(LOG_FATAL|LOG_ERRNO, "cs_listen failed");
 		return;
 	    }
 	    if (!(new_line = cs_accept(m_cs)))
@@ -197,7 +201,7 @@ void Yaz_PDU_Assoc::close()
 	m_queue_out = m_queue_out->m_next;
 	delete q_this;
     }
-//   free (m_input_buf);
+    xfree (m_input_buf);
     m_input_buf = 0;
     m_input_len = 0;
 }
diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index ec15ce5..e3954d1 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy.cpp,v $
- * Revision 1.15  2000-08-31 14:41:55  adam
+ * Revision 1.16  2000-09-04 08:29:22  adam
+ * Fixed memory leak(s). Added re-use of associations, rather than
+ * re-init, when maximum number of targets are in use.
+ *
+ * Revision 1.15  2000/08/31 14:41:55  adam
  * Proxy no longer generates cookies (it's up to the client). Proxy
  * re-opens if target new op is started before previous operation finishes.
  *
@@ -162,8 +166,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
-	    logf (LOG_LOG, " found client cookie = %s target=%s",
-		  c->m_cookie, c->get_hostname());
+	    logf (LOG_LOG, " found client cookie = %s target=%s seqno=%d",
+		  c->m_cookie, c->get_hostname(), c->m_seqno);
 	    assert (c->m_prev);
 	    assert (*c->m_prev == c);
 	    if (!strcmp(cookie,c->m_cookie) &&
@@ -175,8 +179,12 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	}
 	if (cc)
 	{
+	    // found it in cache
 	    c = cc;
-	    if (c->m_waiting)
+	    // The following handles "cancel"
+	    // If connection is busy (waiting for PDU) and
+	    // we have an initRequest we can safely do re-open
+	    if (c->m_waiting && apdu->which == Z_APDU_initRequest)
 	    {
 		logf (LOG_LOG, "reopen target=%s", c->get_hostname());
 		c->close();
@@ -211,7 +219,6 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
 	    no_of_clients++;
-	    logf (LOG_LOG, "found seqno = %d", c->m_seqno);
 	    if (min_seq < 0 || c->m_seqno < min_seq)
 	    {
 		min_seq = c->m_seqno;
@@ -221,11 +228,26 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	if (no_of_clients >= parent->m_max_clients)
 	{
 	    c = c_min;
-	    logf (LOG_LOG, "Yaz_Proxy::get_client re-using session %d",
-		  c->m_seqno);
-	    if (c->m_server)
-		delete c->m_server;
-	    c->m_server = 0;
+	    if (c->m_waiting || strcmp(m_proxyTarget, c->get_hostname()))
+	    {
+		logf (LOG_LOG, "Yaz_Proxy::get_client re-init session %d",
+		      c->m_seqno);
+		if (c->m_server)
+		    delete c->m_server;
+		c->m_server = 0;
+	    }
+	    else
+	    {
+		logf (LOG_LOG, "Yaz_Proxy::get_client re-use session %d to %d",
+		      c->m_seqno, parent->m_seqno);
+		if (cookie)
+		    strcpy (c->m_cookie, cookie);
+		else
+		    c->m_cookie[0] = '\0';
+		c->m_seqno = parent->m_seqno;
+		(parent->m_seqno)++;
+		return c;
+	    }
 	}
 	else
 	{
@@ -346,11 +368,6 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
 	return;
     }
     m_client->m_server = this;
-#if 0
-    Z_OtherInformation **oi;
-    get_otherInfoAPDU(apdu, &oi);
-    *oi = 0;
-#endif
 
     if (apdu->which == Z_APDU_initRequest)
     {
@@ -370,6 +387,12 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
 	return;
 
     logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU %s", m_client->get_hostname());
+
+    // delete other info part from PDU before sending to target
+    Z_OtherInformation **oi;
+    get_otherInfoAPDU(apdu, &oi);
+    *oi = 0;
+
     if (m_client->send_Z_PDU(apdu) < 0)
     {
 	delete m_client;
diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 5cc0000..0a6503d 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-z-assoc.cpp,v $
- * Revision 1.9  2000-08-10 08:42:42  adam
+ * Revision 1.10  2000-09-04 08:29:22  adam
+ * Fixed memory leak(s). Added re-use of associations, rather than
+ * re-init, when maximum number of targets are in use.
+ *
+ * Revision 1.9  2000/08/10 08:42:42  adam
  * Fixes for {set,get}_APDU_log.
  *
  * Revision 1.8  2000/08/07 14:19:59  adam
@@ -80,7 +84,7 @@ void Yaz_Z_Assoc::set_APDU_log(const char *fname)
     {
 	m_APDU_fname = new char[strlen(fname)+1];
 	strcpy (m_APDU_fname, fname);
-	if (*fname)
+	if (*fname && strcmp(fname, "-"))
 	    m_APDU_file = fopen (fname, "a");
 	else
 	    m_APDU_file = stderr;