3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 15:41:05 +08:00
Code Issues Projects Releases Wiki Activity

O(1) socket removal

Browse Source
This commit is contained in:
Martin Sustrik 2009-09-02 16:16:25 +02:00
parent f92de9b2a9
commit 4914e5c9d1
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app_thread.cpp
View File

@ -138,16 +138,16 @@ zmq::socket_base_t *zmq::app_thread_t::create_socket (int type_)
// TODO: type is ignored for the time being.
socket_base_t *s = new socket_base_t (this);
zmq_assert (s);
s->set_index (sockets.size ());
sockets.push_back (s);
return s;
}
void zmq::app_thread_t::remove_socket (socket_base_t *socket_)
{
// TODO: To speed this up we can possibly use the system where each socket
// holds its index (see I/O scheduler implementation).
sockets_t::iterator it = std::find (sockets.begin (), sockets.end (),
socket_);
zmq_assert (it != sockets.end ());
sockets.erase (it);
int i = socket_->get_index ();
socket_->set_index (-1);
sockets [i] = sockets.back ();
sockets [i]->set_index (i);
sockets.pop_back ();
}

14
src/socket_base.cpp
View File

@ -42,7 +42,8 @@ zmq::socket_base_t::socket_base_t (app_thread_t *parent_) :
pending_term_acks (0),
ticks (0),
app_thread (parent_),
shutting_down (false)
shutting_down (false),
index (-1)
{
}
@ -379,6 +380,17 @@ void zmq::socket_base_t::detach_outpipe (class writer_t *pipe_)
out_pipes.pop_back ();
}
void zmq::socket_base_t::set_index (int index_)
{
index = index_;
}
int zmq::socket_base_t::get_index ()
{
zmq_assert (index != -1);
return index;
}
void zmq::socket_base_t::process_own (owned_t *object_)
{
io_objects.insert (object_);

7
src/socket_base.hpp
View File

@ -66,6 +66,10 @@ namespace zmq
void detach_inpipe (class reader_t *pipe_);
void detach_outpipe (class writer_t *pipe_);
// Manipulating index in the app_thread's list of sockets.
void set_index (int index);
int get_index ();
private:
// Handlers for incoming commands.
@ -131,6 +135,9 @@ namespace zmq
sessions_t sessions;
mutex_t sessions_sync;
// Index of the socket in the app_thread's list of sockets.
int index;
socket_base_t (const socket_base_t&);
void operator = (const socket_base_t&);
};