#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <signal.h>
#include <errno.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
return server_sock;
}
+
+AcceptorThread::AcceptorThread(int server_sock)
+ : server_sock(server_sock)
+{
+}
+
+void AcceptorThread::run()
+{
+ should_stop = false;
+ pthread_create(&worker_thread, NULL, &AcceptorThread::do_work_thunk, this);
+}
-void *acceptor_thread_run(void *arg)
+void AcceptorThread::stop()
+{
+ should_stop = true;
+ pthread_kill(worker_thread, SIGHUP);
+ if (pthread_join(worker_thread, NULL) == -1) {
+ perror("pthread_join");
+ exit(1);
+ }
+}
+
+void *AcceptorThread::do_work_thunk(void *arg)
+{
+ AcceptorThread *acceptor_thread = reinterpret_cast<AcceptorThread *>(arg);
+ acceptor_thread->do_work();
+ return NULL;
+}
+
+void AcceptorThread::do_work()
{
- int server_sock = int(intptr_t(arg));
while (!hupped) {
// Since we are non-blocking, we need to wait for the right state first.
// Wait up to 50 ms, then check hupped.
// Pick a server, round-robin, and hand over the socket to it.
servers->add_client(sock);
}
- return NULL;
}
// A thread that accepts new connections on a given socket,
// and hands them off to the server pool.
-void *acceptor_thread_run(void *arg);
+class AcceptorThread {
+public:
+ AcceptorThread(int server_sock);
+ void run();
+ void stop();
+
+private:
+ // Recovers the this pointer, and hands over control to do_work().
+ static void *do_work_thunk(void *arg);
+
+ void do_work();
+
+ int server_sock;
+
+ pthread_t worker_thread;
+ volatile bool should_stop;
+};
#endif // !defined(_ACCEPTOR_H)
servers->run();
- pthread_t acceptor_thread;
- pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
+ AcceptorThread acceptor_thread(server_sock);
+ acceptor_thread.run();
// Find all streams in the configuration file, and create inputs for them.
vector<Input *> inputs;
if (stats_thread != NULL) {
stats_thread->stop();
}
- pthread_kill(acceptor_thread, SIGHUP);
- if (pthread_join(acceptor_thread, NULL) == -1) {
- perror("pthread_join");
- exit(1);
- }
+ acceptor_thread.stop();
CubemapStateProto state;
state.set_serialize_start_sec(serialize_start.tv_sec);