Changeset d1558f3 in rtems-libbsd

Timestamp:

Nov 16, 2015, 8:51:44 AM (4 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11

Children:

af60212

Parents:

5aa22c6

git-author:

Sebastian Huber <sebastian.huber@…> (11/16/15 08:51:44)

git-committer:

Sebastian Huber <sebastian.huber@…> (11/16/15 08:54:29)

Message:

SOCKETPAIR(2): Port to RTEMS

Files:

• freebsd/sys/kern/uipc_syscalls.c (modified) (5 diffs)
• freebsd/sys/sys/sysproto.h (modified) (2 diffs)
• rtemsbsd/include/machine/rtems-bsd-syscall-api.h (modified) (1 diff)
• testsuite/syscalls01/test_main.c (modified) (2 diffs)

freebsd/sys/kern/uipc_syscalls.c

@@ -816 +816 @@
 }
 
-#ifndef __rtems__
 int
 kern_socketpair(struct thread *td, int domain, int type, int protocol,
     int *rsv)
 {
+#ifndef __rtems__
         struct filedesc *fdp = td->td_proc->p_fd;
+#endif /* __rtems__ */
         struct file *fp1, *fp2;
         struct socket *so1, *so2;
@@ -830 +831 @@
         oflag = 0;
         fflag = 0;
+#ifndef __rtems__
         if ((type & SOCK_CLOEXEC) != 0) {
                 type &= ~SOCK_CLOEXEC;
                 oflag |= O_CLOEXEC;
         }
+#endif /* __rtems__ */
         if ((type & SOCK_NONBLOCK) != 0) {
                 type &= ~SOCK_NONBLOCK;
@@ -899 +902 @@
 }
 
+#ifdef __rtems__
+static
+#endif /* __rtems__ */
 int
 sys_socketpair(struct thread *td, struct socketpair_args *uap)
 {
+#ifndef __rtems__
         int error, sv[2];
+#else /* __rtems__ */
+        int error;
+        int *sv = uap->rsv;
+#endif /* __rtems__ */
 
         error = kern_socketpair(td, uap->domain, uap->type,
@@ -908 +919 @@
         if (error)
                 return (error);
+#ifndef __rtems__
         error = copyout(sv, uap->rsv, 2 * sizeof(int));
         if (error) {
@@ -913 +925 @@
                 (void)kern_close(td, sv[1]);
         }
-        return (error);
+#endif /* __rtems__ */
+        return (error);
+}
+#ifdef __rtems__
+int
+socketpair(int domain, int type, int protocol, int *socket_vector)
+{
+        struct thread *td = rtems_bsd_get_curthread_or_null();
+        struct socketpair_args ua = {
+                .domain = domain,
+                .type = type,
+                .protocol = protocol,
+                .rsv = socket_vector
+        };
+        int error;
+
+        if (td != NULL) {
+                error = sys_socketpair(td, &ua);
+        } else {
+                error = ENOMEM;
+        }
+
+        return rtems_bsd_error_to_status_and_errno(error);
 }
 #endif /* __rtems__ */

freebsd/sys/sys/sysproto.h

@@ -482 +482 @@
         char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
 };
-#ifndef __rtems__
 struct socketpair_args {
         char domain_l_[PADL_(int)]; int domain; char domain_r_[PADR_(int)];
@@ -489 +488 @@
         char rsv_l_[PADL_(int *)]; int * rsv; char rsv_r_[PADR_(int *)];
 };
+#ifndef __rtems__
 struct mkdir_args {
         char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];

rtemsbsd/include/machine/rtems-bsd-syscall-api.h

@@ -99 +99 @@
 int     socket(int, int, int);
 
+int     socketpair(int, int, int, int *);
+
 int     sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
 

testsuite/syscalls01/test_main.c

@@ -1360 +1360 @@
         assert(rtems_resource_snapshot_check(&snapshot));
 }
+static void
+no_mem_socket_pair(int fd)
+{
+        int sd[2];
+        int rv;
+
+        errno = 0;
+        rv = socketpair(PF_UNIX, SOCK_DGRAM, 0, &sd[0]);
+        assert(rv == -1);
+        assert(errno == ENOMEM);
+}
+
+static void
+test_socket_pair(void)
+{
+        rtems_resource_snapshot snapshot;
+        int sd[2];
+        int rv;
+        char in[] = { 'x' };
+        char out[] = { 'o' };
+        ssize_t n;
+
+        puts("test socket pair");
+
+        rtems_resource_snapshot_take(&snapshot);
+
+        rv = socketpair(PF_UNIX, SOCK_DGRAM, 0, &sd[0]);
+        assert(rv == 0);
+
+        n = write(sd[0], &out[0], sizeof(out));
+        assert(n == (ssize_t)sizeof(out));
+
+        n = read(sd[1], &in[0], sizeof(in));
+        assert(n == (ssize_t)sizeof(in));
+
+        assert(memcmp(&in[0], &out[0], sizeof(in)) == 0);
+
+        rv = close(sd[0]);
+        assert(rv == 0);
+
+        rv = close(sd[1]);
+        assert(rv == 0);
+
+        do_no_mem_test(no_mem_socket_pair, -1);
+
+        assert(rtems_resource_snapshot_check(&snapshot));
+}
 
 static void
@@ -1755 +1802 @@
         test_socket_select();
         test_socket_poll();
+        test_socket_pair();
 
         test_kqueue_unsupported_ops();