1.1 --- a/files/opener_resource.cc Mon Mar 29 00:56:08 2021 +0200
1.2 +++ b/files/opener_resource.cc Wed Mar 31 01:06:22 2021 +0200
1.3 @@ -4,8 +4,8 @@
1.4
1.5 /* Support for providing access to files. */
1.6
1.7 -OpenerResource::OpenerResource(Accessing *accessing, Paging *paging, Pages *pages)
1.8 -: _accessing(accessing), _paging(paging), _pages(pages)
1.9 +OpenerResource::OpenerResource(Paging *paging, Pages *pages)
1.10 +: _paging(paging), _pages(pages)
1.11 {
1.12 }
1.13
1.14 @@ -30,42 +30,24 @@
1.15 if (fileid == FILEID_INVALID)
1.16 return NULL;
1.17
1.18 - Accessor *accessor = get_accessor(fileid);
1.19 - PageMapper *mapper = get_mapper(accessor);
1.20 + PageMapper *mapper = get_mapper(fileid);
1.21 return new FilePager(fileid, mapper, flags);
1.22 }
1.23
1.24 -/* Obtain an accessor for the 'fileid' or register a new one in the accessing
1.25 - object. */
1.26 -
1.27 -Accessor *OpenerResource::get_accessor(fileid_t fileid)
1.28 -{
1.29 - Accessor *accessor;
1.30 -
1.31 - if (_accessing->reserve(fileid))
1.32 - accessor = _accessing->get(fileid);
1.33 - else
1.34 - {
1.35 - accessor = make_accessor(fileid);
1.36 - _accessing->set(fileid, accessor);
1.37 - }
1.38 -
1.39 - return accessor;
1.40 -}
1.41 -
1.42 -/* Obtain a page mapper for the 'accessor' or register a new one in the
1.43 +/* Obtain a page mapper for the 'fileid' or register a new one in the
1.44 paging object. */
1.45
1.46 -PageMapper *OpenerResource::get_mapper(Accessor *accessor)
1.47 +PageMapper *OpenerResource::get_mapper(fileid_t fileid)
1.48 {
1.49 PageMapper *mapper;
1.50
1.51 - if (_paging->reserve(accessor))
1.52 - mapper = _paging->get(accessor);
1.53 + if (_paging->reserve(fileid))
1.54 + mapper = _paging->get(fileid);
1.55 else
1.56 {
1.57 + Accessor *accessor = make_accessor(fileid);
1.58 mapper = new PageMapper(accessor, _pages);
1.59 - _paging->set(accessor, mapper);
1.60 + _paging->set(fileid, mapper);
1.61 }
1.62
1.63 return mapper;