Ulrich Drepper
77d2720059
flag parameters: NONBLOCK in socket and socketpair
This patch introduces support for the SOCK_NONBLOCK flag in socket,
socketpair, and paccept. To do this the internal function sock_attach_fd
gets an additional parameter which it uses to set the appropriate flag for
the file descriptor.
Given that in modern, scalable programs almost all socket connections are
non-blocking and the minimal additional cost for the new functionality
I see no reason not to add this code.
The following test must be adjusted for architectures other than x86 and
x86-64 and in case the syscall numbers changed.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#include <fcntl.h>
#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/syscall.h>
#ifndef __NR_paccept
# ifdef __x86_64__
# define __NR_paccept 288
# elif defined __i386__
# define SYS_PACCEPT 18
# define USE_SOCKETCALL 1
# else
# error "need __NR_paccept"
# endif
#endif
#ifdef USE_SOCKETCALL
# define paccept(fd, addr, addrlen, mask, flags) \
({ long args[6] = { \
(long) fd, (long) addr, (long) addrlen, (long) mask, 8, (long) flags }; \
syscall (__NR_socketcall, SYS_PACCEPT, args); })
#else
# define paccept(fd, addr, addrlen, mask, flags) \
syscall (__NR_paccept, fd, addr, addrlen, mask, 8, flags)
#endif
#define PORT 57392
#define SOCK_NONBLOCK O_NONBLOCK
static pthread_barrier_t b;
static void *
tf (void *arg)
{
pthread_barrier_wait (&b);
int s = socket (AF_INET, SOCK_STREAM, 0);
struct sockaddr_in sin;
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
sin.sin_port = htons (PORT);
connect (s, (const struct sockaddr *) &sin, sizeof (sin));
close (s);
pthread_barrier_wait (&b);
pthread_barrier_wait (&b);
s = socket (AF_INET, SOCK_STREAM, 0);
sin.sin_port = htons (PORT);
connect (s, (const struct sockaddr *) &sin, sizeof (sin));
close (s);
pthread_barrier_wait (&b);
return NULL;
}
int
main (void)
{
int fd;
fd = socket (PF_INET, SOCK_STREAM, 0);
if (fd == -1)
{
puts ("socket(0) failed");
return 1;
}
int fl = fcntl (fd, F_GETFL);
if (fl == -1)
{
puts ("fcntl failed");
return 1;
}
if (fl & O_NONBLOCK)
{
puts ("socket(0) set non-blocking mode");
return 1;
}
close (fd);
fd = socket (PF_INET, SOCK_STREAM|SOCK_NONBLOCK, 0);
if (fd == -1)
{
puts ("socket(SOCK_NONBLOCK) failed");
return 1;
}
fl = fcntl (fd, F_GETFL);
if (fl == -1)
{
puts ("fcntl failed");
return 1;
}
if ((fl & O_NONBLOCK) == 0)
{
puts ("socket(SOCK_NONBLOCK) does not set non-blocking mode");
return 1;
}
close (fd);
int fds[2];
if (socketpair (PF_UNIX, SOCK_STREAM, 0, fds) == -1)
{
puts ("socketpair(0) failed");
return 1;
}
for (int i = 0; i < 2; ++i)
{
fl = fcntl (fds[i], F_GETFL);
if (fl == -1)
{
puts ("fcntl failed");
return 1;
}
if (fl & O_NONBLOCK)
{
printf ("socketpair(0) set non-blocking mode for fds[%d]\n", i);
return 1;
}
close (fds[i]);
}
if (socketpair (PF_UNIX, SOCK_STREAM|SOCK_NONBLOCK, 0, fds) == -1)
{
puts ("socketpair(SOCK_NONBLOCK) failed");
return 1;
}
for (int i = 0; i < 2; ++i)
{
fl = fcntl (fds[i], F_GETFL);
if (fl == -1)
{
puts ("fcntl failed");
return 1;
}
if ((fl & O_NONBLOCK) == 0)
{
printf ("socketpair(SOCK_NONBLOCK) does not set non-blocking mode for fds[%d]\n", i);
return 1;
}
close (fds[i]);
}
pthread_barrier_init (&b, NULL, 2);
struct sockaddr_in sin;
pthread_t th;
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
puts ("pthread_create failed");
return 1;
}
int s = socket (AF_INET, SOCK_STREAM, 0);
int reuse = 1;
setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof (reuse));
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
sin.sin_port = htons (PORT);
bind (s, (struct sockaddr *) &sin, sizeof (sin));
listen (s, SOMAXCONN);
pthread_barrier_wait (&b);
int s2 = paccept (s, NULL, 0, NULL, 0);
if (s2 < 0)
{
puts ("paccept(0) failed");
return 1;
}
fl = fcntl (s2, F_GETFL);
if (fl & O_NONBLOCK)
{
puts ("paccept(0) set non-blocking mode");
return 1;
}
close (s2);
close (s);
pthread_barrier_wait (&b);
s = socket (AF_INET, SOCK_STREAM, 0);
sin.sin_port = htons (PORT);
setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof (reuse));
bind (s, (struct sockaddr *) &sin, sizeof (sin));
listen (s, SOMAXCONN);
pthread_barrier_wait (&b);
s2 = paccept (s, NULL, 0, NULL, SOCK_NONBLOCK);
if (s2 < 0)
{
puts ("paccept(SOCK_NONBLOCK) failed");
return 1;
}
fl = fcntl (s2, F_GETFL);
if ((fl & O_NONBLOCK) == 0)
{
puts ("paccept(SOCK_NONBLOCK) does not set non-blocking mode");
return 1;
}
close (s2);
close (s);
pthread_barrier_wait (&b);
puts ("OK");
return 0;
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 10:47:29 -07:00
..
2008-04-30 08:29:54 -07:00
2008-07-14 22:38:35 +02:00
2008-07-15 16:11:29 -04:00
2008-07-23 18:24:08 -07:00
2008-07-14 23:48:48 -07:00
2008-07-16 15:17:52 -07:00
2008-07-21 21:55:03 -07:00
2008-07-21 10:11:00 -07:00
2008-05-21 14:08:38 -07:00
2008-06-09 15:55:45 -07:00
2008-05-21 14:08:38 -07:00
2008-05-21 14:08:38 -07:00
2008-06-23 13:02:50 -04:00
2008-07-21 17:05:25 +10:00
2008-07-22 13:13:47 -07:00
2008-07-14 14:52:56 -04:00
2008-07-20 21:21:46 -07:00
2008-04-29 08:06:27 -07:00
2008-07-22 13:03:22 -07:00
2008-06-16 10:20:58 -07:00
2008-07-24 10:47:24 -07:00
2008-07-01 11:28:06 +10:00
2008-06-19 10:42:17 +10:00
2008-06-19 10:42:17 +10:00
2008-04-29 08:06:00 -07:00
2008-07-24 10:47:27 -07:00
2008-07-17 17:59:55 -07:00
2008-05-14 23:24:09 -07:00
2008-05-14 23:24:09 -07:00
2008-07-24 10:47:24 -07:00
2008-07-22 09:59:40 -07:00
2008-04-30 08:29:50 -07:00
2008-07-24 10:47:22 -07:00
2008-07-03 13:21:14 +02:00
2008-05-13 08:02:25 -07:00
2008-04-29 08:11:16 -07:00
2008-06-06 11:29:10 -07:00
2008-07-16 14:51:41 -07:00
2008-07-03 13:21:12 +02:00
2008-07-24 10:47:20 -07:00
2008-05-29 01:38:46 -07:00
2008-04-29 08:06:01 -07:00
2008-07-04 10:40:08 -07:00
2008-04-30 08:29:54 -07:00
2008-07-04 10:40:05 -07:00
2008-04-29 08:06:09 -07:00
2008-04-29 08:06:10 -07:00
2008-05-01 08:03:59 -07:00
2008-04-30 08:29:54 -07:00
2008-04-29 08:05:59 -07:00
2008-05-01 08:03:59 -07:00
2008-04-30 08:42:49 -07:00
2008-05-10 19:51:16 -07:00
2008-04-30 08:29:54 -07:00
2008-07-17 15:21:29 -07:00
2008-04-29 08:06:06 -07:00
2008-05-27 10:11:36 +02:00
2008-04-29 08:05:59 -07:00
2008-05-19 18:17:49 -04:00
2008-06-11 19:13:45 -04:00
2008-07-23 19:36:53 -07:00
2008-07-18 13:22:25 +02:00
2008-04-30 08:29:54 -07:00
2008-07-12 08:22:32 -05:00
2008-07-10 20:35:18 +08:00
2008-07-20 17:12:38 -07:00
2008-07-22 17:30:57 -07:00
2008-07-11 10:46:50 +02:00
2008-07-13 11:51:40 +01:00
2008-07-05 13:10:50 -07:00
2008-07-21 21:54:59 -07:00
2008-04-30 08:29:53 -07:00
2008-06-24 13:53:46 +02:00
2008-04-29 08:06:09 -07:00
2008-07-21 12:00:37 +01:00
2008-07-21 21:54:53 -07:00
2008-04-30 08:29:48 -07:00
2008-06-24 22:58:07 -04:00
2008-07-21 12:00:37 +01:00
2008-07-22 10:39:36 +10:00
2008-04-29 08:06:11 -07:00
2008-07-17 17:59:56 -07:00
2008-04-28 08:58:30 -07:00
2008-07-08 11:59:42 -07:00
2008-04-29 08:06:26 -07:00
2008-05-25 10:55:10 +02:00
2008-07-21 21:54:53 -07:00
2008-07-01 14:47:09 +10:00
2008-07-02 03:47:41 -07:00
2008-07-24 10:47:27 -07:00
2008-07-24 10:47:28 -07:00
2008-05-07 09:48:23 +02:00
2008-04-28 08:58:35 -07:00
2008-05-16 17:22:26 -04:00
2008-05-01 13:08:16 -04:00
2008-07-08 17:55:41 +02:00
2008-07-10 14:30:13 +01:00
2008-07-16 23:27:03 +02:00
2008-07-22 19:09:51 -07:00
2008-07-24 10:47:28 -07:00
2008-07-16 17:57:47 -05:00
2008-04-30 08:29:54 -07:00
2008-07-11 15:49:21 +02:00
2008-05-13 08:02:26 -07:00
2008-05-16 14:50:42 -04:00
2008-07-20 17:12:36 -07:00
2008-07-03 13:21:14 +02:00
2008-07-24 10:47:20 -07:00
2008-05-16 16:54:14 -04:00
2008-05-24 09:56:13 -07:00
2008-05-10 20:58:02 -07:00
2008-07-20 17:12:36 -07:00
2008-07-04 08:47:41 -04:00
2008-07-23 15:25:21 +02:00
2008-05-20 16:44:43 +02:00
2008-05-03 18:11:48 +02:00
2008-07-24 10:47:19 -07:00
2008-04-30 08:29:54 -07:00
2008-07-14 22:38:31 +02:00
2008-07-20 07:18:38 -03:00
2008-07-14 22:38:36 +02:00
2008-04-30 08:29:54 -07:00
2008-07-23 19:56:01 +02:00
2008-04-29 08:06:25 -07:00
2008-07-08 14:15:59 -04:00
2008-06-11 21:00:38 -07:00
2008-04-30 08:29:54 -07:00
2008-07-18 18:05:19 -07:00
2008-06-11 21:00:38 -07:00
2008-07-14 22:18:19 -07:00
2008-06-16 16:48:20 -07:00
2008-07-14 22:49:06 -07:00
2008-07-03 17:51:57 +09:00
2008-07-10 14:47:38 +01:00
2008-06-03 16:36:01 -07:00
2008-06-27 20:09:00 -07:00
2008-07-09 12:09:28 -04:00
2008-06-03 16:37:33 -07:00
2008-07-16 18:02:33 -07:00
2008-04-29 08:06:03 -07:00
2008-07-24 10:47:28 -07:00
2008-07-21 00:55:14 -04:00
2008-07-15 10:39:22 -07:00
2008-05-05 16:47:14 +10:00
2008-07-03 13:21:14 +02:00
2008-07-16 23:27:07 +02:00
2008-05-07 09:51:23 +02:00
2008-06-11 21:00:38 -07:00
2008-04-29 08:06:13 -07:00
2008-04-29 08:06:15 -07:00
2008-04-29 08:06:15 -07:00
2008-07-21 13:41:16 -07:00
2008-06-05 15:18:30 +02:00
2008-05-23 20:32:54 +02:00
2008-04-29 03:22:15 -04:00
2008-04-30 08:29:54 -07:00
2008-07-20 17:12:37 -07:00
2008-07-11 19:27:31 -04:00
2008-05-01 08:03:58 -07:00
2008-05-20 12:17:39 -04:00
2008-05-15 17:50:37 -07:00
2008-06-27 23:13:54 +02:00
2008-04-29 08:06:29 -07:00
2008-05-12 21:28:05 +02:00
2008-07-10 08:17:14 +02:00
2008-04-29 08:06:17 -07:00
2008-04-29 08:06:16 -07:00
2008-04-30 08:29:54 -07:00
2008-05-05 07:13:21 -05:00
2008-04-30 16:52:58 -07:00
2008-07-22 19:24:31 +10:00
2008-04-30 08:29:54 -07:00
2008-07-24 10:47:17 -07:00
2008-06-23 22:10:57 +02:00
2008-04-30 08:29:54 -07:00
2008-07-04 10:40:05 -07:00
2008-07-20 12:42:40 +03:00
2008-07-20 12:42:32 +03:00
2008-07-14 15:59:33 -04:00
2008-05-16 14:50:49 -04:00
2008-07-14 16:11:52 +02:00
2008-05-19 10:01:37 +02:00
2008-06-27 09:39:47 +01:00
2008-04-29 15:57:53 +10:00
2008-06-24 13:43:07 +02:00
2008-05-23 22:26:03 +02:00
2008-06-12 10:47:58 +02:00
2008-04-29 08:06:01 -07:00
2008-04-29 08:06:10 -07:00
2008-07-24 10:47:21 -07:00
2008-04-29 08:06:12 -07:00
2008-07-24 10:47:21 -07:00
2008-07-24 10:47:21 -07:00
2008-05-13 08:02:25 -07:00
2008-07-24 10:47:21 -07:00
2008-07-09 16:30:45 +10:00
2008-05-24 11:27:41 +02:00
2008-05-24 09:56:13 -07:00
2008-07-14 10:02:12 +02:00
2008-07-24 10:47:24 -07:00
2008-04-30 08:29:54 -07:00
2008-07-11 19:27:31 -04:00
2008-07-03 17:51:57 +09:00
2008-07-03 17:51:57 +09:00
2008-06-08 11:58:43 -07:00
2008-06-06 11:29:12 -07:00
2008-04-29 09:11:12 -07:00
2008-06-12 08:40:37 +02:00
2008-04-29 08:06:24 -07:00
2008-04-30 08:29:54 -07:00
2008-04-28 08:58:29 -07:00
2008-07-24 10:47:29 -07:00
2008-07-22 14:09:06 -07:00
2008-06-09 15:57:24 -07:00
2008-07-08 02:36:40 -07:00
2008-05-21 14:08:38 -07:00
2008-06-05 11:23:39 -07:00
2008-06-23 13:02:48 -04:00
2008-07-09 12:09:40 -04:00
2008-07-09 12:09:17 -04:00
2008-07-09 12:09:24 -04:00
2008-07-09 12:09:16 -04:00
2008-06-27 09:09:17 -04:00
2008-06-17 23:59:41 -04:00
2008-05-16 23:22:28 +10:00
2008-07-22 10:39:30 +10:00
2008-05-09 20:22:58 +10:00
2008-07-24 10:47:15 -07:00
2008-05-25 10:55:11 +02:00
2008-07-24 10:47:15 -07:00
2008-05-14 19:23:25 -05:00
2008-06-10 14:37:03 -07:00
2008-07-23 12:03:18 -07:00
2008-07-07 16:26:50 -07:00
2008-07-16 17:25:46 -07:00
2008-05-03 03:39:55 +04:00
2008-07-11 19:27:31 -04:00
2008-05-14 19:11:14 -07:00
2008-04-29 08:06:02 -07:00
2008-04-29 08:06:02 -07:00
2008-05-06 12:01:41 -04:00
2008-04-30 08:29:49 -07:00
2008-04-30 08:29:49 -07:00
2008-07-14 20:36:32 -07:00
2008-07-20 00:08:47 -07:00
2008-06-10 10:59:51 -07:00
2008-07-14 14:30:21 -07:00
2008-07-24 10:47:23 -07:00
2008-07-16 23:27:07 +02:00
2008-04-30 08:29:53 -07:00
2008-05-01 13:07:28 -04:00
2008-06-11 21:00:38 -07:00
2008-06-11 21:00:38 -07:00
2008-04-28 08:58:26 -07:00
2008-05-23 20:32:54 +02:00
2008-07-22 14:19:19 -07:00
2008-04-30 08:29:54 -07:00
2008-04-30 08:29:50 -07:00
2008-07-14 15:01:47 +10:00
2008-07-03 13:25:05 +01:00
2008-05-19 16:25:39 +01:00
2008-05-01 08:04:01 -07:00
2008-04-28 08:58:33 -07:00
2008-05-19 10:01:36 +02:00
2008-07-04 10:40:07 -07:00
2008-05-19 10:01:36 +02:00
2008-04-30 08:29:54 -07:00
2008-05-19 10:01:36 +02:00
2008-04-30 08:29:51 -07:00
2008-04-28 08:58:46 -07:00
2008-04-29 08:06:10 -07:00
2008-04-29 08:05:59 -07:00
2008-05-25 07:09:47 +02:00
2008-06-26 14:21:22 -04:00
2008-04-30 08:29:54 -07:00
2008-05-03 10:01:33 -07:00
2008-07-20 00:08:47 -07:00
2008-04-30 08:29:54 -07:00
2008-07-23 14:42:09 +02:00
2008-07-24 10:47:14 -07:00
2008-07-04 10:40:08 -07:00
2008-07-24 10:47:22 -07:00
2008-07-18 04:07:44 -07:00
2008-04-30 08:29:54 -07:00
2008-04-28 08:58:32 -07:00
2008-07-24 10:47:24 -07:00
2008-07-08 10:33:01 -04:00
2008-04-28 08:58:25 -07:00
2008-04-30 08:29:34 -07:00
2008-07-24 10:47:27 -07:00
2008-07-14 22:49:06 -07:00
2008-07-24 10:47:21 -07:00
2008-07-04 10:40:04 -07:00
2008-05-24 09:56:12 -07:00
2008-04-30 08:29:54 -07:00
2008-04-30 08:29:54 -07:00
2008-04-29 08:06:05 -07:00
2008-07-12 21:52:41 +01:00
2008-06-11 21:58:11 -04:00
2008-06-20 14:05:53 -06:00
2008-07-04 11:26:40 +02:00
2008-07-19 22:35:47 -07:00
2008-06-17 16:19:24 -07:00
2008-07-20 17:12:37 -07:00
2008-07-24 10:47:13 -07:00
2008-06-12 14:25:09 -07:00
2008-04-30 08:29:54 -07:00
2008-07-22 13:03:29 -07:00
2008-07-24 10:47:28 -07:00
2008-04-29 08:06:23 -07:00
2008-07-21 21:55:02 -07:00
2008-07-21 21:55:01 -07:00
2008-04-29 08:06:27 -07:00
2008-07-19 00:07:02 -07:00
2008-07-08 02:38:40 -07:00
2008-06-25 19:25:42 -04:00
2008-04-30 08:29:37 -07:00
2008-06-12 10:48:00 +02:00
2008-04-30 08:29:53 -07:00
2008-07-24 10:47:27 -07:00
2008-05-01 08:03:59 -07:00
2008-05-21 14:52:30 -07:00
2008-06-13 10:09:46 +02:00
2008-07-22 13:03:28 -07:00
2008-07-20 17:12:34 -07:00
2008-07-22 13:03:27 -07:00
2008-05-24 09:56:09 -07:00
2008-06-16 17:14:11 -07:00
2008-07-21 21:54:55 -07:00
2008-07-21 15:16:40 -07:00
2008-07-21 15:15:55 -07:00
2008-05-09 07:45:18 -07:00
2008-07-20 07:17:02 -03:00
2008-05-30 15:09:45 +10:00
2008-05-30 15:09:46 +10:00
2008-06-10 18:20:30 -04:00
2008-05-30 15:09:44 +10:00
2008-05-02 21:50:50 +10:00
2008-07-24 10:47:14 -07:00
2008-05-29 01:43:48 -07:00
2008-06-16 18:50:49 -07:00
2008-05-27 01:37:26 -04:00
2008-07-24 10:47:23 -07:00
2008-07-15 08:36:38 -07:00
2008-04-29 08:06:06 -07:00
2008-07-10 16:55:37 -07:00