new bgw api

Author: kelvich

arbiter.c

@@ -91,9 +91,9 @@ static TimeoutId   heartbeat_timer;
 static nodemask_t  busy_mask;
 static timestamp_t last_heartbeat_to_node[MAX_NODES];
 
-static void MtmSender(Datum arg);
-static void MtmReceiver(Datum arg);
-static void MtmMonitor(Datum arg);
+void MtmSender(Datum arg);
+void MtmReceiver(Datum arg);
+void MtmMonitor(Datum arg);
 static void MtmSendHeartbeat(void);
 static bool MtmSendToNode(int node, void const* buf, int size);
 
@@ -116,23 +116,37 @@ static BackgroundWorker MtmSenderWorker = {
 	BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION, 
 	BgWorkerStart_ConsistentState,
 	MULTIMASTER_BGW_RESTART_TIMEOUT,
-	MtmSender
+	// MtmSender
+	"multimaster",
+	"MtmSender",
+	(Datum) 0,
+	"",
+	0
 };
 
 static BackgroundWorker MtmRecevierWorker = {
 	"mtm-receiver",
 	BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION, 
 	BgWorkerStart_ConsistentState,
 	MULTIMASTER_BGW_RESTART_TIMEOUT,
-	MtmReceiver
+	// MtmReceiver
+	"multimaster",
+	"MtmReceiver",
+	(Datum) 0,
+	"",
+	0
 };
 
 static BackgroundWorker MtmMonitorWorker = {
 	"mtm-monitor",
 	BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION, 
 	BgWorkerStart_ConsistentState,
 	MULTIMASTER_BGW_RESTART_TIMEOUT,
-	MtmMonitor
+	"multimaster",
+	"MtmMonitor",
+	(Datum) 0,
+	"",
+	0
 };
 
 
@@ -711,7 +725,7 @@ static void MtmAppendBuffer(MtmBuffer* txBuffer, MtmArbiterMessage* msg)
 }
 
 
-static void MtmSender(Datum arg)
+void MtmSender(Datum arg)
 {
 	int nNodes = MtmMaxNodes;
 	int i;
@@ -807,7 +821,7 @@ static bool MtmRecovery()
 }
 #endif
 
-static void MtmMonitor(Datum arg)
+void MtmMonitor(Datum arg)
 {
 	pqsignal(SIGINT, SetStop);
 	pqsignal(SIGQUIT, SetStop);
@@ -838,7 +852,7 @@ static void MtmMonitor(Datum arg)
 	}
 }
 
-static void MtmReceiver(Datum arg)
+void MtmReceiver(Datum arg)
 {
 	int nNodes = MtmMaxNodes;
 	int nResponses;

bgwpool.c

@@ -21,6 +21,9 @@ int  MtmMaxWorkers;
 
 static BgwPool* MtmPool;
 
+void BgwPoolStaticWorkerMainLoop(Datum arg);
+void BgwPoolDynamicWorkerMainLoop(Datum arg);
+
 static void BgwShutdownWorker(int sig)
 {
 	MTM_LOG1("Background worker %d receive shutdown request", MyProcPid);
@@ -132,13 +135,13 @@ timestamp_t BgwGetLastPeekTime(BgwPool* pool)
 	return pool->lastPeakTime;
 }
 
-static void BgwPoolStaticWorkerMainLoop(Datum arg)
+void BgwPoolStaticWorkerMainLoop(Datum arg)
 {
 	BgwPoolConstructor constructor = (BgwPoolConstructor)DatumGetPointer(arg);
     BgwPoolMainLoop(constructor());
 }
 
-static void BgwPoolDynamicWorkerMainLoop(Datum arg)
+void BgwPoolDynamicWorkerMainLoop(Datum arg)
 {
     BgwPoolMainLoop((BgwPool*)DatumGetPointer(arg));
 }
@@ -151,7 +154,8 @@ void BgwPoolStart(int nWorkers, BgwPoolConstructor constructor)
 	MemSet(&worker, 0, sizeof(BackgroundWorker));
     worker.bgw_flags = BGWORKER_SHMEM_ACCESS |  BGWORKER_BACKEND_DATABASE_CONNECTION;
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
-	worker.bgw_main = BgwPoolStaticWorkerMainLoop;
+	sprintf(worker.bgw_library_name, "multimaster");
+	sprintf(worker.bgw_function_name, "BgwPoolStaticWorkerMainLoop");
 	worker.bgw_restart_time = MULTIMASTER_BGW_RESTART_TIMEOUT;
 
     for (i = 0; i < nWorkers; i++) { 
@@ -182,7 +186,8 @@ static void BgwStartExtraWorker(BgwPool* pool)
 			MemSet(&worker, 0, sizeof(BackgroundWorker));
 			worker.bgw_flags = BGWORKER_SHMEM_ACCESS |  BGWORKER_BACKEND_DATABASE_CONNECTION;
 			worker.bgw_start_time = BgWorkerStart_ConsistentState;
-			worker.bgw_main = BgwPoolDynamicWorkerMainLoop;
+			sprintf(worker.bgw_library_name, "multimaster");
+			sprintf(worker.bgw_function_name, "BgwPoolDynamicWorkerMainLoop");
 			worker.bgw_restart_time = MULTIMASTER_BGW_RESTART_TIMEOUT;
 			snprintf(worker.bgw_name, BGW_MAXLEN, "bgw_pool_dynworker_%d", (int)++pool->nWorkers);
 			worker.bgw_main_arg = PointerGetDatum(pool);

pglogical_receiver.c

@@ -67,6 +67,8 @@ lsn_t MtmSenderWalEnd;
 static void fe_sendint64(int64 i, char *buf);
 static int64 fe_recvint64(char *buf);
 
+void pglogical_receiver_main(Datum main_arg);
+
 static void
 receiver_raw_sigterm(SIGNAL_ARGS)
 {
@@ -207,7 +209,7 @@ static char const* const MtmReplicationModeName[] =
 	"open_existed" /* normal mode: use existed slot or create new one and start receiving data from it from the rememered position */
 };
 
-static void
+void
 pglogical_receiver_main(Datum main_arg)
 {
 	int nodeId = DatumGetInt32(main_arg);
@@ -717,7 +719,9 @@ void MtmStartReceiver(int nodeId, bool dynamic)
 	MemSet(&worker, 0, sizeof(BackgroundWorker));
 	worker.bgw_flags = BGWORKER_SHMEM_ACCESS |	BGWORKER_BACKEND_DATABASE_CONNECTION;
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
-	worker.bgw_main = pglogical_receiver_main;
+	// worker.bgw_main = pglogical_receiver_main;
+	sprintf(worker.bgw_library_name, "multimaster");
+	sprintf(worker.bgw_function_name, "pglogical_receiver_main");
 	worker.bgw_restart_time = MULTIMASTER_BGW_RESTART_TIMEOUT;
 
 	/* Worker parameter and registration */

referee.c

@@ -34,6 +34,8 @@
 
 static bool MtmRefereeStop;
 
+void MtmRefereeMain(Datum arg);
+
 static void MtmShutdownReferee(int sig)
 {
 	MtmRefereeStop = true;
@@ -144,7 +146,7 @@ static void MtmRefereeLoop(char const** connections, int nConns)
 	}
 }
 
-static void MtmRefereeMain(Datum arg)
+void MtmRefereeMain(Datum arg)
 {
 	char const* connections[MAX_NODES];
 	int i;
@@ -168,10 +170,14 @@ static BackgroundWorker MtmRefereeWorker = {
 	0,
 	BgWorkerStart_ConsistentState,
 	REFEREE_RECONNECT_TIMEOUT,
-	MtmRefereeMain
+	// MtmRefereeMain
+	"referee",
+	"MtmRefereeMain",
+	(Datum) 0,
+	"",
+	0
 };
 
-
 void MtmRefereeInitialize(void)
 {
 	RegisterBackgroundWorker(&MtmRefereeWorker);