0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempt to fix bug where an assertion would fail in network_worker.cpp

Browse source
This commit is contained in:
Dave White 2005-01-23 22:04:20 +00:00
parent ef30196f32
commit e6ceaa4cd5
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/network_worker.cpp
View file

@ -169,6 +169,24 @@ void queue_data(TCPsocket sock, std::vector<char>& buf)
cond->notify_one();
}
namespace
{
void remove_buffers(TCPsocket sock)
{
buffer_set new_bufs;
new_bufs.reserve(bufs.size());
for(buffer_set::iterator i = bufs.begin(), i_end = bufs.end(); i != i_end; ++i) {
if ((*i)->sock == sock)
delete *i;
else
new_bufs.push_back(*i);
}
bufs.swap(new_bufs);
}
}
void close_socket(TCPsocket sock)
{
for(bool first_time = true; ; first_time = false) {
@ -185,16 +203,7 @@ void close_socket(TCPsocket sock)
sockets_locked.erase(lock_it);
}
size_t size = bufs.size();
buffer_set new_bufs;
new_bufs.reserve(size);
for(buffer_set::iterator i = bufs.begin(), i_end = bufs.end(); i != i_end; ++i) {
if ((*i)->sock == sock)
delete *i;
else
new_bufs.push_back(*i);
}
bufs.swap(new_bufs);
remove_buffers(sock);
break;
}
@ -210,6 +219,7 @@ TCPsocket detect_error()
--socket_errors;
const TCPsocket res = i->first;
sockets_locked.erase(i);
remove_buffers(res);
return res;
}
}
@ -218,4 +228,4 @@ TCPsocket detect_error()
return 0;
}
}
}