Commit d7088d90 authored by neverlord's avatar neverlord

fixed select() bug and static initialization/deinitialization

parent 7023a997
...@@ -93,6 +93,8 @@ class mailman_job ...@@ -93,6 +93,8 @@ class mailman_job
}; };
void mailman_loop();
util::single_reader_queue<mailman_job>& mailman_queue(); util::single_reader_queue<mailman_job>& mailman_queue();
}} // namespace cppa::detail }} // namespace cppa::detail
......
#include <atomic>
#include <iostream> #include <iostream>
#include <boost/thread.hpp> // boost::barrier
#include "cppa/to_string.hpp" #include "cppa/to_string.hpp"
#include "cppa/detail/mailman.hpp" #include "cppa/detail/mailman.hpp"
#include "cppa/binary_serializer.hpp" #include "cppa/binary_serializer.hpp"
#include "cppa/detail/post_office.hpp" #include "cppa/detail/post_office.hpp"
#define DEBUG(arg) std::cout << arg << std::endl //#define DEBUG(arg) std::cout << arg << std::endl
#define DEBUG(unused) //
// forward declaration // static queue helper
namespace cppa { namespace detail { namespace { void mailman_loop(); } } }
// static helper
namespace { namespace {
/*
struct mailman_manager struct mailman_manager
{ {
typedef cppa::util::single_reader_queue<cppa::detail::mailman_job> queue_t; typedef cppa::util::single_reader_queue<cppa::detail::mailman_job> queue_t;
boost::thread* m_loop; boost::barrier m_init_handshake;
queue_t* m_queue; boost::barrier m_shutdown_handshake;
queue_t m_queue;
mailman_manager() mailman_manager()
{ {
...@@ -36,6 +38,7 @@ struct mailman_manager ...@@ -36,6 +38,7 @@ struct mailman_manager
} }
s_mailman_manager; s_mailman_manager;
*/
} // namespace <anonymous> } // namespace <anonymous>
// implementation of mailman.hpp // implementation of mailman.hpp
...@@ -106,16 +109,18 @@ mailman_job::~mailman_job() ...@@ -106,16 +109,18 @@ mailman_job::~mailman_job()
} }
} }
/*
// implemented in post_office.cpp
util::single_reader_queue<mailman_job>& mailman_queue() util::single_reader_queue<mailman_job>& mailman_queue()
{ {
return *(s_mailman_manager.m_queue); return *s_queue;
//return *(s_mailman_manager.m_queue);
} }
*/
} } // namespace cppa::detail
namespace cppa { namespace detail { namespace {
void mailman_loop() void mailman_loop()
{ {
// delete s_queue if mailman_loop exits
// serializes outgoing messages // serializes outgoing messages
binary_serializer bs; binary_serializer bs;
// current active job // current active job
...@@ -215,4 +220,5 @@ void mailman_loop() ...@@ -215,4 +220,5 @@ void mailman_loop()
delete job; delete job;
} }
} }
} } } // namespace cppa::detail::<anonymous>
} } // namespace cppa::detail
This diff is collapsed.
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