Start socklib as background worker

knizhnik · knizhnik · commit 5317b56aff53 · 2015-10-08T19:27:52.000+03:00
diff --git a/contrib/pg_dtm/Makefile b/contrib/pg_dtm/Makefile
@@ -1,5 +1,8 @@
 MODULE_big = pg_dtm
-OBJS = pg_dtm.o libdtm.o
+OBJS = pg_dtm.o libdtm.o sockhub/libsockhub.a
+
+sockhub/libsockhub.a:
+	make -C sockhub
 
 EXTENSION = pg_dtm
 DATA = pg_dtm--1.0.sql
diff --git a/contrib/pg_dtm/libdtm.c b/contrib/pg_dtm/libdtm.c
@@ -22,6 +22,10 @@ typedef struct DTMConnData
 	int sock;
 } DTMConnData;
 
+static char *dtmhost = NULL;
+static int dtmport = 0;
+static char* dtm_unix_sock_dir;
+
 typedef unsigned long long xid_t;
 
 // Returns true if the write was successful.
@@ -151,51 +155,73 @@ static bool dtm_read_status(DTMConn dtm, XidStatus *s)
 // Connects to the specified DTM.
 static DTMConn DtmConnect(char *host, int port)
 {
-	struct addrinfo *addrs = NULL;
-	struct addrinfo hint;
-	char portstr[6];
-	struct addrinfo *a;
-
-	memset(&hint, 0, sizeof(hint));
-	hint.ai_socktype = SOCK_STREAM;
-	hint.ai_family = AF_INET;
-	snprintf(portstr, 6, "%d", port);
-	hint.ai_protocol = getprotobyname("tcp")->p_proto;
-	if (getaddrinfo(host, portstr, &hint, &addrs))
-	{
-		perror("resolve address");
-		return NULL;
-	}
-
-	for (a = addrs; a != NULL; a = a->ai_next)
-	{
-		DTMConn dtm;
-		int one = 1;
-		int sock = socket(a->ai_family, a->ai_socktype, a->ai_protocol);
-		if (sock == -1)
-		{
-			perror("failed to create a socket");
-			continue;
-		}
-		setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
-
-		if (connect(sock, a->ai_addr, a->ai_addrlen) == -1)
-		{
-			perror("failed to connect to an address");
-			close(sock);
-			continue;
-		}
-
-		// success
-		freeaddrinfo(addrs);
-		dtm = malloc(sizeof(DTMConnData));
-		dtm->sock = sock;
-		return dtm;
-	}
-
-	freeaddrinfo(addrs);
-	fprintf(stderr, "could not connect\n");
-	return NULL;
+    DTMConn dtm;
+    int sd;
+
+    if (strcmp(host, "localhost") == 0) { 
+        struct sockaddr sock;
+        int len = offsetof(struct sockaddr, sa_data) + snprintf(sock.sa_data, sizeof(sock.sa_data), "%s/p%u", dtm_unix_sock_dir, port);
+        sock.sa_family = AF_UNIX; 
+   
+        sd = socket(AF_UNIX, SOCK_STREAM, 0);
+        if (sd == -1)
+        {
+            perror("failed to create a unix socket");
+        }
+        if (connect(sd, &sock, len) == -1)
+        {
+            perror("failed to connect to an address");
+            close(sd);
+            return NULL;
+        }
+        dtm = malloc(sizeof(DTMConnData));
+        dtm->sock = sd;
+        return dtm;
+    } else { 
+        struct addrinfo *addrs = NULL;
+        struct addrinfo hint;
+        char portstr[6];
+        struct addrinfo *a;
+        
+        memset(&hint, 0, sizeof(hint));
+        hint.ai_socktype = SOCK_STREAM;
+        hint.ai_family = AF_INET;
+        snprintf(portstr, 6, "%d", port);
+        hint.ai_protocol = getprotobyname("tcp")->p_proto;
+        if (getaddrinfo(host, portstr, &hint, &addrs))
+        {
+            perror("resolve address");
+            return NULL;
+        }
+        
+        for (a = addrs; a != NULL; a = a->ai_next)
+        {
+            int one = 1;
+            sd = socket(a->ai_family, a->ai_socktype, a->ai_protocol);
+            if (sd == -1)
+            {
+                perror("failed to create a socket");
+                continue;
+            }
+            setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
+            
+            if (connect(sd, a->ai_addr, a->ai_addrlen) == -1)
+            {
+                perror("failed to connect to an address");
+                close(sd);
+                continue;
+            }
+            
+            // success
+            freeaddrinfo(addrs);
+            dtm = malloc(sizeof(DTMConnData));
+            dtm->sock = sd;
+            return dtm;
+        }
+        freeaddrinfo(addrs);
+    }
+    fprintf(stderr, "could not connect\n");
+    return NULL;
 }
 
 /*
@@ -231,16 +257,14 @@ static bool dtm_query(DTMConn dtm, char cmd, int argc, ...)
 	return true;
 }
 
-static char *dtmhost = NULL;
-static int dtmport = 0;
-
-void TuneToDtm(char *host, int port) {
+void DtmGlobalConfig(char *host, int port, char* sock_dir) {
 	if (dtmhost) {
 		free(dtmhost);
 		dtmhost = NULL;
 	}
 	dtmhost = strdup(host);
 	dtmport = port;
+    dtm_unix_sock_dir = sock_dir;
 }
 
 static DTMConn GetConnection()
@@ -255,7 +279,7 @@ static DTMConn GetConnection()
 				elog(ERROR, "Failed to connect to DTMD %s:%d", dtmhost, dtmport);
 			}
 		} else {
-			elog(ERROR, "DTMD address not specified");
+			/* elog(ERROR, "DTMD address not specified"); */
 		}
 	}
 	return dtm;
diff --git a/contrib/pg_dtm/libdtm.h b/contrib/pg_dtm/libdtm.h
@@ -10,7 +10,7 @@
 
 // Sets up the host and port for DTM connection.
 // The defaults are "127.0.0.1" and 5431.
-void TuneToDtm(char *host, int port);
+void DtmGlobalConfig(char *host, int port, char* sock_dir);
 
 void DtmInitSnapshot(Snapshot snapshot);
 
diff --git a/contrib/pg_dtm/pg_dtm.c b/contrib/pg_dtm/pg_dtm.c
@@ -12,6 +12,8 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "miscadmin.h"
+#include "postmaster/postmaster.h"
+#include "postmaster/bgworker.h"
 #include "storage/s_lock.h"
 #include "storage/spin.h"
 #include "storage/lmgr.h"
@@ -39,6 +41,7 @@
 #include "storage/pmsignal.h"
 #include "storage/proc.h"
 #include "utils/syscache.h"
+#include "sockhub/sockhub.h"
 
 #include "libdtm.h"
 
@@ -74,6 +77,7 @@ static bool TransactionIdIsInSnapshot(TransactionId xid, Snapshot snapshot);
 static bool TransactionIdIsInDoubt(TransactionId xid);
 
 static void DtmShmemStartup(void);
+static void DtmBackgroundWorker(Datum arg);
 
 static shmem_startup_hook_type prev_shmem_startup_hook;
 static HTAB* xid_in_doubt;
@@ -91,7 +95,17 @@ static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionSt
 
 static char *DtmHost;
 static int DtmPort;
-
+static int DtmBufferSize;
+
+static BackgroundWorker DtmWorker = {
+    "DtmWorker",
+    0, /* do not need connection to the database */
+    BgWorkerStart_PostmasterStart,
+    1, /* restrart in one second (is it possible to restort immediately?) */
+    DtmBackgroundWorker
+};
+    
+    
 
 #define XTM_TRACE(fmt, ...)
 //#define XTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
@@ -623,6 +637,9 @@ static void DtmInitialize()
 		dtm->nReservedXids = 0;
         dtm->minXid = InvalidTransactionId;
         RegisterXactCallback(DtmXactCallback, NULL);
+        if (DtmBufferSize != 0) { 
+            RegisterBackgroundWorker(&DtmWorker);
+        }
 	}
 	LWLockRelease(AddinShmemInitLock);
 
@@ -716,6 +733,21 @@ _PG_init(void)
 		NULL
 	);
 
+	DefineCustomIntVariable(
+		"dtm.buffer_size",
+		"Size of sockhub buffer for connection to DTM daemon, if 0, then direct connection will be used",
+		NULL,
+		&DtmBufferSize,
+		0,
+		0,
+		INT_MAX,
+		PGC_POSTMASTER,
+		0,
+		NULL,
+		NULL,
+		NULL
+	);
+
 	DefineCustomStringVariable(
 		"dtm.host",
 		"The host where DTM daemon resides",
@@ -744,7 +776,7 @@ _PG_init(void)
 		NULL
 	);
 
-	TuneToDtm(DtmHost, DtmPort);
+	DtmGlobalConfig(DtmHost, DtmPort, Unix_socket_directories);
 
 	/*
 	 * Install hooks.
@@ -835,3 +867,24 @@ Datum dtm_join_transaction(PG_FUNCTION_ARGS)
 	PG_RETURN_VOID();
 }
 
+void DtmBackgroundWorker(Datum arg)
+{
+    Shub shub;
+    ShubParams params;
+    char unix_sock_path[MAXPGPATH];
+    
+    snprintf(unix_sock_path, sizeof(unix_sock_path), "%s/p%d", Unix_socket_directories, DtmPort);
+
+    ShubInitParams(&params);
+
+    params.host = DtmHost;
+    params.port = DtmPort;
+    params.file = unix_sock_path;
+    params.buffer_size = DtmBufferSize;
+    
+	DtmGlobalConfig("localhost", DtmPort, Unix_socket_directories);
+
+    ShubInitialize(&shub, &params);
+    
+    ShubLoop(&shub);
+}
diff --git a/contrib/pg_dtm/sockhub/Makefile b/contrib/pg_dtm/sockhub/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -c -I. -Wall -O2 -g
+CFLAGS = -c -I. -Wall -O2 -g -fPIC
 LD = $(CC)
 LDFLAGS = -g
 AR = ar
diff --git a/contrib/pg_dtm/tests/transfers.sh b/contrib/pg_dtm/tests/transfers.sh
@@ -2,5 +2,5 @@
 go run transfers.go \
 	-d 'dbname=postgres port=5432' \
 	-d 'dbname=postgres port=5433' \
-	-d 'dbname=postgres port=5434' \
+    -m \
 	-g
