Sync with upstream

This commit is contained in:
Ian Gulliver
2016-03-01 20:17:58 -08:00
parent adfc23cba7
commit 761460886a
2 changed files with 4 additions and 3 deletions

View File

@@ -1,4 +1,5 @@
#include <assert.h>
#include <fcntl.h>
#include <netdb.h>
#include <pthread.h>
#include <stdlib.h>
@@ -65,7 +66,7 @@ void asyncaddrinfo_init(size_t threads) {
assert(asyncaddrinfo_threads);
for (size_t i = 0; i < asyncaddrinfo_num_threads; i++) {
int subfd = dup(fds[0]);
int subfd = fcntl(fds[0], F_DUPFD_CLOEXEC, 0);
assert(subfd >= 0);
assert(!pthread_create(&asyncaddrinfo_threads[i], NULL, asyncaddrinfo_main, (void *) (intptr_t) subfd));
}
@@ -83,7 +84,7 @@ void asyncaddrinfo_cleanup() {
asyncaddrinfo_threads = NULL;
}
int asyncaddrinfo_resolve(const char *node, const char *service, struct addrinfo *hints) {
int asyncaddrinfo_resolve(const char *node, const char *service, const struct addrinfo *hints) {
int fds[2];
assert(!socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds));

View File

@@ -4,5 +4,5 @@ struct addrinfo;
void asyncaddrinfo_init(size_t threads);
void asyncaddrinfo_cleanup(void);
int asyncaddrinfo_resolve(const char *node, const char *service, struct addrinfo *hints);
int asyncaddrinfo_resolve(const char *node, const char *service, const struct addrinfo *hints);
int asyncaddrinfo_result(int fd, struct addrinfo **addrs);