C++11 and whitespace cleanups.

[dcpomatic.git] / src / lib / json_server.cc

diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc
index e171a630700252cb1377277e55ff6851c3f891df..8c626ad1f0e2186d48d205f050dfececbf6de0bc 100644 (file)
--- a/src/lib/json_server.cc
+++ b/src/lib/json_server.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,30 +18,35 @@
 
 */
 
-#include "json_server.h"
-#include "job_manager.h"
-#include "job.h"
-#include "util.h"
+
 #include "film.h"
+#include "job.h"
+#include "job_manager.h"
+#include "json_server.h"
 #include "transcode_job.h"
+#include "util.h"
 #include <dcp/raw_convert.h>
 #include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread.hpp>
 #include <iostream>
 
-using std::string;
+
 using std::cout;
-using std::map;
+using std::dynamic_pointer_cast;
 using std::list;
-using boost::thread;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::make_shared;
+using std::map;
+using std::shared_ptr;
+using std::string;
 using boost::asio::ip::tcp;
+using boost::thread;
 using dcp::raw_convert;
 
+
 #define MAX_LENGTH 512
 
+
 enum State {
        AWAITING_G,
        AWAITING_E,
@@ -50,11 +55,18 @@ enum State {
        READING_URL,
 };
 
+
 JSONServer::JSONServer (int port)
 {
+#ifdef DCPOMATIC_LINUX
+       auto t = new thread (boost::bind (&JSONServer::run, this, port));
+       pthread_setname_np (t->native_handle(), "json-server");
+#else
        new thread (boost::bind (&JSONServer::run, this, port));
+#endif
 }
 
+
 void
 JSONServer::run (int port)
 try
@@ -63,7 +75,7 @@ try
        tcp::acceptor a (io_service, tcp::endpoint (tcp::v4 (), port));
        while (true) {
                try {
-                       shared_ptr<tcp::socket> s (new tcp::socket (io_service));
+                       auto s = make_shared<tcp::socket>(io_service);
                        a.accept (*s);
                        handle (s);
                }
@@ -77,6 +89,7 @@ catch (...)
 
 }
 
+
 void
 JSONServer::handle (shared_ptr<tcp::socket> socket)
 {
@@ -92,11 +105,11 @@ JSONServer::handle (shared_ptr<tcp::socket> socket)
                        break;
                }
 
-               char* p = data;
-               char* e = data + len;
+               auto p = data;
+               auto e = data + len;
                while (p != e) {
 
-                       State old_state = state;
+                       auto old_state = state;
                        switch (state) {
                        case AWAITING_G:
                                if (*p == 'G') {
@@ -138,14 +151,15 @@ JSONServer::handle (shared_ptr<tcp::socket> socket)
        }
 }
 
+
 void
 JSONServer::request (string url, shared_ptr<tcp::socket> socket)
 {
        cout << "request: " << url << "\n";
 
-       map<string, string> r = split_get_request (url);
-       for (map<string, string>::iterator i = r.begin(); i != r.end(); ++i) {
-               cout << i->first << " => " << i->second << "\n";
+       auto r = split_get_request (url);
+       for (auto const& i: r) {
+               cout << i.first << " => " << i.second << "\n";
        }
 
        string action;
@@ -156,11 +170,10 @@ JSONServer::request (string url, shared_ptr<tcp::socket> socket)
        string json;
        if (action == "status") {
 
-               list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
+               auto jobs = JobManager::instance()->get();
 
                json += "{ \"jobs\": [";
-               for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
-
+               for (auto i = jobs.cbegin(); i != jobs.cend(); ++i) {
                        json += "{ ";
 
                        if ((*i)->film()) {
@@ -168,7 +181,7 @@ JSONServer::request (string url, shared_ptr<tcp::socket> socket)
                        }
 
                        json += "\"name\": \"" + (*i)->json_name() + "\", ";
-                       if ((*i)->progress ()) {
+                       if ((*i)->progress()) {
                                json += "\"progress\": " + raw_convert<string>((*i)->progress().get()) + ", ";
                        } else {
                                json += "\"progress\": unknown, ";
@@ -176,7 +189,7 @@ JSONServer::request (string url, shared_ptr<tcp::socket> socket)
                        json += "\"status\": \"" + (*i)->json_status() + "\"";
                        json += " }";
 
-                       list<shared_ptr<Job> >::iterator j = i;
+                       auto j = i;
                        ++j;
                        if (j != jobs.end ()) {
                                json += ", ";
@@ -191,5 +204,5 @@ JSONServer::request (string url, shared_ptr<tcp::socket> socket)
                "\r\n"
                + json + "\r\n";
        cout << "reply: " << json << "\n";
-       boost::asio::write (*socket, boost::asio::buffer (reply.c_str(), reply.length()));
+       boost::asio::write (*socket, boost::asio::buffer(reply.c_str(), reply.length()));
 }