retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

If when writing data on the application socket the select call fails, do not try again, but return immediately. 

On application thread cleanup, release the application mutex immediately after setting the pointer to the socket to null.



git-svn-id: http://yate.null.ro/svn/yate/trunk@5360 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
oana 2012-12-14 14:46:19 +00:00
parent 0db06d7034
commit f025d7553b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/sig/camel_map.cpp
View File

@ -7016,9 +7016,12 @@ bool XMLConnection::writeData(XmlFragment* elem)
const char* buffer = xml.c_str();
while (m_socket && (len > 0)) {
bool writeOk = false,error = false;
if (!m_socket->select(0,&writeOk,&error,idleUsec()))
if (!m_socket->select(0,&writeOk,&error,idleUsec()) || error) {
if (!m_socket->canRetry())
return false;
continue;
if (!writeOk || error)
}
if (!writeOk )
continue;
int w = m_socket->writeData(buffer,len);
if (w < 0) {
@ -8058,8 +8061,11 @@ void TcapXApplication::setIO(XMLConnection* io)
{
DDebug(&__plugin,DebugAll,"TcapXApplication::setIO(io=%p) - app=%s[%p]",io,m_name.c_str(),this);
Lock l(this);
if (!m_io)
return;
m_io = io;
if (!m_io && m_user)
l.drop();
if (!io && m_user)
m_user->removeApp(this);
}