1.1 --- a/conf/dstest_pipe.cfg Sun Jul 11 17:51:55 2021 +0200
1.2 +++ b/conf/dstest_pipe.cfg Sun Jul 11 23:11:39 2021 +0200
1.3 @@ -16,7 +16,7 @@
1.4
1.5 l:start({
1.6 caps = {
1.7 - server = server,
1.8 + pipes = server,
1.9 },
1.10 log = { "client", "g" },
1.11 },
2.1 --- a/tests/dstest_pipe_client.cc Sun Jul 11 17:51:55 2021 +0200
2.2 +++ b/tests/dstest_pipe_client.cc Sun Jul 11 23:11:39 2021 +0200
2.3 @@ -30,7 +30,6 @@
2.4 #include <unistd.h> /* sleep */
2.5
2.6 #include <fsclient/client.h>
2.7 -#include <fsclient/file.h>
2.8 #include <mem/memory_utils.h>
2.9
2.10
2.11 @@ -73,7 +72,7 @@
2.12
2.13 client_flush(writer);
2.14
2.15 - file_close(writer);
2.16 + client_close(writer);
2.17 }
2.18
2.19 /* Use the reader to obtain data from the pipe. */
2.20 @@ -150,20 +149,18 @@
2.21 }
2.22 }
2.23
2.24 + client_close(reader1);
2.25 + client_close(reader2);
2.26 +
2.27 printf("Data shown.\n");
2.28 }
2.29
2.30 int main(void)
2.31 {
2.32 - /* Obtain access to the filesystem. */
2.33 -
2.34 - l4_cap_idx_t server = l4re_env_get_cap("server");
2.35 + /* Invoke the open method to receive the pipe endpoint references. */
2.36
2.37 - /* Invoke the open method to receive the file reference. */
2.38 -
2.39 - file_t reader1, reader2, writer1, writer2;
2.40 - long err = pipe_open(page(PIPE_PAGES), &reader1, &writer1, server) ||
2.41 - pipe_open(page(PIPE_PAGES), &reader2, &writer2, server);
2.42 + file_t *reader1, *reader2, *writer1, *writer2;
2.43 + long err = client_pipe(&reader1, &writer1) || client_pipe(&reader2, &writer2);
2.44
2.45 if (err)
2.46 {
2.47 @@ -175,9 +172,9 @@
2.48
2.49 std::thread *activities[3];
2.50
2.51 - activities[0] = new std::thread(read_pipes, &reader1, &reader2);
2.52 - activities[1] = new std::thread(write_pipe, &writer1, 1);
2.53 - activities[2] = new std::thread(write_pipe, &writer2, 2);
2.54 + activities[0] = new std::thread(read_pipes, reader1, reader2);
2.55 + activities[1] = new std::thread(write_pipe, writer1, 1);
2.56 + activities[2] = new std::thread(write_pipe, writer2, 2);
2.57
2.58 for (int i = 0; i < 3; i++)
2.59 activities[i]->join();