Commit01c051e

committed

more portable way to switch socket to nonblock mode

1 parent3ebf193 commit01c051eCopy full SHA for 01c051e

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`#include<errno.h>`
`17`	`17`	`#include<netdb.h>`
`18`	`18`	`#include<time.h>`
	`19`	`+#include<fcntl.h>`
`19`	`20`
`20`	`21`	`#include"postgres.h"`
`21`	`22`	`#include"fmgr.h"`
`@@ -380,10 +381,11 @@ static int MtmConnectSocket(char const* host, int port, int max_attempts)`
`380`	`381`	`while (1) {`
`381`	`382`	`intrc=-1;`
`382`	`383`
`383`		`-sd=socket(AF_INET,SOCK_STREAM\|SOCK_NONBLOCK,0);`
	`384`	`+sd=socket(AF_INET,SOCK_STREAM,0);`
`384`	`385`	`if (sd<0) {`
`385`	`386`	`elog(ERROR,"Arbiter failed to create socket: %d",errno);`
`386`	`387`	`}`
	`388`	`+fcntl(sd,F_SETFL,O_NONBLOCK);`
`387`	`389`	`busy_socket=sd;`
`388`	`390`	`for (i=0;i<n_addrs;++i) {`
`389`	`391`	`memcpy(&sock_inet.sin_addr,&addrs[i],sizeofsock_inet.sin_addr);`

Lines changed: 3 additions & 1 deletion

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`	`intone=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)`

Comments

(0)