start multiple hyperions (#663)

* start multiple hyperions. add a config for every hyperiond to start.

* spawned hyperiond will exit when parent hyperiond exits, needed for propper function with service script. this should work, but must be refectored asap when hyperiond understands commandline params

* add optionParser to hyperiond. multi daemon: exit when any child/parent dies

* cleanup

* refactor cosmetics for hyperiond


Former-commit-id: 3b99c78661550704256f0d5887680e92cb3ddda3

src/hyperiond/CMakeLists.txt

@@ -3,6 +3,7 @@ add_executable(hyperiond
 		hyperiond.cpp)
 
 target_link_libraries(hyperiond
+		getoptPlusPlus
 		hyperion
 		xbmcvideochecker
 		effectengine

src/hyperiond/hyperiond.cpp

@@ -2,6 +2,7 @@
 #include <cassert>
 #include <csignal>
 #include <vector>
+#include <unistd.h>
 
 // QT includes
 #include <QCoreApplication>
@@ -9,6 +10,9 @@
 #include <QLocale>
 #include <QFile>
 
+// getoptPlusPLus includes
+#include <getoptPlusPlus/getoptpp.h>
+
 // config includes
 #include "HyperionConfig.h"
 
@@ -56,6 +60,9 @@
 
 // BoblightServer includes
 #include <boblightserver/BoblightServer.h>
+#include <sys/prctl.h> 
+
+using namespace vlofgren;
 
 void signal_handler(const int signum)
 {
@@ -65,6 +72,7 @@ void signal_handler(const int signum)
 	signal(signum, SIG_DFL);
 }
 
+
 Json::Value loadConfig(const std::string & configFile)
 {
 	// make sure the resources are loaded (they may be left out after static linking)
@@ -89,47 +97,20 @@ Json::Value loadConfig(const std::string & configFile)
 	return jsonConfig;
 }
 
-int main(int argc, char** argv)
+
+void startNewHyperion(int parentPid, std::string hyperionFile, std::string configFile)
 {
-	std::cout
+	if ( fork() == 0 )
-		<< "Hyperion Ambilight Deamon" << std::endl
-		<< "\tVersion   : " << HYPERION_VERSION_ID << std::endl
-		<< "\tBuild Time: " << __DATE__ << " " << __TIME__ << std::endl;
-
-	// Initialising QCoreApplication
-	QCoreApplication app(argc, argv);
-
-	signal(SIGINT,  signal_handler);
-	signal(SIGTERM, signal_handler);
-
-	// force the locale
-	setlocale(LC_ALL, "C");
-	QLocale::setDefault(QLocale::c());
-
-	if (argc < 2)
 	{
-		std::cout << "ERROR: Missing required configuration file. Usage:" << std::endl;
+		sleep(3);
-		std::cout << "hyperiond [config.file]" << std::endl;
+		execl(hyperionFile.c_str(), hyperionFile.c_str(), "--parent", QString::number(parentPid).toStdString().c_str(), configFile.c_str(), NULL);
-		return 1;
+		exit(0);
-	}
-
-	int argvId = 1;
-	for ( int i=1; i<argc;i++)
-	{
-		if ( QFile::exists(argv[i]) )
-		{
-			argvId = i;
-			break;
 	}
 }
 
-	const std::string configFile = argv[argvId];
-	std::cout << "INFO: Selected configuration file: " << configFile.c_str() << std::endl;
-	const Json::Value config = loadConfig(configFile);
-
-	Hyperion hyperion(config);
-	std::cout << "INFO: Hyperion started and initialised" << std::endl;
 
+void startBootsequence(const Json::Value &config, Hyperion &hyperion)
+{
 	// create boot sequence if the configuration is present
 	if (config.isMember("bootsequence"))
 	{
@@ -175,9 +156,12 @@ int main(int argc, char** argv)
 
 		hyperion.setColor(bootcolor_priority, boot_color, 0, false);
 	}
+}
+
 
 // create XBMC video checker if the configuration is present
-	XBMCVideoChecker * xbmcVideoChecker = nullptr;
+void startXBMCVideoChecker(const Json::Value &config, XBMCVideoChecker* xbmcVideoChecker)
+{
 	if (config.isMember("xbmcVideoChecker"))
 	{
 		const Json::Value & videoCheckerConfig = config["xbmcVideoChecker"];
@@ -194,11 +178,11 @@ int main(int argc, char** argv)
 		xbmcVideoChecker->start();
 		std::cout << "INFO: Kodi checker created and started" << std::endl;
 	}
+}
 
-// ---- network services -----
+void startNetworkServices(const Json::Value &config, Hyperion &hyperion, JsonServer* jsonServer, ProtoServer* protoServer, BoblightServer* boblightServer)
-
+{
 	// Create Json server if configuration is present
-	JsonServer * jsonServer = nullptr;
 	if (config.isMember("jsonServer"))
 	{
 		const Json::Value & jsonServerConfig = config["jsonServer"];
@@ -207,7 +191,6 @@ int main(int argc, char** argv)
 	}
 
 	// Create Proto server if configuration is present
-	ProtoServer * protoServer = nullptr;
 	if (config.isMember("protoServer"))
 	{
 		const Json::Value & protoServerConfig = config["protoServer"];
@@ -216,19 +199,18 @@ int main(int argc, char** argv)
 	}
 
 	// Create Boblight server if configuration is present
-	BoblightServer * boblightServer = nullptr;
 	if (config.isMember("boblightServer"))
 	{
 		const Json::Value & boblightServerConfig = config["boblightServer"];
 		boblightServer = new BoblightServer(&hyperion, boblightServerConfig.get("priority",900).asInt(), boblightServerConfig["port"].asUInt());
 		std::cout << "INFO: Boblight server created and started on port " << boblightServer->getPort() << std::endl;
 	}
-
+}
-// ---- grabber -----
 
 #ifdef ENABLE_DISPMANX
+void startGrabberDispmanx(const Json::Value &config, Hyperion &hyperion, ProtoServer * protoServer, XBMCVideoChecker* xbmcVideoChecker, DispmanxWrapper * dispmanx)
+{
 	// Construct and start the frame-grabber if the configuration is present
-	DispmanxWrapper * dispmanx = nullptr;
 	if (config.isMember("framegrabber"))
 	{
 		const Json::Value & frameGrabberConfig = config["framegrabber"];
@@ -255,18 +237,13 @@ int main(int argc, char** argv)
 		dispmanx->start();
 		std::cout << "INFO: Frame grabber created and started" << std::endl;
 	}
-#else
-#if !defined(ENABLE_OSX) && !defined(ENABLE_FB)
-	if (config.isMember("framegrabber"))
-	{
-		std::cerr << "ERRROR: The dispmanx framegrabber can not be instantiated, because it has been left out from the build" << std::endl;
 }
 #endif
-#endif
 
 #ifdef ENABLE_V4L2
+void startGrabberV4L2(const Json::Value &config, Hyperion &hyperion, ProtoServer * protoServer, V4L2Wrapper * v4l2Grabber )
+{
 	// construct and start the v4l2 grabber if the configuration is present
-	V4L2Wrapper * v4l2Grabber = nullptr;
 	if (config.isMember("grabber-v4l2"))
 	{
 		const Json::Value & grabberConfig = config["grabber-v4l2"];
@@ -296,17 +273,14 @@ int main(int argc, char** argv)
 		v4l2Grabber->start();
 		std::cout << "INFO: V4L2 grabber created and started" << std::endl;
 	}
-#else
-	if (config.isMember("grabber-v4l2"))
-	{
-		std::cerr << "ERROR: The v4l2 grabber can not be instantiated, because it has been left out from the build" << std::endl;
-	}
 
+}
 #endif
 
 #ifdef ENABLE_AMLOGIC
+void startGrabberAmlogic(const Json::Value &config, Hyperion &hyperion, ProtoServer * protoServer, XBMCVideoChecker* xbmcVideoChecker, AmlogicWrapper * amlGrabber)
+{
 	// Construct and start the framebuffer grabber if the configuration is present
-	AmlogicWrapper * amlGrabber = nullptr;
 	if (config.isMember("amlgrabber"))
 	{
 		const Json::Value & grabberConfig = config["amlgrabber"];
@@ -328,16 +302,14 @@ int main(int argc, char** argv)
 		amlGrabber->start();
 		std::cout << "INFO: AMLOGIC grabber created and started" << std::endl;
 	}
-#else
-	if (config.isMember("amlgrabber"))
-	{
-		std::cerr << "ERROR: The AMLOGIC grabber can not be instantiated, because it has been left out from the build" << std::endl;
 }
 #endif
 
+
 #ifdef ENABLE_FB
+void startGrabberFramebuffer(const Json::Value &config, Hyperion &hyperion, ProtoServer * protoServer, XBMCVideoChecker* xbmcVideoChecker, FramebufferWrapper * fbGrabber)
+{
 	// Construct and start the framebuffer grabber if the configuration is present
-	FramebufferWrapper * fbGrabber = nullptr;
 	if (config.isMember("framebuffergrabber") || config.isMember("framegrabber"))
 	{
 		const Json::Value & grabberConfig = config.isMember("framebuffergrabber")? config["framebuffergrabber"] : config["framegrabber"];
@@ -360,22 +332,14 @@ int main(int argc, char** argv)
 		fbGrabber->start();
 		std::cout << "INFO: Framebuffer grabber created and started" << std::endl;
 	}
-#else
-	if (config.isMember("framebuffergrabber"))
-	{
-		std::cerr << "ERROR: The framebuffer grabber can not be instantiated, because it has been left out from the build" << std::endl;
 }
-#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX)
-	else if (config.isMember("framegrabber"))
-	{
-		std::cerr << "ERROR: The framebuffer grabber can not be instantiated, because it has been left out from the build" << std::endl;
-	}
-#endif
 #endif
 
+
 #ifdef ENABLE_OSX
+void startGrabberOsx(const Json::Value &config, Hyperion &hyperion, ProtoServer * protoServer, XBMCVideoChecker* xbmcVideoChecker, OsxWrapper * osxGrabber)
+{
 	// Construct and start the osx grabber if the configuration is present
-	OsxWrapper * osxGrabber = nullptr;
 	if (config.isMember("osxgrabber") || config.isMember("framegrabber"))
 	{
 		const Json::Value & grabberConfig = config.isMember("osxgrabber")? config["osxgrabber"] : config["framegrabber"];
@@ -398,6 +362,141 @@ int main(int argc, char** argv)
 		osxGrabber->start();
 		std::cout << "INFO: OSX grabber created and started" << std::endl;
 	}
+}
+#endif
+
+int main(int argc, char** argv)
+{
+	std::cout
+		<< "Hyperion Ambilight Deamon (" << getpid() << ")" << std::endl
+		<< "\tVersion   : " << HYPERION_VERSION_ID << std::endl
+		<< "\tBuild Time: " << __DATE__ << " " << __TIME__ << std::endl;
+
+	// Initialising QCoreApplication
+	QCoreApplication app(argc, argv);
+
+	signal(SIGINT,  signal_handler);
+	signal(SIGTERM, signal_handler);
+	signal(SIGCHLD, signal_handler);
+
+	// force the locale
+	setlocale(LC_ALL, "C");
+	QLocale::setDefault(QLocale::c());
+
+	OptionsParser optionParser("X11 capture application for Hyperion");
+	ParameterSet & parameters = optionParser.getParameters();
+
+	IntParameter           & argParentPid             = parameters.add<IntParameter>          (0x0, "parent",        "pid of parent hyperiond");
+
+	argParentPid.setDefault(0);
+	optionParser.parse(argc, const_cast<const char **>(argv));
+	const std::vector<std::string> configFiles = optionParser.getFiles();
+
+	if (configFiles.size() == 0)
+	{
+		std::cout << "ERROR: Missing required configuration file. Usage:" << std::endl;
+		std::cout << "hyperiond <options ...> [config.file ...]" << std::endl;
+		return 1;
+	}
+
+	
+	if (argParentPid.getValue() > 0 )
+	{
+		std::cout << "hyperiond client, parent is pid " << argParentPid.getValue() << std::endl;
+		prctl(PR_SET_PDEATHSIG, SIGHUP);
+	}
+	
+	int argvId = -1;
+	for(size_t idx=0; idx < configFiles.size(); idx++) {
+		if ( QFile::exists(configFiles[idx].c_str()))
+		{
+			if (argvId < 0) argvId=idx;
+			else startNewHyperion(getpid(), argv[0], configFiles[idx].c_str());
+		}
+	}
+	
+	if ( argvId < 0)
+	{
+		std::cout << "ERROR: No valid config found " << std::endl;
+		return 1;
+	}
+	
+	const std::string configFile = configFiles[argvId];
+	std::cout << "INFO: Selected configuration file: " << configFile.c_str() << std::endl;
+	const Json::Value config = loadConfig(configFile);
+
+	Hyperion hyperion(config);
+	std::cout << "INFO: Hyperion started and initialised" << std::endl;
+
+
+	startBootsequence(config, hyperion);
+
+	XBMCVideoChecker * xbmcVideoChecker = nullptr;
+	startXBMCVideoChecker(config, xbmcVideoChecker);
+
+	// ---- network services -----
+	JsonServer * jsonServer = nullptr;
+	ProtoServer * protoServer = nullptr;
+	BoblightServer * boblightServer = nullptr;
+	startNetworkServices(config, hyperion, jsonServer, protoServer, boblightServer);
+
+
+// ---- grabber -----
+
+#ifdef ENABLE_DISPMANX
+	DispmanxWrapper * dispmanx = nullptr;
+	startGrabberDispmanx(config, hyperion, protoServer, xbmcVideoChecker, dispmanx);
+#else
+#if !defined(ENABLE_OSX) && !defined(ENABLE_FB)
+	if (config.isMember("framegrabber"))
+	{
+		std::cerr << "ERRROR: The dispmanx framegrabber can not be instantiated, because it has been left out from the build" << std::endl;
+	}
+#endif
+#endif
+
+#ifdef ENABLE_V4L2
+	V4L2Wrapper * v4l2Grabber = nullptr;
+	startGrabberV4L2(config, hyperion, protoServer, v4l2Grabber);
+#else
+	if (config.isMember("grabber-v4l2"))
+	{
+		std::cerr << "ERROR: The v4l2 grabber can not be instantiated, because it has been left out from the build" << std::endl;
+	}
+#endif
+
+#ifdef ENABLE_AMLOGIC
+	// Construct and start the framebuffer grabber if the configuration is present
+	AmlogicWrapper * amlGrabber = nullptr;
+	startGrabberAmlogic(config, hyperion, protoServer, xbmcVideoChecker, amlGrabber);
+#else
+	if (config.isMember("amlgrabber"))
+	{
+		std::cerr << "ERROR: The AMLOGIC grabber can not be instantiated, because it has been left out from the build" << std::endl;
+	}
+#endif
+
+#ifdef ENABLE_FB
+	// Construct and start the framebuffer grabber if the configuration is present
+	FramebufferWrapper * fbGrabber = nullptr;
+	startGrabberFramebuffer(config, hyperion, protoServer, xbmcVideoChecker, fbGrabber);
+#else
+	if (config.isMember("framebuffergrabber"))
+	{
+		std::cerr << "ERROR: The framebuffer grabber can not be instantiated, because it has been left out from the build" << std::endl;
+	}
+#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX)
+	else if (config.isMember("framegrabber"))
+	{
+		std::cerr << "ERROR: The framebuffer grabber can not be instantiated, because it has been left out from the build" << std::endl;
+	}
+#endif
+#endif
+
+#ifdef ENABLE_OSX
+	// Construct and start the osx grabber if the configuration is present
+	OsxWrapper * osxGrabber = nullptr;
+	startGrabberDispmanx(config, hyperion, protoServer, xbmcVideoChecker, osxGrabber);
 #else
 	if (config.isMember("osxgrabber"))
 	{