1.1 --- a/dstest_server.cc Fri Jan 22 23:59:13 2021 +0100
1.2 +++ b/dstest_server.cc Sat Jan 23 00:01:22 2021 +0100
1.3 @@ -29,21 +29,10 @@
1.4 #include <ipc/server.h>
1.5
1.6 #include "dataspace_server.h"
1.7 -#include "simple_pager.h"
1.8 -
1.9 -
1.10 -
1.11 -/* Component interface. */
1.12 -
1.13 -class DataspaceServer : public SimplePager
1.14 -{
1.15 -public:
1.16 - explicit DataspaceServer(Memory *memory)
1.17 - : SimplePager(memory)
1.18 - {
1.19 - memset((void *) _region->start, (int) 'a', PAGE_SIZE);
1.20 - }
1.21 -};
1.22 +#include "page_mapper.h"
1.23 +#include "pager.h"
1.24 +#include "pages.h"
1.25 +#include "test_file_accessor.h"
1.26
1.27
1.28
1.29 @@ -51,11 +40,13 @@
1.30 {
1.31 /* Some memory. */
1.32
1.33 - Memory memory(10);
1.34 + Memory mem(10);
1.35 + Pages pages(&mem);
1.36 + TestFileAccessor a(123UL);
1.37 + PageMapper m(&a, &pages);
1.38 + Pager pager(&m);
1.39
1.40 - /* Dataspace encapsulation. */
1.41 -
1.42 - DataspaceServer obj(&memory);
1.43 + pager.mmap(0, page(10));
1.44
1.45 /* Server capability. */
1.46
1.47 @@ -63,7 +54,7 @@
1.48
1.49 /* Register a server associating it with the given object. */
1.50
1.51 - long err = ipc_server_bind("server", (l4_umword_t) &obj, &server);
1.52 + long err = ipc_server_bind("server", (l4_umword_t) &pager, &server);
1.53
1.54 if (err)
1.55 {
1.56 @@ -73,7 +64,7 @@
1.57
1.58 /* Wait for messages, dispatching to the handler. */
1.59
1.60 - ipc_server_loop(Dataspace_expected_items, &obj,
1.61 + ipc_server_loop(Dataspace_expected_items, &pager,
1.62 (ipc_server_handler_type) handle_Dataspace);
1.63
1.64 return 0;