win compat

Author: kelvich

src/bgwpool.c

@@ -150,7 +150,7 @@ BgwPoolMainLoop(BgwPool* pool)
 		/* Ignore cancel that arrived before we started current command */
 		QueryCancelPending = false;
 
-		pool->executor(work, size, &ctx);
+		MtmExecutor(work, size, &ctx);
 		pfree(work);
 
 		SpinLockAcquire(&pool->lock);
@@ -168,7 +168,7 @@ BgwPoolMainLoop(BgwPool* pool)
 // XXX: this is called during _PG_init because we need to allocate queue.
 // Better to use DSM, so that can be done dynamically.
 void
-BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, size_t queueSize, size_t nWorkers)
+BgwPoolInit(BgwPool* pool, size_t queueSize, size_t nWorkers)
 {
 	MtmPool = pool;
 
@@ -177,7 +177,6 @@ BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, size_t queueSize, size_t nW
 	if (pool->queue == NULL) { 
 		elog(PANIC, "Failed to allocate memory for background workers pool: %zd bytes requested", queueSize);
 	}
-    pool->executor = executor;
 	pool->available = PGSemaphoreCreate();
 	pool->overflow = PGSemaphoreCreate();
 	PGSemaphoreReset(pool->available);
@@ -282,7 +281,7 @@ BgwPoolExecute(BgwPool* pool, void* work, int size, MtmReceiverContext *ctx)
 		 * Size of work is larger than size of shared buffer: 
 		 * run it immediately
 		 */
-		pool->executor(work, size, ctx);
+		MtmExecutor(work, size, ctx);
 		return;
 	}
 

src/include/bgwpool.h

@@ -9,8 +9,6 @@
 
 #include "receiver.h"
 
-typedef void(*BgwPoolExecutor)(void* work, size_t size, MtmReceiverContext *ctx);
-
 typedef long timestamp_t;
 
 
@@ -24,7 +22,6 @@ extern timestamp_t MtmGetCurrentTime(void);  /* adjusted current system time */
 
 typedef struct
 {
-    BgwPoolExecutor executor;
     volatile slock_t lock;
 	PGSemaphore available;
 	PGSemaphore overflow;
@@ -50,7 +47,7 @@ typedef BgwPool*(*BgwPoolConstructor)(void);
 
 extern void BgwPoolStart(BgwPool* pool, char *poolName, Oid db_id, Oid user_id);
 
-extern void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, size_t queueSize, size_t nWorkers);
+extern void BgwPoolInit(BgwPool* pool, size_t queueSize, size_t nWorkers);
 
 extern void BgwPoolExecute(BgwPool* pool, void* work, int size, MtmReceiverContext *ctx);
 

src/multimaster.c

@@ -285,7 +285,7 @@ MtmSharedShmemStartup()
 			Mtm->peers[i].dmq_dest_id = -1;
 
 			// XXX: change to dsa and make it per-receiver
-			BgwPoolInit(&Mtm->pools[i], MtmExecutor, MtmQueueSize, 0);
+			BgwPoolInit(&Mtm->pools[i], MtmQueueSize, 0);
 		}
 	}