xnu-7195.81.3.tar.gz

[apple/xnu.git] / tests / kevent_pty.c

diff --git a/tests/kevent_pty.c b/tests/kevent_pty.c
index 2fad75e6c96efce4600ef22b9aeca932e309a94b..d84d65fa56303258ed74d92f50404959ff4a268c 100644 (file)
--- a/tests/kevent_pty.c
+++ b/tests/kevent_pty.c
@@ -16,8 +16,9 @@
 #include <util.h>
 
 T_GLOBAL_META(
 #include <util.h>
 
 T_GLOBAL_META(

-               T_META_NAMESPACE("xnu.kevent"),
-               T_META_CHECK_LEAKS(false));
+       T_META_NAMESPACE("xnu.kevent"),
+       T_META_CHECK_LEAKS(false),
+       T_META_RUN_CONCURRENTLY(true));

 
 #define TIMEOUT_SECS 10
 
 
 #define TIMEOUT_SECS 10
 


@@ -31,7 +32,7 @@ child_tty_client(void)
        ssize_t bytes_wr;
 
        src = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ,
        ssize_t bytes_wr;
 
        src = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ,

-                       (uintptr_t)STDIN_FILENO, 0, NULL);
+           (uintptr_t)STDIN_FILENO, 0, NULL);

        if (!src) {
                exit(1);
        }
        if (!src) {
                exit(1);
        }


@@ -73,8 +74,8 @@ pty_master(void)
 }
 
 T_DECL(pty_master_teardown,
 }
 
 T_DECL(pty_master_teardown,

-               "try removing a TTY master out from under a PTY slave holding a kevent",
-               T_META_ASROOT(true))
+    "try removing a TTY master out from under a PTY slave holding a kevent",
+    T_META_ASROOT(true))

 {
        __block pid_t master_pid;
        char buf[16] = "";
 {
        __block pid_t master_pid;
        char buf[16] = "";


@@ -95,8 +96,8 @@ T_DECL(pty_master_teardown,
                __builtin_unreachable();
        }
        T_ASSERT_POSIX_SUCCESS(master_pid,
                __builtin_unreachable();
        }
        T_ASSERT_POSIX_SUCCESS(master_pid,

-                       "forked child master PTY with pid %d, at pty %s", master_pid,
-                       pty_filename);
+           "forked child master PTY with pid %d, at pty %s", master_pid,
+           pty_filename);

 
        close(child_ready[1]);
 
 
        close(child_ready[1]);
 


@@ -147,7 +148,8 @@ reader_thread(void *arg)
                        if (errno == EINTR) {
                                continue;
                        } else if (errno == EBADF) {
                        if (errno == EINTR) {
                                continue;
                        } else if (errno == EBADF) {

-                               T_LOG("reader got an error (%s), shutting down", strerror(errno));
+                               T_LOG("reader got an error (%s), shutting down",
+                                   strerror(errno));

                                return NULL;
                        } else {
                                T_ASSERT_POSIX_SUCCESS(rdsize, "read on PTY");
                                return NULL;
                        } else {
                                T_ASSERT_POSIX_SUCCESS(rdsize, "read on PTY");


@@ -178,7 +180,8 @@ writer_thread(void *arg)
                        if (errno == EINTR) {
                                continue;
                        } else {
                        if (errno == EINTR) {
                                continue;
                        } else {

-                               T_LOG("writer got an error (%s), shutting down", strerror(errno));
+                               T_LOG("writer got an error (%s), shutting down",
+                                   strerror(errno));

                                return NULL;
                        }
                }
                                return NULL;
                        }
                }


@@ -192,16 +195,6 @@ writer_thread(void *arg)
 static int attach_master, attach_slave;
 static pthread_t reader, writer;
 
 static int attach_master, attach_slave;
 static pthread_t reader, writer;
 

-static void
-join_threads(void)
-{
-       close(attach_slave);
-       close(attach_master);
-       writing = false;
-       pthread_join(reader, NULL);
-       pthread_join(writer, NULL);
-}
-

 static void
 redispatch(dispatch_group_t grp, dispatch_source_type_t type, int fd)
 {
 static void
 redispatch(dispatch_group_t grp, dispatch_source_type_t type, int fd)
 {


@@ -209,16 +202,16 @@ redispatch(dispatch_group_t grp, dispatch_source_type_t type, int fd)
 
        __block void (^redispatch_blk)(void) = Block_copy(^{
                if (iters++ > ATTACH_ITERATIONS) {
 
        __block void (^redispatch_blk)(void) = Block_copy(^{
                if (iters++ > ATTACH_ITERATIONS) {

-                       return;
+                       return;

                } else if (iters == ATTACH_ITERATIONS) {
                } else if (iters == ATTACH_ITERATIONS) {

-                       dispatch_group_leave(grp);
-                       T_PASS("created %d %s sources on busy PTY", iters,
-                                       type == DISPATCH_SOURCE_TYPE_READ ? "read" : "write");
+                       dispatch_group_leave(grp);
+                       T_PASS("created %d %s sources on busy PTY", iters,
+                       type == DISPATCH_SOURCE_TYPE_READ ? "read" : "write");

                }
 
                dispatch_source_t src = dispatch_source_create(
                }
 
                dispatch_source_t src = dispatch_source_create(

-                               type, (uintptr_t)fd, 0,
-                               dispatch_get_main_queue());
+                       type, (uintptr_t)fd, 0,
+                       dispatch_get_main_queue());

 
                dispatch_source_set_event_handler(src, ^{
                        dispatch_cancel(src);
 
                dispatch_source_set_event_handler(src, ^{
                        dispatch_cancel(src);


@@ -234,19 +227,18 @@ redispatch(dispatch_group_t grp, dispatch_source_type_t type, int fd)
 }
 
 T_DECL(attach_while_tty_wakeups,
 }
 
 T_DECL(attach_while_tty_wakeups,

-               "try to attach knotes while a TTY is getting wakeups")
+    "try to attach knotes while a TTY is getting wakeups")

 {
        dispatch_group_t grp = dispatch_group_create();
 
        T_SETUPBEGIN;
        T_ASSERT_POSIX_SUCCESS(openpty(&attach_master, &attach_slave, NULL, NULL,
 {
        dispatch_group_t grp = dispatch_group_create();
 
        T_SETUPBEGIN;
        T_ASSERT_POSIX_SUCCESS(openpty(&attach_master, &attach_slave, NULL, NULL,

-                       NULL), NULL);
+           NULL), NULL);

 
        T_ASSERT_POSIX_ZERO(pthread_create(&reader, NULL, reader_thread,
 
        T_ASSERT_POSIX_ZERO(pthread_create(&reader, NULL, reader_thread,

-                               (void *)(uintptr_t)attach_master), NULL);
+           (void *)(uintptr_t)attach_master), NULL);

        T_ASSERT_POSIX_ZERO(pthread_create(&writer, NULL, writer_thread,
        T_ASSERT_POSIX_ZERO(pthread_create(&writer, NULL, writer_thread,

-                               (void *)(uintptr_t)attach_slave), NULL);
-       T_ATEND(join_threads);
+           (void *)(uintptr_t)attach_slave), NULL);

        T_SETUPEND;
 
        redispatch(grp, DISPATCH_SOURCE_TYPE_READ, attach_master);
        T_SETUPEND;
 
        redispatch(grp, DISPATCH_SOURCE_TYPE_READ, attach_master);


@@ -261,7 +253,7 @@ T_DECL(attach_while_tty_wakeups,
 }
 
 T_DECL(master_read_data_set,
 }
 
 T_DECL(master_read_data_set,

-               "check that the data is set on read sources of master fds")
+    "check that the data is set on read sources of master fds")

 {
        int master = -1, slave = -1;
 
 {
        int master = -1, slave = -1;
 


@@ -271,12 +263,12 @@ T_DECL(master_read_data_set,
        T_QUIET; T_ASSERT_GE(slave, 0, "slave fd is valid");
 
        dispatch_source_t src = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ,
        T_QUIET; T_ASSERT_GE(slave, 0, "slave fd is valid");
 
        dispatch_source_t src = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ,

-                       (uintptr_t)master, 0, dispatch_get_main_queue());
+           (uintptr_t)master, 0, dispatch_get_main_queue());

 
        dispatch_source_set_event_handler(src, ^{
                unsigned long len = dispatch_source_get_data(src);
                T_EXPECT_GT(len, (unsigned long)0,
 
        dispatch_source_set_event_handler(src, ^{
                unsigned long len = dispatch_source_get_data(src);
                T_EXPECT_GT(len, (unsigned long)0,

-                               "the amount of data to read was set for the master source");
+               "the amount of data to read was set for the master source");

                dispatch_cancel(src);
        });
 
                dispatch_cancel(src);
        });
 


@@ -292,7 +284,9 @@ T_DECL(master_read_data_set,
        char buf[512] = "";
 
        int ret = 0;
        char buf[512] = "";
 
        int ret = 0;

-       while ((ret = write(slave, buf, sizeof(buf)) == -1 && errno == EAGAIN));
+       while ((ret = write(slave, buf, sizeof(buf)) == -1 && errno == EAGAIN)) {
+               ;
+       }

        T_ASSERT_POSIX_SUCCESS(ret, "slave wrote data");
 
        dispatch_main();
        T_ASSERT_POSIX_SUCCESS(ret, "slave wrote data");
 
        dispatch_main();