This is an archive of the discontinued LLVM Phabricator instance.

Differential D31897

[tsan] Fall-back to IPv6 if IPv4 is not available.
ClosedPublic

Authored by vitalybuka on Apr 10 2017, 10:31 AM.

Details

Reviewers
eugenis
Commits
rG2bca1a9f40a4: [tsan] Fall-back to IPv6 if IPv4 is not available.
rCRT299885: [tsan] Fall-back to IPv6 if IPv4 is not available.
rL299885: [tsan] Fall-back to IPv6 if IPv4 is not available.

Diff Detail

Event Timeline

vitalybuka created this revision.Apr 10 2017, 10:31 AM
Herald added a subscriber: kubamracek. · View Herald TranscriptApr 10 2017, 10:31 AM
eugenis accepted this revision.Apr 10 2017, 11:02 AM
This revision is now accepted and ready to land.Apr 10 2017, 11:02 AM
Closed by commit rL299885: [tsan] Fall-back to IPv6 if IPv4 is not available. (authored by vitalybuka). · Explain WhyApr 10 2017, 2:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
tsan/
45 lines
45 lines

Diff 94696

test/tsan/fd_socket_connect_norace.cc

// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s // RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
#include <arpa/inet.h>
#include <assert.h>
#include <netinet/in.h>
#include <pthread.h> #include <pthread.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <sys/types.h>
#include <arpa/inet.h> #include <unistd.h>
struct sockaddr_in addr; struct sockaddr_in addr4;
struct sockaddr_in6 addr6;
struct sockaddr *addr;
socklen_t addrlen;
int X; int X;
void *ClientThread(void *x) { void *ClientThread(void *x) {
int c = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); int c = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
X = 42; X = 42;
if (connect(c, (struct sockaddr*)&addr, sizeof(addr))) { if (connect(c, addr, addrlen)) {
perror("connect"); perror("connect");
exit(1); exit(1);
} }
close(c); close(c);
return NULL; return NULL;
} }
int main() { int main() {
int s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); addr4.sin_family = AF_INET;
addr.sin_family = AF_INET; addr4.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
inet_pton(AF_INET, "127.0.0.1", &addr.sin_addr); addr4.sin_port = INADDR_ANY;
addr.sin_port = INADDR_ANY; addr = (struct sockaddr *)&addr4;
socklen_t len = sizeof(addr); addrlen = sizeof(addr4);
bind(s, (sockaddr*)&addr, len);
getsockname(s, (sockaddr*)&addr, &len); int s = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
if (s <= 0) {
// Try to fall-back to IPv6
addr6.sin6_family = AF_INET6;
addr6.sin6_addr = in6addr_loopback;
addr6.sin6_port = INADDR_ANY;
addr = (struct sockaddr *)&addr6;
addrlen = sizeof(addr6);
s = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
}
assert(s > 0);
bind(s, addr, addrlen);
getsockname(s, addr, &addrlen);
listen(s, 10); listen(s, 10);
pthread_t t; pthread_t t;
pthread_create(&t, 0, ClientThread, 0); pthread_create(&t, 0, ClientThread, 0);
int c = accept(s, 0, 0); int c = accept(s, 0, 0);
X = 42; X = 42;
pthread_join(t, 0); pthread_join(t, 0);
close(c); close(c);
close(s); close(s);
fprintf(stderr, "OK\n"); fprintf(stderr, "OK\n");
} }
// CHECK-NOT: WARNING: ThreadSanitizer: data race // CHECK-NOT: WARNING: ThreadSanitizer: data race

test/tsan/fd_socket_norace.cc

// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s // RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
#include <arpa/inet.h>
#include <assert.h>
#include <netinet/in.h>
#include <pthread.h> #include <pthread.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <sys/types.h>
#include <arpa/inet.h> #include <unistd.h>
struct sockaddr_in addr; struct sockaddr_in addr4;
struct sockaddr_in6 addr6;
struct sockaddr *addr;
socklen_t addrlen;
int X; int X;
void *ClientThread(void *x) { void *ClientThread(void *x) {
X = 42; X = 42;
int c = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); int c = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
if (connect(c, (struct sockaddr*)&addr, sizeof(addr))) { if (connect(c, addr, addrlen)) {
perror("connect"); perror("connect");
exit(1); exit(1);
} }
if (send(c, "a", 1, 0) != 1) { if (send(c, "a", 1, 0) != 1) {
perror("send"); perror("send");
exit(1); exit(1);
} }
close(c); close(c);
return NULL; return NULL;
} }
int main() { int main() {
int s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); addr4.sin_family = AF_INET;
addr.sin_family = AF_INET; addr4.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
inet_pton(AF_INET, "127.0.0.1", &addr.sin_addr); addr4.sin_port = INADDR_ANY;
addr.sin_port = INADDR_ANY; addr = (struct sockaddr *)&addr4;
socklen_t len = sizeof(addr); addrlen = sizeof(addr4);
bind(s, (sockaddr*)&addr, len);
getsockname(s, (sockaddr*)&addr, &len); int s = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
if (s <= 0) {
// Try to fall-back to IPv6
addr6.sin6_family = AF_INET6;
addr6.sin6_addr = in6addr_loopback;
addr6.sin6_port = INADDR_ANY;
addr = (struct sockaddr *)&addr6;
addrlen = sizeof(addr6);
s = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
}
assert(s > 0);
bind(s, addr, addrlen);
getsockname(s, addr, &addrlen);
listen(s, 10); listen(s, 10);
pthread_t t; pthread_t t;
pthread_create(&t, 0, ClientThread, 0); pthread_create(&t, 0, ClientThread, 0);
int c = accept(s, 0, 0); int c = accept(s, 0, 0);
char buf; char buf;
while (read(c, &buf, 1) != 1) { while (read(c, &buf, 1) != 1) {
} }
X = 43; X = 43;
close(c); close(c);
close(s); close(s);
pthread_join(t, 0); pthread_join(t, 0);
fprintf(stderr, "OK\n"); fprintf(stderr, "OK\n");
} }
// CHECK-NOT: WARNING: ThreadSanitizer: data race // CHECK-NOT: WARNING: ThreadSanitizer: data race