core, proxy, handler: use DeferCall::deleteLater everywhere (#48102)

jkarneges · web-flow · commit 6e9a049fd2e3 · 2025-01-24T10:42:19.000-08:00
diff --git a/src/core/defercall.h b/src/core/defercall.h
@@ -48,7 +48,7 @@ class DeferCall : public QObject
 	template <typename T>
 	static void deleteLater(T *p)
 	{
-		global()->defer([=]() { delete p; });
+		global()->defer([=] { delete p; });
 	}
 
 private slots:
diff --git a/src/core/processquit.cpp b/src/core/processquit.cpp
@@ -38,6 +38,8 @@
 # include <unistd.h>
 #endif
 
+#include "defercall.h"
+
 namespace {
 
 // safeobj stuff, from qca
@@ -46,7 +48,7 @@ void releaseAndDeleteLater(QObject *owner, QObject *obj)
 {
 	obj->disconnect(owner);
 	obj->setParent(0);
-	obj->deleteLater();
+	DeferCall::deleteLater(obj);
 }
 
 class SafeSocketNotifier : public QObject
diff --git a/src/core/simplehttpserver.cpp b/src/core/simplehttpserver.cpp
@@ -30,6 +30,7 @@
 #include <QLocalSocket>
 #include <QLocalServer>
 #include "log.h"
+#include "defercall.h"
 #include "httpheaders.h"
 
 class SimpleHttpRequest::Private : public QObject
@@ -84,7 +85,7 @@ class SimpleHttpRequest::Private : public QObject
 		{
 			sock->disconnect(this);
 			sock->setParent(0);
-			sock->deleteLater();
+			DeferCall::deleteLater(sock);
 			sock = 0;
 		}
 	}
diff --git a/src/core/statsmanager.cpp b/src/core/statsmanager.cpp
@@ -32,6 +32,7 @@
 #include "qzmqsocket.h"
 #include "timerwheel.h"
 #include "log.h"
+#include "defercall.h"
 #include "tnetstring.h"
 #include "httpheaders.h"
 #include "simplehttpserver.h"
@@ -1560,7 +1561,7 @@ class StatsManager::Private : public QObject
 			).arg(prometheusPrefix, m.name, m.help, prometheusPrefix, m.name, m.type, prometheusPrefix, m.name, value.toString());
 		}
 
-		req->finished.connect(boost::bind(&SimpleHttpRequest::deleteLater, req));
+		req->finished.connect([=] { DeferCall::deleteLater(req); });
 
 		HttpHeaders headers;
 		headers += HttpHeader("Content-Type", "text/plain");
diff --git a/src/core/zwebsocket.cpp b/src/core/zwebsocket.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014-2023 Fanout, Inc.
- * Copyright (C) 2023-2024 Fastly, Inc.
+ * Copyright (C) 2023-2025 Fastly, Inc.
  *
  * This file is part of Pushpin.
  *
@@ -29,6 +29,7 @@
 #include "zhttpresponsepacket.h"
 #include "log.h"
 #include "rtimer.h"
+#include "defercall.h"
 #include "zhttpmanager.h"
 #include "uuidutil.h"
 
@@ -151,15 +152,15 @@ class ZWebSocket::Private : public QObject
 		{
 			expireTimerConnection.disconnect();
 			expireTimer->setParent(0);
-			expireTimer->deleteLater();
+			DeferCall::deleteLater(expireTimer);
 			expireTimer = 0;
 		}
 
 		if(keepAliveTimer)
 		{
 			keepAliveTimerConnection.disconnect();
 			keepAliveTimer->setParent(0);
-			keepAliveTimer->deleteLater();
+			DeferCall::deleteLater(keepAliveTimer);
 			keepAliveTimer = 0;
 		}
 
diff --git a/src/handler/handlerengine.cpp b/src/handler/handlerengine.cpp
@@ -37,6 +37,7 @@
 #include "qtcompat.h"
 #include "tnetstring.h"
 #include "rtimer.h"
+#include "defercall.h"
 #include "log.h"
 #include "logutil.h"
 #include "packet/httprequestdata.h"
@@ -1178,7 +1179,7 @@ class Subscription : public QObject
 			timer_->stop();
 			timer_->disconnect(this);
 			timer_->setParent(0);
-			timer_->deleteLater();
+			DeferCall::deleteLater(timer_);
 		}
 	}
 
@@ -1770,7 +1771,7 @@ class HandlerEngine::Private : public QObject
 			outHeaders += HttpHeader("Content-Type", "text/plain");
 
 		req->respond(code, reason, outHeaders, body.toUtf8());
-		req->finished.connect(boost::bind(&SimpleHttpRequest::deleteLater, req));
+		req->finished.connect([=] { DeferCall::deleteLater(req); });
 
 		QString msg = QString("control: %1 %2 code=%3 %4").arg(req->requestMethod(), QString::fromUtf8(req->requestUri()), QString::number(code), QString::number(body.size()));
 		if(items > -1)
@@ -3154,7 +3155,7 @@ private slots:
 		hs->subscribeCallback().remove(this);
 		hs->unsubscribeCallback().remove(this);
 		hs->finishedCallback().remove(this);
-		hs->deleteLater();
+		DeferCall::deleteLater(hs);
 
 		if(!rp.requests.isEmpty())
 			writeRetryPacket(addr, rp);
diff --git a/src/handler/httpsession.cpp b/src/handler/httpsession.cpp
@@ -31,6 +31,7 @@
 #include <QRandomGenerator>
 #include "qtcompat.h"
 #include "rtimer.h"
+#include "defercall.h"
 #include "log.h"
 #include "bufferlist.h"
 #include "packet/retryrequestpacket.h"
@@ -264,11 +265,11 @@ class HttpSession::Private : public QObject
 
 		timerConnection.disconnect();
 		timer->setParent(0);
-		timer->deleteLater();
+		DeferCall::deleteLater(timer);
 
 		retryTimerConnection.disconnect();
 		retryTimer->setParent(0);
-		retryTimer->deleteLater();
+		DeferCall::deleteLater(retryTimer);
 	}
 
 	void start()
diff --git a/src/handler/httpsessionupdatemanager.cpp b/src/handler/httpsessionupdatemanager.cpp
@@ -24,6 +24,7 @@
 
 #include <QTimer>
 #include <QUrl>
+#include "defercall.h"
 #include "httpsession.h"
 
 class HttpSessionUpdateManager::Private : public QObject
@@ -61,7 +62,7 @@ class HttpSessionUpdateManager::Private : public QObject
 
 			bucket->timer->disconnect(this);
 			bucket->timer->setParent(0);
-			bucket->timer->deleteLater();
+			DeferCall::deleteLater(bucket->timer);
 			delete bucket;
 		}
 	}
@@ -76,7 +77,7 @@ class HttpSessionUpdateManager::Private : public QObject
 
 		bucket->timer->disconnect(this);
 		bucket->timer->setParent(0);
-		bucket->timer->deleteLater();
+		DeferCall::deleteLater(bucket->timer);
 		delete bucket;
 	}
 
diff --git a/src/handler/ratelimiter.cpp b/src/handler/ratelimiter.cpp
@@ -26,6 +26,7 @@
 #include <QMap>
 #include <QPointer>
 #include <QTimer>
+#include "defercall.h"
 
 #define MIN_BATCH_INTERVAL 25
 
@@ -95,7 +96,7 @@ class RateLimiter::Private : public QObject
 	{
 		timer->disconnect(this);
 		timer->setParent(0);
-		timer->deleteLater();
+		DeferCall::deleteLater(timer);
 	}
 
 	void setRate(int actionsPerSecond)
diff --git a/src/handler/sequencer.cpp b/src/handler/sequencer.cpp
@@ -25,6 +25,7 @@
 #include <QDateTime>
 #include <QTimer>
 #include "log.h"
+#include "defercall.h"
 #include "publishitem.h"
 #include "publishlastids.h"
 
@@ -88,7 +89,7 @@ class Sequencer::Private : public QObject
 	{
 		expireTimer->disconnect(this);
 		expireTimer->setParent(0);
-		expireTimer->deleteLater();
+		DeferCall::deleteLater(expireTimer);
 
 		qDeleteAll(idCacheById);
 	}
diff --git a/src/handler/wssession.cpp b/src/handler/wssession.cpp
@@ -26,6 +26,7 @@
 #include <QTimer>
 #include <QDateTime>
 #include "log.h"
+#include "defercall.h"
 #include "filter.h"
 #include "publishitem.h"
 #include "publishformat.h"
@@ -57,15 +58,15 @@ WsSession::~WsSession()
 {
 	expireTimer->disconnect(this);
 	expireTimer->setParent(0);
-	expireTimer->deleteLater();
+	DeferCall::deleteLater(expireTimer);
 
 	delayedTimer->disconnect(this);
 	delayedTimer->setParent(0);
-	delayedTimer->deleteLater();
+	DeferCall::deleteLater(delayedTimer);
 
 	requestTimer->disconnect(this);
 	requestTimer->setParent(0);
-	requestTimer->deleteLater();
+	DeferCall::deleteLater(requestTimer);
 }
 
 void WsSession::refreshExpiration()
diff --git a/src/proxy/engine.cpp b/src/proxy/engine.cpp
@@ -34,6 +34,7 @@
 #include "packet/zrpcrequestpacket.h"
 #include "qtcompat.h"
 #include "rtimer.h"
+#include "defercall.h"
 #include "log.h"
 #include "inspectdata.h"
 #include "zhttpmanager.h"
@@ -861,7 +862,7 @@ class Engine::Private : public QObject
 		delete i;
 
 		ps->finishedByPassthroughCallback().remove(this);
-		ps->deleteLater();
+		DeferCall::deleteLater(ps);
 
 		tryTakeNext();
 	}
diff --git a/src/proxy/wsproxysession.cpp b/src/proxy/wsproxysession.cpp
@@ -33,6 +33,7 @@
 #include "packet/httprequestdata.h"
 #include "log.h"
 #include "rtimer.h"
+#include "defercall.h"
 #include "jwt.h"
 #include "zhttpmanager.h"
 #include "zwebsocket.h"
@@ -386,7 +387,7 @@ class WsProxySession::Private : public QObject
 		{
 			keepAliveConnection.disconnect();
 			keepAliveTimer->setParent(0);
-			keepAliveTimer->deleteLater();
+			DeferCall::deleteLater(keepAliveTimer);
 			keepAliveTimer = 0;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class DeferCall : public QObject`
`48`	`48`	`template <typename T>`
`49`	`49`	`static void deleteLater(T *p)`
`50`	`50`	`{`
`51`		`- global()->defer([=]() { delete p; });`
	`51`	`+ global()->defer([=] { delete p; });`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private slots:`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@`
`38`	`38`	`# include <unistd.h>`
`39`	`39`	`#endif`
`40`	`40`
	`41`	`+#include "defercall.h"`
	`42`	`+`
`41`	`43`	`namespace {`
`42`	`44`
`43`	`45`	`// safeobj stuff, from qca`
`@@ -46,7 +48,7 @@ void releaseAndDeleteLater(QObject owner, QObject obj)`
`46`	`48`	`{`
`47`	`49`	`obj->disconnect(owner);`
`48`	`50`	`obj->setParent(0);`
`49`		`- obj->deleteLater();`
	`51`	`+ DeferCall::deleteLater(obj);`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`class SafeSocketNotifier : public QObject`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`#include <QLocalSocket>`
`31`	`31`	`#include <QLocalServer>`
`32`	`32`	`#include "log.h"`
	`33`	`+#include "defercall.h"`
`33`	`34`	`#include "httpheaders.h"`
`34`	`35`
`35`	`36`	`class SimpleHttpRequest::Private : public QObject`
`@@ -84,7 +85,7 @@ class SimpleHttpRequest::Private : public QObject`
`84`	`85`	`{`
`85`	`86`	`sock->disconnect(this);`
`86`	`87`	`sock->setParent(0);`
`87`		`- sock->deleteLater();`
	`88`	`+ DeferCall::deleteLater(sock);`
`88`	`89`	`sock = 0;`
`89`	`90`	`}`
`90`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* Copyright (C) 2014-2023 Fanout, Inc.`
`3`		`- * Copyright (C) 2023-2024 Fastly, Inc.`
	`3`	`+ * Copyright (C) 2023-2025 Fastly, Inc.`
`4`	`4`	`*`
`5`	`5`	`* This file is part of Pushpin.`
`6`	`6`	`*`
`@@ -29,6 +29,7 @@`
`29`	`29`	`#include "zhttpresponsepacket.h"`
`30`	`30`	`#include "log.h"`
`31`	`31`	`#include "rtimer.h"`
	`32`	`+#include "defercall.h"`
`32`	`33`	`#include "zhttpmanager.h"`
`33`	`34`	`#include "uuidutil.h"`
`34`	`35`
`@@ -151,15 +152,15 @@ class ZWebSocket::Private : public QObject`
`151`	`152`	`{`
`152`	`153`	`expireTimerConnection.disconnect();`
`153`	`154`	`expireTimer->setParent(0);`
`154`		`- expireTimer->deleteLater();`
	`155`	`+ DeferCall::deleteLater(expireTimer);`
`155`	`156`	`expireTimer = 0;`
`156`	`157`	`}`
`157`	`158`
`158`	`159`	`if(keepAliveTimer)`
`159`	`160`	`{`
`160`	`161`	`keepAliveTimerConnection.disconnect();`
`161`	`162`	`keepAliveTimer->setParent(0);`
`162`		`- keepAliveTimer->deleteLater();`
	`163`	`+ DeferCall::deleteLater(keepAliveTimer);`
`163`	`164`	`keepAliveTimer = 0;`
`164`	`165`	`}`
`165`	`166`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`#include <QTimer>`
`26`	`26`	`#include <QUrl>`
	`27`	`+#include "defercall.h"`
`27`	`28`	`#include "httpsession.h"`
`28`	`29`
`29`	`30`	`class HttpSessionUpdateManager::Private : public QObject`
`@@ -61,7 +62,7 @@ class HttpSessionUpdateManager::Private : public QObject`
`61`	`62`
`62`	`63`	`bucket->timer->disconnect(this);`
`63`	`64`	`bucket->timer->setParent(0);`
`64`		`- bucket->timer->deleteLater();`
	`65`	`+ DeferCall::deleteLater(bucket->timer);`
`65`	`66`	`delete bucket;`
`66`	`67`	`}`
`67`	`68`	`}`
`@@ -76,7 +77,7 @@ class HttpSessionUpdateManager::Private : public QObject`
`76`	`77`
`77`	`78`	`bucket->timer->disconnect(this);`
`78`	`79`	`bucket->timer->setParent(0);`
`79`		`- bucket->timer->deleteLater();`
	`80`	`+ DeferCall::deleteLater(bucket->timer);`
`80`	`81`	`delete bucket;`
`81`	`82`	`}`
`82`	`83`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include <QMap>`
`27`	`27`	`#include <QPointer>`
`28`	`28`	`#include <QTimer>`
	`29`	`+#include "defercall.h"`
`29`	`30`
`30`	`31`	`#define MIN_BATCH_INTERVAL 25`
`31`	`32`
`@@ -95,7 +96,7 @@ class RateLimiter::Private : public QObject`
`95`	`96`	`{`
`96`	`97`	`timer->disconnect(this);`
`97`	`98`	`timer->setParent(0);`
`98`		`- timer->deleteLater();`
	`99`	`+ DeferCall::deleteLater(timer);`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`void setRate(int actionsPerSecond)`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include <QDateTime>`
`26`	`26`	`#include <QTimer>`
`27`	`27`	`#include "log.h"`
	`28`	`+#include "defercall.h"`
`28`	`29`	`#include "publishitem.h"`
`29`	`30`	`#include "publishlastids.h"`
`30`	`31`
`@@ -88,7 +89,7 @@ class Sequencer::Private : public QObject`
`88`	`89`	`{`
`89`	`90`	`expireTimer->disconnect(this);`
`90`	`91`	`expireTimer->setParent(0);`
`91`		`- expireTimer->deleteLater();`
	`92`	`+ DeferCall::deleteLater(expireTimer);`
`92`	`93`
`93`	`94`	`qDeleteAll(idCacheById);`
`94`	`95`	`}`