1.1 --- a/tests/dstest_pipe_client.cc Sun Jul 11 17:51:55 2021 +0200
1.2 +++ b/tests/dstest_pipe_client.cc Sun Jul 11 23:11:39 2021 +0200
1.3 @@ -30,7 +30,6 @@
1.4 #include <unistd.h> /* sleep */
1.5
1.6 #include <fsclient/client.h>
1.7 -#include <fsclient/file.h>
1.8 #include <mem/memory_utils.h>
1.9
1.10
1.11 @@ -73,7 +72,7 @@
1.12
1.13 client_flush(writer);
1.14
1.15 - file_close(writer);
1.16 + client_close(writer);
1.17 }
1.18
1.19 /* Use the reader to obtain data from the pipe. */
1.20 @@ -150,20 +149,18 @@
1.21 }
1.22 }
1.23
1.24 + client_close(reader1);
1.25 + client_close(reader2);
1.26 +
1.27 printf("Data shown.\n");
1.28 }
1.29
1.30 int main(void)
1.31 {
1.32 - /* Obtain access to the filesystem. */
1.33 -
1.34 - l4_cap_idx_t server = l4re_env_get_cap("server");
1.35 + /* Invoke the open method to receive the pipe endpoint references. */
1.36
1.37 - /* Invoke the open method to receive the file reference. */
1.38 -
1.39 - file_t reader1, reader2, writer1, writer2;
1.40 - long err = pipe_open(page(PIPE_PAGES), &reader1, &writer1, server) ||
1.41 - pipe_open(page(PIPE_PAGES), &reader2, &writer2, server);
1.42 + file_t *reader1, *reader2, *writer1, *writer2;
1.43 + long err = client_pipe(&reader1, &writer1) || client_pipe(&reader2, &writer2);
1.44
1.45 if (err)
1.46 {
1.47 @@ -175,9 +172,9 @@
1.48
1.49 std::thread *activities[3];
1.50
1.51 - activities[0] = new std::thread(read_pipes, &reader1, &reader2);
1.52 - activities[1] = new std::thread(write_pipe, &writer1, 1);
1.53 - activities[2] = new std::thread(write_pipe, &writer2, 2);
1.54 + activities[0] = new std::thread(read_pipes, reader1, reader2);
1.55 + activities[1] = new std::thread(write_pipe, writer1, 1);
1.56 + activities[2] = new std::thread(write_pipe, writer2, 2);
1.57
1.58 for (int i = 0; i < 3; i++)
1.59 activities[i]->join();