Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/server.h b/src/lib/server.h
index f7a0abb800163985e22129c413790135b80528bb..6ef2688310ba0ff46edb15c90d8cfdf5531abc90 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -1,60 +1,56 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-/** @file src/server.h
- *  @brief Class to describe a server to which we can send
- *  encoding work.
- */
+#ifndef DCPOMATIC_SERVER_H
+#define DCPOMATIC_SERVER_H
 
+#include <boost/thread.hpp>
+#include <boost/asio.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/noncopyable.hpp>
 #include <string>
 
-/** @class Server
- *  @brief Class to describe a server to which we can send encoding work.
- */
-class Server
+class Socket;
+
+class Server : public boost::noncopyable
 {
 public:
-       /** @param h Server host name or IP address in string form.
-        *  @param t Number of threads to use on the server.
-        */
-       Server (std::string h, int t)
-               : _host_name (h)
-               , _threads (t)
-       {}
-
-       /** @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;
-       }
-
-       std::string as_metadata () const;
-       
-       static Server * create_from_metadata (std::string v);
+       explicit Server (int port, int timeout = 30);
+       virtual ~Server ();
+
+       virtual void run ();
+       void stop ();
+
+protected:
+       boost::mutex _mutex;
+       bool _terminate;
 
 private:
-       /** server's host name */
-       std::string _host_name;
-       /** number of threads to use on the server */
-       int _threads;
+       virtual void handle (boost::shared_ptr<Socket> socket) = 0;
+
+       void start_accept ();
+       void handle_accept (boost::shared_ptr<Socket>, boost::system::error_code const &);
+
+       boost::asio::io_service _io_service;
+       boost::asio::ip::tcp::acceptor _acceptor;
+       int _timeout;
 };
+
+#endif