Commit 9735fe76 authored by Dominik Charousset's avatar Dominik Charousset

removed debug output

parent c9cbffed
......@@ -117,12 +117,15 @@ class middleman_event_handler {
*/
void update();
std::vector<continuable*> readers();
bool has_reader(continuable* ptr);
bool has_writer(continuable* ptr);
template<typename F>
inline void for_each_reader(F fun) {
for (auto& meta : m_meta) if (meta.mask & event::read) fun(meta.ptr);
}
protected:
std::vector<fd_meta_info> m_meta; // this vector is *always* sorted
......
......@@ -343,8 +343,9 @@ void middleman_loop(middleman_impl* impl) {
}
CPPA_LOGF_DEBUG("event loop done, erase all readers");
// make sure to write everything before shutting down
auto readers = handler->readers();
for (auto reader : readers) { handler->erase_later(reader, event::read); }
handler->for_each_reader([handler](continuable* ptr) {
handler->erase_later(ptr, event::read);
});
handler->update();
CPPA_LOGF_DEBUG("flush outgoing messages");
CPPA_LOGF_DEBUG_IF(handler->num_sockets() == 0,
......
......@@ -141,27 +141,17 @@ void middleman_event_handler::update() {
return iter != last && iter->fd == fd;
};
// check whether elements in dispose list can be safely deleted
for (auto& elem : m_dispose_list) {
for (auto elem : m_dispose_list) {
auto rd = elem->read_handle();
auto wr = elem->write_handle();
if ( (rd == wr && !is_alive(rd))
|| (rd != wr && !is_alive(rd) && !is_alive(wr))) {
std::cout << "SAFE TO DISPOSE ELEMENT: " << elem << std::endl;
elem->dispose();
}
else std::cout << "GOTTA KEEP ELEMENT: " << elem << std::endl;
}
m_dispose_list.clear();
}
std::vector<continuable*> middleman_event_handler::readers() {
std::vector<continuable*> result;
for (auto& meta : m_meta) {
if (meta.mask & event::read) result.push_back(meta.ptr);
}
return result;
}
bool middleman_event_handler::has_reader(continuable* ptr) {
return std::any_of(m_meta.begin(), m_meta.end(), [=](fd_meta_info& meta) {
return meta.ptr == ptr && (meta.mask & event::read);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment