summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-02-03 18:58:58 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-02-03 18:58:58 (GMT)
commit7e0df026a7ffc410ee1b679590025fa68b6af133 (patch)
tree46b4980a034945a3adb6f5da152684276e5cb468 /Swiften/Network
parent943bfc85b57c27266bc22d986c327355b68389b9 (diff)
downloadswift-7e0df026a7ffc410ee1b679590025fa68b6af133.zip
swift-7e0df026a7ffc410ee1b679590025fa68b6af133.tar.bz2
Close socket immediately after last pending write finished.
This should fix a hang on disconnect().
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/BoostConnection.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Swiften/Network/BoostConnection.cpp b/Swiften/Network/BoostConnection.cpp
index 534ebdb..7b997b4 100644
--- a/Swiften/Network/BoostConnection.cpp
+++ b/Swiften/Network/BoostConnection.cpp
@@ -75,6 +75,7 @@ void BoostConnection::disconnect() {
// Mac OS X apparently exhibits a problem where closing a socket during a write could potentially go into uninterruptable sleep.
// See e.g. http://bugs.python.org/issue7401
// We therefore wait until any pending write finishes, which hopefully should fix our hang on exit during close().
+ boost::lock_guard<boost::mutex> lock(writeMutex_);
if (writing_) {
closeSocketAfterNextWrite_ = true;
} else {
@@ -87,9 +88,6 @@ void BoostConnection::write(const SafeByteArray& data) {
if (!writing_) {
writing_ = true;
doWrite(data);
- if (closeSocketAfterNextWrite_) {
- socket_.close();
- }
}
else {
append(writeQueue_, data);
@@ -149,6 +147,9 @@ void BoostConnection::handleDataWritten(const boost::system::error_code& error)
boost::lock_guard<boost::mutex> lock(writeMutex_);
if (writeQueue_.empty()) {
writing_ = false;
+ if (closeSocketAfterNextWrite_) {
+ socket_.close();
+ }
}
else {
doWrite(writeQueue_);