1.1 --- a/dstest_server.cc Sun Jan 24 19:29:07 2021 +0100
1.2 +++ b/dstest_server.cc Mon Feb 01 00:10:21 2021 +0100
1.3 @@ -26,14 +26,12 @@
1.4 #include <string.h>
1.5 #include <stdlib.h>
1.6
1.7 -#include <ipc/server.h>
1.8 -
1.9 #include "accessing.h"
1.10 -#include "mapped_file_object_server.h"
1.11 +#include "memory.h"
1.12 #include "memory_utils.h"
1.13 -#include "file_pager.h"
1.14 #include "pages.h"
1.15 #include "paging.h"
1.16 +#include "resource_server.h"
1.17 #include "test_file_opener.h"
1.18
1.19
1.20 @@ -50,15 +48,11 @@
1.21 Paging paging;
1.22 Pages pages(&mem);
1.23 TestFileOpener opener(&accessing, &paging, &pages, page(FILE_PAGES));
1.24 - FilePager *obj = opener.open("123");
1.25 -
1.26 - /* Server capability. */
1.27 -
1.28 - l4_cap_idx_t server;
1.29
1.30 /* Register a server associating it with the given object. */
1.31
1.32 - long err = ipc_server_bind("server", (l4_umword_t) obj, &server);
1.33 + ResourceServer server(&opener);
1.34 + long err = server.bind("server");
1.35
1.36 if (err)
1.37 {
1.38 @@ -66,9 +60,7 @@
1.39 return 1;
1.40 }
1.41
1.42 - /* Wait for messages, dispatching to the handler. */
1.43 -
1.44 - ipc_server_loop_for(MappedFileObject, obj);
1.45 -
1.46 + printf("Starting server...\n");
1.47 + server.start();
1.48 return 0;
1.49 }