more portable way to switch socket to nonblock mode

kelvich · kelvich · commit 01c051e1b43d · 2016-06-21T16:33:44.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <netdb.h>
 #include <time.h>
+#include <fcntl.h>
 
 #include "postgres.h"
 #include "fmgr.h"
@@ -380,10 +381,11 @@ static int MtmConnectSocket(char const* host, int port, int max_attempts)
     while (1) {
 		int rc = -1;
 
-		sd = socket(AF_INET, SOCK_STREAM|SOCK_NONBLOCK, 0);
+		sd = socket(AF_INET, SOCK_STREAM, 0);
 		if (sd < 0) {
 			elog(ERROR, "Arbiter failed to create socket: %d", errno);
 		}
+		fcntl(sd, F_SETFL, O_NONBLOCK);
 		busy_socket = sd;
 		for (i = 0; i < n_addrs; ++i) {
 			memcpy(&sock_inet.sin_addr, &addrs[i], sizeof sock_inet.sin_addr);
diff --git a/contrib/raftable/raftable.c b/contrib/raftable/raftable.c
@@ -28,6 +28,7 @@
 #include <arpa/inet.h>
 
 #include <unistd.h>
+#include <fcntl.h>
 #include <time.h>
 
 void _PG_init(void);
@@ -194,12 +195,13 @@ static bool connect_leader(timeout_t *timeout)
 	{
 		int one = 1;
 
-		sd = socket(a->ai_family, SOCK_STREAM | SOCK_NONBLOCK, 0);
+		sd = socket(a->ai_family, SOCK_STREAM, 0);
 		if (sd == -1)
 		{
 			elog(WARNING, "failed to create a socket: %s", strerror(errno));
 			continue;
 		}
+		fcntl(sd, F_SETFL, O_NONBLOCK);
 		setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
 
 		if (connect(sd, a->ai_addr, a->ai_addrlen) == -1)

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#include <arpa/inet.h>`
`29`	`29`
`30`	`30`	`#include <unistd.h>`
	`31`	`+#include <fcntl.h>`
`31`	`32`	`#include <time.h>`
`32`	`33`
`33`	`34`	`void _PG_init(void);`
`@@ -194,12 +195,13 @@ static bool connect_leader(timeout_t *timeout)`
`194`	`195`	`{`
`195`	`196`	`int one = 1;`
`196`	`197`
`197`		`- sd = socket(a->ai_family, SOCK_STREAM \| SOCK_NONBLOCK, 0);`
	`198`	`+ sd = socket(a->ai_family, SOCK_STREAM, 0);`
`198`	`199`	`if (sd == -1)`
`199`	`200`	`{`
`200`	`201`	`elog(WARNING, "failed to create a socket: %s", strerror(errno));`
`201`	`202`	`continue;`
`202`	`203`	`}`
	`204`	`+ fcntl(sd, F_SETFL, O_NONBLOCK);`
`203`	`205`	`setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));`
`204`	`206`
`205`	`207`	`if (connect(sd, a->ai_addr, a->ai_addrlen) == -1)`