]> git.sesse.net Git - casparcg/blobdiff - shell/main.cpp
Merge commit '008e8dd2152b97abaf2b6c4f9ac385eb1e1d1d6e' into 2.1.0
[casparcg] / shell / main.cpp
index 9c1f6b36307877629635f0071a13890831f698a9..b90bd40018219abba98dc17097a27fa220b08756 100644 (file)
@@ -19,9 +19,9 @@
 * Author: Robert Nagy, ronag89@gmail.com
 */
 
-// tbbmalloc_proxy: 
-// Replace the standard memory allocation routines in Microsoft* C/C++ RTL 
-// (malloc/free, global new/delete, etc.) with the TBB memory allocator. 
+// tbbmalloc_proxy:
+// Replace the standard memory allocation routines in Microsoft* C/C++ RTL
+// (malloc/free, global new/delete, etc.) with the TBB memory allocator.
 
 #include "stdafx.h"
 
 #include <boost/thread.hpp>
 #include <boost/thread/future.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
+#include <tbb/atomic.h>
 
 #include <future>
+#include <set>
 
 #include <csignal>
+#include <clocale>
 
 using namespace caspar;
-       
+
 void setup_global_locale()
 {
        boost::locale::generator gen;
        gen.categories(boost::locale::codepage_facet);
 
        std::locale::global(gen(""));
+
+       // sscanf is used in for example FFmpeg where we want decimals to be parsed as .
+       std::setlocale(LC_ALL, "C");
 }
 
 void print_info()
@@ -100,18 +109,23 @@ void print_system_info(const spl::shared_ptr<core::system_info_provider_reposito
                log::print_child(boost::log::trivial::info, L"", elem.first, elem.second);
 }
 
-void do_run(std::weak_ptr<caspar::IO::protocol_strategy<wchar_t>> amcp, std::promise<bool>& shutdown_server_now)
+void do_run(
+               std::weak_ptr<caspar::IO::protocol_strategy<wchar_t>> amcp,
+               std::promise<bool>& shutdown_server_now,
+               tbb::atomic<bool>& should_wait_for_keypress)
 {
+       ensure_gpf_handler_installed_for_thread("Console thread");
        std::wstring wcmd;
        while(true)
        {
-               std::getline(std::wcin, wcmd); // TODO: It's blocking...
-                               
-               //boost::to_upper(wcmd);
+               if (!std::getline(std::wcin, wcmd))             // TODO: It's blocking...
+                       wcmd = L"EXIT";                                         // EOF, handle as EXIT
 
                if(boost::iequals(wcmd, L"EXIT") || boost::iequals(wcmd, L"Q") || boost::iequals(wcmd, L"QUIT") || boost::iequals(wcmd, L"BYE"))
                {
-                       shutdown_server_now.set_value(true);    //true to wait for keypress
+                       CASPAR_LOG(info) << L"Received message from Console: " << wcmd << L"\\r\\n";
+                       should_wait_for_keypress = true;
+                       shutdown_server_now.set_value(false);   //false to not restart
                        break;
                }
 
@@ -129,11 +143,11 @@ void do_run(std::weak_ptr<caspar::IO::protocol_strategy<wchar_t>> amcp, std::pro
                        else if(wcmd.substr(0, 1) == L"5")
                        {
                                auto file = wcmd.substr(2, wcmd.length()-1);
-                               wcmd = L"PLAY 1-1 " + file + L" LOOP\r\n" 
-                                               L"PLAY 1-2 " + file + L" LOOP\r\n" 
+                               wcmd = L"PLAY 1-1 " + file + L" LOOP\r\n"
+                                               L"PLAY 1-2 " + file + L" LOOP\r\n"
                                                L"PLAY 1-3 " + file + L" LOOP\r\n"
-                                               L"PLAY 2-1 " + file + L" LOOP\r\n" 
-                                               L"PLAY 2-2 " + file + L" LOOP\r\n" 
+                                               L"PLAY 2-1 " + file + L" LOOP\r\n"
+                                               L"PLAY 2-2 " + file + L" LOOP\r\n"
                                                L"PLAY 2-3 " + file + L" LOOP\r\n";
                        }
                        else if(wcmd.substr(0, 1) == L"7")
@@ -197,7 +211,7 @@ void do_run(std::weak_ptr<caspar::IO::protocol_strategy<wchar_t>> amcp, std::pro
        }
 };
 
-bool run(const std::wstring& config_file_name)
+bool run(const std::wstring& config_file_name, tbb::atomic<bool>& should_wait_for_keypress)
 {
        std::promise<bool> shutdown_server_now;
        std::future<bool> shutdown_server = shutdown_server_now.get_future();
@@ -206,7 +220,10 @@ bool run(const std::wstring& config_file_name)
 
        // Create server object which initializes channels, protocols and controllers.
        std::unique_ptr<server> caspar_server(new server(shutdown_server_now));
-       
+
+       // For example CEF resets the global locale, so this is to reset it back to "our" preference.
+       setup_global_locale();
+
        // Print environment information.
        print_system_info(caspar_server->get_system_info_provider_repo());
 
@@ -214,8 +231,11 @@ bool run(const std::wstring& config_file_name)
        boost::property_tree::xml_writer_settings<std::wstring> w(' ', 3);
        boost::property_tree::write_xml(str, env::properties(), w);
        CASPAR_LOG(info) << config_file_name << L":\n-----------------------------------------\n" << str.str() << L"-----------------------------------------";
-       
-       caspar_server->start();
+
+       {
+               CASPAR_SCOPED_CONTEXT_MSG(config_file_name + L": ")
+               caspar_server->start();
+       }
 
        // Create a dummy client which prints amcp responses to console.
        auto console_client = spl::make_shared<IO::ConsoleClientInfo>();
@@ -229,9 +249,9 @@ bool run(const std::wstring& config_file_name)
                                                        caspar_server->get_amcp_command_repository())))->create(console_client);
        std::weak_ptr<IO::protocol_strategy<wchar_t>> weak_amcp = amcp;
 
-       // Use separate thread for the blocking console input, will be terminated 
+       // Use separate thread for the blocking console input, will be terminated
        // anyway when the main thread terminates.
-       boost::thread stdin_thread(std::bind(do_run, weak_amcp, std::ref(shutdown_server_now)));        //compiler didn't like lambda here...
+       boost::thread stdin_thread(std::bind(do_run, weak_amcp, std::ref(shutdown_server_now), std::ref(should_wait_for_keypress)));    //compiler didn't like lambda here...
        stdin_thread.detach();
        bool should_restart = shutdown_server.get();
        amcp.reset();
@@ -258,7 +278,7 @@ int main(int argc, char** argv)
        setup_global_locale();
 
        std::wcout << L"Type \"q\" to close application." << std::endl;
-       
+
        // Set debug mode.
        auto debugging_environment = setup_debugging_environment();
 
@@ -280,8 +300,8 @@ int main(int argc, char** argv)
 
        tbb::task_scheduler_init init;
        std::wstring config_file_name(L"casparcg.config");
-       
-       try 
+
+       try
        {
                // Configure environment properties from configuration.
                if (argc >= 2)
@@ -289,32 +309,51 @@ int main(int argc, char** argv)
 
                env::configure(config_file_name);
 
-               log::set_log_level(env::properties().get(L"configuration.log-level", L"debug"));
+               log::set_log_level(env::properties().get(L"configuration.log-level", L"info"));
+               auto log_categories_str = env::properties().get(L"configuration.log-categories", L"communication");
+               std::set<std::wstring> log_categories;
+               boost::split(log_categories, log_categories_str, boost::is_any_of(L", "));
+               for (auto& log_category : { L"calltrace", L"communication" })
+                       log::set_log_category(log_category, log_categories.find(log_category) != log_categories.end());
 
                if (env::properties().get(L"configuration.debugging.remote", false))
                        wait_for_remote_debugging();
 
                // Start logging to file.
-               log::add_file_sink(env::log_folder());                  
+               log::add_file_sink(env::log_folder() + L"caspar",               caspar::log::category != caspar::log::log_category::calltrace);
+               log::add_file_sink(env::log_folder() + L"calltrace",    caspar::log::category == caspar::log::log_category::calltrace);
                std::wcout << L"Logging [info] or higher severity to " << env::log_folder() << std::endl << std::endl;
-               
+
+               // Once logging to file, log configuration warnings.
+               env::log_configuration_warnings();
+
                // Setup console window.
                setup_console_window();
 
-               return_code = run(config_file_name) ? 5 : 0;
+               tbb::atomic<bool> should_wait_for_keypress;
+               should_wait_for_keypress = false;
+               auto should_restart = run(config_file_name, should_wait_for_keypress);
+               return_code = should_restart ? 5 : 0;
 
                for (auto& thread : get_thread_infos())
                {
                        if (thread->name != "main thread" && thread->name != "tbb-worker-thread")
                                CASPAR_LOG(warning) << L"Thread left running: " << thread->name << L" (" << thread->native_id << L")";
                }
-               
+
                CASPAR_LOG(info) << "Successfully shutdown CasparCG Server.";
+
+               if (should_wait_for_keypress)
+                       wait_for_keypress();
        }
-       catch(boost::property_tree::file_parser_error&)
+       catch(const boost::property_tree::file_parser_error& e)
        {
-               CASPAR_LOG_CURRENT_EXCEPTION();
-               CASPAR_LOG(fatal) << L"Unhandled configuration error in main thread. Please check the configuration file (" << config_file_name << L") for errors.";
+               CASPAR_LOG(fatal) << "At " << u8(config_file_name) << ":" << e.line() << ": " << e.message() << ". Please check the configuration file (" << u8(config_file_name) << ") for errors.";
+               wait_for_keypress();
+       }
+       catch (const user_error& e)
+       {
+               CASPAR_LOG(fatal) << get_message_and_context(e) << " Please check the configuration file (" << u8(config_file_name) << ") for errors.";
                wait_for_keypress();
        }
        catch(...)
@@ -325,6 +364,6 @@ int main(int argc, char** argv)
                std::wcout << L"\n\nCasparCG will automatically shutdown. See the log file located at the configured log-file folder for more information.\n\n";
                boost::this_thread::sleep_for(boost::chrono::milliseconds(4000));
        }
-       
+
        return return_code;
 }