The IDPU_Observer method, close, renamed to shutdown. Method hutdown
shuts down the socket connection (immediately).
Added new method, close_session, which closes the connection as soon as
it becomes idle (when everything in queue is flushed).
These changes should make it possible to fix bug #1130.
* Copyright (c) 1998-2005, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2005, Index Data.
* See the file LICENSE for details.
*
- * $Id: pdu-assoc.h,v 1.1 2006-03-29 13:14:15 adam Exp $
+ * $Id: pdu-assoc.h,v 1.2 2008-01-21 15:57:27 adam Exp $
*/
#ifndef YAZ_PDU_ASSOC_INCLUDED
*/
#ifndef YAZ_PDU_ASSOC_INCLUDED
int m_idleTime;
int m_log;
void init(yazpp_1::ISocketObservable *socketObservable);
int m_idleTime;
int m_log;
void init(yazpp_1::ISocketObservable *socketObservable);
+ bool m_session_is_dead;
public:
COMSTACK comstack(const char *type_and_host, void **vp);
/// Create object using specified socketObservable
public:
COMSTACK comstack(const char *type_and_host, void **vp);
/// Create object using specified socketObservable
/// Socket notification
void socketNotify(int event);
/// Close socket
/// Socket notification
void socketNotify(int event);
/// Close socket
/// Close and destroy
void destroy();
/// Set Idle Time
void idleTime (int timeout);
/// Child start...
virtual void childNotify(COMSTACK cs);
/// Close and destroy
void destroy();
/// Set Idle Time
void idleTime (int timeout);
/// Child start...
virtual void childNotify(COMSTACK cs);
+ /// close session
+ void close_session();
const char *getpeername();
};
const char *getpeername();
};
* Copyright (c) 1998-2005, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2005, Index Data.
* See the file LICENSE for details.
*
- * $Id: pdu-observer.h,v 1.1 2006-03-29 13:14:15 adam Exp $
+ * $Id: pdu-observer.h,v 1.2 2008-01-21 15:57:27 adam Exp $
*/
#ifndef YAZ_PDU_OBSERVER_H
*/
#ifndef YAZ_PDU_OBSERVER_H
/// Listen on address addr.
virtual int listen(IPDU_Observer *observer, const char *addr) = 0;
/// Close connection
/// Listen on address addr.
virtual int listen(IPDU_Observer *observer, const char *addr) = 0;
/// Close connection
- virtual void close() = 0;
+ virtual void shutdown() = 0;
/// Make clone of this object using this interface
virtual IPDU_Observable *clone() = 0;
/// Destroy completely
/// Make clone of this object using this interface
virtual IPDU_Observable *clone() = 0;
/// Destroy completely
virtual void idleTime (int timeout) = 0;
/// Get peername
virtual const char *getpeername() = 0;
virtual void idleTime (int timeout) = 0;
/// Get peername
virtual const char *getpeername() = 0;
+ /// Close session
+ virtual void close_session() = 0;
virtual ~IPDU_Observable();
};
virtual ~IPDU_Observable();
};
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-pdu-assoc-thread.cpp,v 1.15 2006-03-30 11:58:00 adam Exp $
+ * $Id: yaz-pdu-assoc-thread.cpp,v 1.16 2008-01-21 15:57:27 adam Exp $
if (!new_observable->m_PDU_Observer)
{
if (!new_observable->m_PDU_Observer)
{
- new_observable->close();
+ new_observable->shutdown();
delete new_observable;
delete socket_observable;
return;
delete new_observable;
delete socket_observable;
return;
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-pdu-assoc.cpp,v 1.46 2006-03-30 11:58:00 adam Exp $
+ * $Id: yaz-pdu-assoc.cpp,v 1.47 2008-01-21 15:57:27 adam Exp $
m_destroyed = 0;
m_idleTime = 0;
m_log = YLOG_DEBUG;
m_destroyed = 0;
m_idleTime = 0;
m_log = YLOG_DEBUG;
+ m_session_is_dead = false;
}
PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable)
}
PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable)
this, m_state, event);
if (event & SOCKET_OBSERVE_EXCEPT)
{
this, m_state, event);
if (event & SOCKET_OBSERVE_EXCEPT)
{
m_PDU_Observer->failNotify();
return;
}
m_PDU_Observer->failNotify();
return;
}
{
yaz_log (m_log, "PDU_Assoc::cs_accept failed");
m_cs = 0;
{
yaz_log (m_log, "PDU_Assoc::cs_accept failed");
m_cs = 0;
m_PDU_Observer->failNotify();
}
else
m_PDU_Observer->failNotify();
}
else
event & SOCKET_OBSERVE_WRITE)
{
// For Unix: if both read and write is set, then connect failed.
event & SOCKET_OBSERVE_WRITE)
{
// For Unix: if both read and write is set, then connect failed.
m_PDU_Observer->failNotify();
}
else
m_PDU_Observer->failNotify();
}
else
else if (res <= 0)
{
yaz_log (m_log, "PDU_Assoc::Connection closed by peer");
else if (res <= 0)
{
yaz_log (m_log, "PDU_Assoc::Connection closed by peer");
if (m_PDU_Observer)
m_PDU_Observer->failNotify(); // problem here..
return;
if (m_PDU_Observer)
m_PDU_Observer->failNotify(); // problem here..
return;
break;
case Closed:
yaz_log (m_log, "CLOSING state=%d event was %d", m_state, event);
break;
case Closed:
yaz_log (m_log, "CLOSING state=%d event was %d", m_state, event);
m_PDU_Observer->failNotify();
break;
default:
yaz_log (m_log, "Unknown state=%d event was %d", m_state, event);
m_PDU_Observer->failNotify();
break;
default:
yaz_log (m_log, "Unknown state=%d event was %d", m_state, event);
m_PDU_Observer->failNotify();
}
}
m_PDU_Observer->failNotify();
}
}
+void PDU_Assoc::close_session()
+{
+ m_session_is_dead = true;
+ if (!m_queue_out)
+ {
+ shutdown();
+ m_PDU_Observer->failNotify();
+ }
+}
+
+void PDU_Assoc::shutdown()
{
PDU_Assoc *ch;
for (ch = m_children; ch; ch = ch->m_next)
{
PDU_Assoc *ch;
for (ch = m_children; ch; ch = ch->m_next)
m_socketObservable->deleteObserver(this);
m_state = Closed;
m_socketObservable->deleteObserver(this);
m_state = Closed;
void PDU_Assoc::destroy()
{
void PDU_Assoc::destroy()
{
if (m_destroyed)
*m_destroyed = 1;
if (m_destroyed)
*m_destroyed = 1;
m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
SOCKET_OBSERVE_WRITE|
SOCKET_OBSERVE_EXCEPT);
m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
SOCKET_OBSERVE_WRITE|
SOCKET_OBSERVE_EXCEPT);
+ if (m_session_is_dead)
+ {
+ shutdown();
+ m_PDU_Observer->failNotify();
+ }
return 0;
}
r = cs_put (m_cs, q->m_buf, q->m_len);
if (r < 0)
{
yaz_log (m_log, "PDU_Assoc::flush_PDU cs_put failed");
return 0;
}
r = cs_put (m_cs, q->m_buf, q->m_len);
if (r < 0)
{
yaz_log (m_log, "PDU_Assoc::flush_PDU cs_put failed");
m_PDU_Observer->failNotify();
return r;
}
m_PDU_Observer->failNotify();
return r;
}
int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
{
int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
{
m_PDU_Observer = observer;
void *ap;
m_PDU_Observer = observer;
void *ap;
int PDU_Assoc::connect(IPDU_Observer *observer, const char *addr)
{
yaz_log (m_log, "PDU_Assoc::connect %s", addr);
int PDU_Assoc::connect(IPDU_Observer *observer, const char *addr)
{
yaz_log (m_log, "PDU_Assoc::connect %s", addr);
m_PDU_Observer = observer;
void *ap;
m_cs = comstack(addr, &ap);
m_PDU_Observer = observer;
void *ap;
m_cs = comstack(addr, &ap);
if (!new_observable->m_PDU_Observer)
{
if (!new_observable->m_PDU_Observer)
{
- new_observable->close();
+ new_observable->shutdown();
delete new_observable;
return;
}
delete new_observable;
return;
}
* Copyright (c) 1998-2007, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2007, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-z-assoc.cpp,v 1.43 2007-05-08 12:04:50 adam Exp $
+ * $Id: yaz-z-assoc.cpp,v 1.44 2008-01-21 15:57:28 adam Exp $
- m_PDU_Observable->close ();
+ m_PDU_Observable->close_session();
}
int Z_Assoc::server(const char *addr)
}
int Z_Assoc::server(const char *addr)