Move server code into library; Server -> ServerDescription.

3 files changed, 51 insertions, 195 deletions

diff --git a/src/tools/servomatic.cc b/src/tools/servomatic.cc
deleted file mode 100644
index a9c45b3df..000000000
--- a/src/tools/servomatic.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    This program 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,
-    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.
-
-*/
-
-#include <iostream>
-#include <stdexcept>
-#include <sstream>
-#include <cstring>
-#include <vector>
-#include <unistd.h>
-#include <errno.h>
-#include <boost/array.hpp>
-#include <boost/asio.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
-#include "config.h"
-#include "dcp_video_frame.h"
-#include "exceptions.h"
-#include "util.h"
-#include "config.h"
-#include "scaler.h"
-#include "image.h"
-#include "log.h"
-
-#define BACKLOG 8
-
-using namespace std;
-using namespace boost;
-
-static vector<thread *> worker_threads;
-
-static std::list<shared_ptr<asio::ip::tcp::socket> > queue;
-static mutex worker_mutex;
-static condition worker_condition;
-static Log log_ ("servomatic.log");
-
-int
-process (shared_ptr<asio::ip::tcp::socket> socket)
-{
-	SocketReader reader (socket);
-	
-	char buffer[128];
-	reader.read_indefinite ((uint8_t *) buffer, sizeof (buffer));
-	reader.consume (strlen (buffer) + 1);
-	
-	stringstream s (buffer);
-	
-	string command;
-	s >> command;
-	if (command != "encode") {
-		return -1;
-	}
-	
-	Size in_size;
-	int pixel_format_int;
-	Size out_size;
-	int padding;
-	string scaler_id;
-	int frame;
-	float frames_per_second;
-	string post_process;
-	int colour_lut_index;
-	int j2k_bandwidth;
-	
-	s >> in_size.width >> in_size.height
-	  >> pixel_format_int
-	  >> out_size.width >> out_size.height
-	  >> padding
-	  >> scaler_id
-	  >> frame
-	  >> frames_per_second
-	  >> post_process
-	  >> colour_lut_index
-	  >> j2k_bandwidth;
-	
-	PixelFormat pixel_format = (PixelFormat) pixel_format_int;
-	Scaler const * scaler = Scaler::from_id (scaler_id);
-	if (post_process == "none") {
-		post_process = "";
-	}
-	
-	shared_ptr<SimpleImage> image (new SimpleImage (pixel_format, in_size));
-	
-	for (int i = 0; i < image->components(); ++i) {
-		int line_size;
-		s >> line_size;
-		image->set_line_size (i, line_size);
-	}
-	
-	for (int i = 0; i < image->components(); ++i) {
-		reader.read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i));
-	}
-	
-#ifdef DEBUG_HASH
-	image->hash ("Image for encoding (as received by server)");
-#endif		
-	
-	DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, &log_);
-	shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
-	encoded->send (socket);
-
-#ifdef DEBUG_HASH
-	encoded->hash ("Encoded image (as made by server and as sent back)");
-#endif		
-	
-	return frame;
-}
-
-void
-worker_thread ()
-{
-	while (1) {
-		mutex::scoped_lock lock (worker_mutex);
-		while (queue.empty ()) {
-			worker_condition.wait (lock);
-		}
-
-		shared_ptr<asio::ip::tcp::socket> socket = queue.front ();
-		queue.pop_front ();
-		
-		lock.unlock ();
-
-		int frame = -1;
-
-		struct timeval start;
-		gettimeofday (&start, 0);
-		
-		try {
-			frame = process (socket);
-		} catch (std::exception& e) {
-			cerr << "Error: " << e.what() << "\n";
-		}
-		
-		socket.reset ();
-		
-		lock.lock ();
-
-		if (frame >= 0) {
-			struct timeval end;
-			gettimeofday (&end, 0);
-			cout << "Encoded frame " << frame << " in " << (seconds (end) - seconds (start)) << "\n";
-		}
-		
-		worker_condition.notify_all ();
-	}
-}
-
-int
-main ()
-{
-	Scaler::setup_scalers ();
-
-	int const num_threads = Config::instance()->num_local_encoding_threads ();
-	
-	for (int i = 0; i < num_threads; ++i) {
-		worker_threads.push_back (new thread (worker_thread));
-	}
-	
-	asio::io_service io_service;
-	asio::ip::tcp::acceptor acceptor (io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ()));
-	while (1) {
-		shared_ptr<asio::ip::tcp::socket> socket (new asio::ip::tcp::socket (io_service));
-		acceptor.accept (*socket);
-
-		mutex::scoped_lock lock (worker_mutex);
-		
-		/* Wait until the queue has gone down a bit */
-		while (int (queue.size()) >= num_threads * 2) {
-			worker_condition.wait (lock);
-		}
-		
-		queue.push_back (socket);
-		worker_condition.notify_all ();
-	}
-	
-	return 0;
-}
diff --git a/src/tools/servomatic_cli.cc b/src/tools/servomatic_cli.cc
new file mode 100644
index 000000000..1fcd02117
--- /dev/null
+++ b/src/tools/servomatic_cli.cc
@@ -0,0 +1,50 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#include "lib/server.h"
+#include <iostream>
+#include <stdexcept>
+#include <sstream>
+#include <cstring>
+#include <vector>
+#include <unistd.h>
+#include <errno.h>
+#include <boost/array.hpp>
+#include <boost/asio.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition.hpp>
+#include "config.h"
+#include "dcp_video_frame.h"
+#include "exceptions.h"
+#include "util.h"
+#include "config.h"
+#include "scaler.h"
+#include "image.h"
+#include "log.h"
+
+int
+main ()
+{
+	Scaler::setup_scalers ();
+	Server server;
+	server.run ();
+	return 0;
+}
diff --git a/src/tools/wscript b/src/tools/wscript
index be3d44e6d..ff7134d15 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -1,5 +1,5 @@
 def build(bld):
-    for t in ['makedcp', 'fixlengths', 'servomatic']:
+    for t in ['makedcp', 'fixlengths', 'servomatic_cli']:
         obj = bld(features = 'cxx cxxprogram')
     	obj.uselib = 'BOOST_THREAD'
 	obj.includes = ['..']