1.1 --- a/libfsserver/include/fsserver/pager.h Fri May 27 00:38:27 2022 +0200
1.2 +++ b/libfsserver/include/fsserver/pager.h Sat May 28 00:59:04 2022 +0200
1.3 @@ -23,9 +23,8 @@
1.4
1.5 #include <systypes/base.h>
1.6
1.7 -#include <fsserver/page_mapper.h>
1.8 +#include <fsserver/generic_page_mapper.h>
1.9 #include <fsserver/resource.h>
1.10 -#include <mem/memory_incremental.h>
1.11
1.12
1.13
1.14 @@ -35,33 +34,11 @@
1.15 {
1.16 protected:
1.17 offset_t _start, _size;
1.18 - PageMapper *_mapper;
1.19 + GenericPageMapper *_mapper, *_mapper_base, *_mapper_masked, *_mapper_copied;
1.20 map_flags_t _flags;
1.21
1.22 - /* Support for masked regions and replicated flexpages. */
1.23 -
1.24 - MemoryIncremental _memory;
1.25 -
1.26 - /* Masked region support. */
1.27 -
1.28 - bool _is_masked;
1.29 - offset_t _start_visible, _end_visible;
1.30 - Flexpage _start_flexpage, _end_flexpage, _zero_flexpage;
1.31 -
1.32 - Flexpage *get_masked_flexpage(Flexpage *flexpage);
1.33 -
1.34 - void allocate_region(Flexpage *flexpage, Flexpage &masked);
1.35 -
1.36 - void populate_region(Flexpage *flexpage, Flexpage &masked,
1.37 - bool has_start, bool has_end);
1.38 -
1.39 - /* Replicated flexpage support. */
1.40 -
1.41 - AccessMap _map;
1.42 - Flexpage *get_replicated_flexpage(Flexpage *flexpage, map_flags_t flags);
1.43 -
1.44 public:
1.45 - explicit Pager(PageMapper *mapper, map_flags_t flags);
1.46 + explicit Pager(GenericPageMapper *mapper, map_flags_t flags);
1.47
1.48 virtual void close();
1.49