proxy/handler: remove unused qt event loop setup code (#48277)

Author: jkarneges

src/handler/handlerapp.cpp

@@ -22,8 +22,8 @@
  */
 
 #include <assert.h>
+#include <unistd.h>
 #include <iostream>
-#include <QCoreApplication>
 #include <QCommandLineParser>
 #include <QStringList>
 #include <QFile>
@@ -100,9 +100,6 @@ class HandlerApp::Private
 public:
 	static int run(const ffi::HandlerCliArgs *argsFfi)
 	{
-		QCoreApplication::setApplicationName("pushpin-handler");
-		QCoreApplication::setApplicationVersion(Config::get().version);
-
 		HandlerArgsData args(argsFfi);
 
 		// Set the log level
@@ -233,7 +230,7 @@ class HandlerApp::Private
 
 		HandlerEngine::Configuration config;
 		config.appVersion = Config::get().version;
-		config.instanceId = "handler_" + QByteArray::number(QCoreApplication::applicationPid());
+		config.instanceId = "handler_" + QByteArray::number(getpid());
 		if(!services.contains("mongrel2") && (!connmgr_in_stream_specs.isEmpty() || !connmgr_out_specs.isEmpty()))
 		{
 			config.serverInStreamSpecs = connmgr_in_stream_specs;
@@ -283,11 +280,11 @@ class HandlerApp::Private
 		config.prometheusPort = prometheusPort;
 		config.prometheusPrefix = prometheusPrefix;
 
-		return runLoop(config, true);
+		return runLoop(config);
 	}
 
 private:
-	static int runLoop(const HandlerEngine::Configuration &config, bool newEventLoop)
+	static int runLoop(const HandlerEngine::Configuration &config)
 	{
 		// includes worst-case subscriptions and update registrations
 		int timersPerSession = qMax(TIMERS_PER_HTTPSESSION, TIMERS_PER_WSSESSION) +
@@ -297,24 +294,12 @@ class HandlerApp::Private
 		// enough timers for sessions, plus an extra 100 for misc
 		int timersMax = (config.connectionsMax * timersPerSession) + 100;
 
-		std::unique_ptr<EventLoop> loop;
-
-		if(newEventLoop)
-		{
-			log_debug("using new event loop");
+		// enough for control requests and prometheus requests, plus an
+		// extra 100 for misc. client sessions don't use socket notifiers
+		int socketNotifiersMax = (SOCKETNOTIFIERS_PER_SIMPLEHTTPREQUEST * (CONTROL_CONNECTIONS_MAX + PROMETHEUS_CONNECTIONS_MAX)) + 100;
 
-			// enough for control requests and prometheus requests, plus an
-			// extra 100 for misc. client sessions don't use socket notifiers
-			int socketNotifiersMax = (SOCKETNOTIFIERS_PER_SIMPLEHTTPREQUEST * (CONTROL_CONNECTIONS_MAX + PROMETHEUS_CONNECTIONS_MAX)) + 100;
-
-			int registrationsMax = timersMax + socketNotifiersMax;
-			loop = std::make_unique<EventLoop>(registrationsMax);
-		}
-		else
-		{
-			// for qt event loop, timer subsystem must be explicitly initialized
-			Timer::init(timersMax);
-		}
+		int registrationsMax = timersMax + socketNotifiersMax;
+		std::unique_ptr<EventLoop> loop = std::make_unique<EventLoop>(registrationsMax);
 
 		std::unique_ptr<HandlerEngine> engine;
 
@@ -332,10 +317,7 @@ class HandlerApp::Private
 
 				log_debug("stopped");
 
-				if(newEventLoop)
-					loop->exit(0);
-				else
-					QCoreApplication::exit(0);
+				loop->exit(0);
 			});
 
 			ProcessQuit::instance()->hup.connect([&] {
@@ -347,39 +329,14 @@ class HandlerApp::Private
 			if(!engine->start(config))
 			{
 				engine.reset();
-
-				if(newEventLoop)
-					loop->exit(1);
-				else
-					QCoreApplication::exit(1);
-
+				loop->exit(1);
 				return;
 			}
 
 			log_info("started");
 		});
 
-		int ret;
-		if(newEventLoop)
-			ret = loop->exec();
-		else
-			ret = QCoreApplication::exec();
-
-		if(!newEventLoop)
-		{
-			// ensure deferred deletes are processed
-			QCoreApplication::instance()->sendPostedEvents();
-		}
-
-		// deinit here, after all event loop activity has completed
-
-		if(!newEventLoop)
-		{
-			DeferCall::cleanup();
-			Timer::deinit();
-		}
-
-		return ret;
+		return loop->exec();
 	}
 };
 
@@ -396,13 +353,6 @@ extern "C" {
 
 int handler_init(const ffi::HandlerCliArgs *argsFfi)
 {
-	// Create dummy argc/argv for QCoreApplication
-	int argc = 1;
-	char app_name[] = "pushpin-handler";
-	char* argv[] = { app_name, nullptr };
-	
-	QCoreApplication qapp(argc, argv);
-
 	HandlerApp app;
 	return app.run(argsFfi);
 }

src/proxy/domainmap.cpp

@@ -33,7 +33,6 @@
 #include <QFile>
 #include <QDir>
 #include <QTextStream>
-#include <QCoreApplication>
 #include "log.h"
 #include "timer.h"
 #include "defercall.h"
@@ -789,30 +788,20 @@ class DomainMap::Worker
 class DomainMap::Thread
 {
 public:
-	bool newEventLoop;
 	QString fileName;
 	std::thread thread;
 	std::unique_ptr<EventLoop> loop;
-	std::unique_ptr<QEventLoop> qloop;
 	std::unique_ptr<Worker> worker;
 	QMutex m;
 	QWaitCondition w;
 
-	Thread() :
-		newEventLoop(false)
-	{
-	}
-
 	~Thread()
 	{
 		if(worker)
 		{
 			worker->deferCall.defer([&] {
 				// NOTE: called from worker thread
-				if(newEventLoop)
-					loop->exit(0);
-				else
-					qloop->quit();
+				loop->exit(0);
 			});
 		}
 
@@ -841,24 +830,8 @@ class DomainMap::Thread
 		// will unlock during exec
 		m.lock();
 
-		int timersMax = WORKER_THREAD_TIMERS;
-
-		if(newEventLoop)
-		{
-			log_debug("domainmap: using new event loop");
-
-			int socketNotifiersMax = WORKER_THREAD_SOCKETNOTIFIERS;
-
-			int registrationsMax = timersMax + socketNotifiersMax;
-			loop = std::make_unique<EventLoop>(registrationsMax);
-		}
-		else
-		{
-			// for qt event loop, timer subsystem must be explicitly initialized
-			Timer::init(timersMax);
-
-			qloop = std::make_unique<QEventLoop>();
-		}
+		int registrationsMax = WORKER_THREAD_TIMERS + WORKER_THREAD_SOCKETNOTIFIERS;
+		loop = std::make_unique<EventLoop>(registrationsMax);
 
 		worker = std::make_unique<Worker>();
 		worker->fileName = fileName;
@@ -870,31 +843,10 @@ class DomainMap::Thread
 
 		worker->deferCall.defer([=] { worker->start(); });
 
-		if(newEventLoop)
-			loop->exec();
-		else
-			qloop->exec();
+		loop->exec();
 
 		worker.reset();
-
-		if(!newEventLoop)
-		{
-			// ensure deferred deletes are processed
-			QCoreApplication::instance()->sendPostedEvents();
-		}
-
-		// deinit here, after all event loop activity has completed
-
-		if(!newEventLoop)
-		{
-			DeferCall::cleanup();
-			Timer::deinit();
-		}
-
-		if(newEventLoop)
-			loop.reset();
-		else
-			qloop.reset();
+		loop.reset();
 	}
 };
 
@@ -918,10 +870,9 @@ class DomainMap::Private
 		delete thread;
 	}
 
-	void start(bool newEventLoop, const QString &fileName = QString())
+	void start(const QString &fileName = QString())
 	{
 		thread = new Thread;
-		thread->newEventLoop = newEventLoop;
 		thread->fileName = fileName;
 		thread->start();
 
@@ -945,16 +896,16 @@ class DomainMap::Private
 	}
 };
 
-DomainMap::DomainMap(bool newEventLoop)
+DomainMap::DomainMap()
 {
 	d = new Private(this);
-	d->start(newEventLoop);
+	d->start();
 }
 
-DomainMap::DomainMap(const QString &fileName, bool newEventLoop)
+DomainMap::DomainMap(const QString &fileName)
 {
 	d = new Private(this);
-	d->start(newEventLoop, fileName);
+	d->start(fileName);
 }
 
 DomainMap::~DomainMap()

src/proxy/domainmap.h

@@ -181,8 +181,8 @@ class DomainMap
 		}
 	};
 
-	DomainMap(bool newEventLoop);
-	DomainMap(const QString &fileName, bool newEventLoop);
+	DomainMap();
+	DomainMap(const QString &fileName);
 	~DomainMap();
 
 	// shouldn't really ever need to call this, but it's here in case the