Separate ExceptionStore.

[dcpomatic.git] / src / lib / server.h

diff --git a/src/lib/server.h b/src/lib/server.h
index b925031eb2df667cfff90f64a71eacdf3ecb6d7f..97bc26fd896b130d777426a41c680e1a58ca1bbc 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -21,75 +21,27 @@
 #define DCPOMATIC_SERVER_H
 
 /** @file src/server.h
- *  @brief Class to describe a server to which we can send
- *  encoding work, and a class to implement such a server.
+ *  @brief Server class.
  */
 
-#include <string>
+#include "exception_store.h"
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
-#include <boost/optional.hpp>
-#include <libxml++/libxml++.h>
-#include "log.h"
-#include "exceptions.h"
+#include <string>
 
 class Socket;
+class Log;
 
-namespace cxml {
-       class Node;
-}
-
-/** @class ServerDescription
- *  @brief Class to describe a server to which we can send encoding work.
+/** @class Server
+ *  @brief A class to run a server which can accept requests to perform JPEG2000
+ *  encoding work.
  */
-class ServerDescription
-{
-public:
-       ServerDescription ()
-               : _host_name ("")
-               , _threads (1)
-       {}
-       
-       /** @param h Server host name or IP address in string form.
-        *  @param t Number of threads to use on the server.
-        */
-       ServerDescription (std::string h, int t)
-               : _host_name (h)
-               , _threads (t)
-       {}
-
-       /* Default copy constructor is fine */
-       
-       /** @return server's host name or IP address in string form */
-       std::string host_name () const {
-               return _host_name;
-       }
-
-       /** @return number of threads to use on the server */
-       int threads () const {
-               return _threads;
-       }
-
-       void set_host_name (std::string n) {
-               _host_name = n;
-       }
-
-       void set_threads (int t) {
-               _threads = t;
-       }
-
-private:
-       /** server's host name */
-       std::string _host_name;
-       /** number of threads to use on the server */
-       int _threads;
-};
-
 class Server : public ExceptionStore, public boost::noncopyable
 {
 public:
        Server (boost::shared_ptr<Log> log, bool verbose);
+       ~Server ();
 
        void run (int num_threads);
 
@@ -98,6 +50,10 @@ private:
        int process (boost::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
        void broadcast_thread ();
        void broadcast_received ();
+       void start_accept ();
+       void handle_accept (boost::shared_ptr<Socket>, boost::system::error_code const &);
+
+       bool _terminate;
 
        std::vector<boost::thread *> _worker_threads;
        std::list<boost::shared_ptr<Socket> > _queue;
@@ -107,18 +63,22 @@ private:
        boost::shared_ptr<Log> _log;
        bool _verbose;
 
+       boost::asio::io_service _io_service;
+       boost::asio::ip::tcp::acceptor _acceptor;
+
        struct Broadcast {
 
                Broadcast ()
                        : thread (0)
                        , socket (0)
                {}
-               
+
                boost::thread* thread;
                boost::asio::ip::udp::socket* socket;
                char buffer[64];
                boost::asio::ip::udp::endpoint send_endpoint;
-               
+               boost::asio::io_service io_service;
+
        } _broadcast;
 };