# HG changeset patch # User Paul Boddie # Date 1617749353 -7200 # Node ID 4c34c6d5a2cc41cb99fcee94c2ba59bf28d67d5a # Parent eda3afa224509a7774da7f6f600bf5286b585092 Removed automatic instantiation of memory objects in various classes. diff -r eda3afa22450 -r 4c34c6d5a2cc pages/pages.cc --- a/pages/pages.cc Tue Apr 06 23:20:03 2021 +0200 +++ b/pages/pages.cc Wed Apr 07 00:49:13 2021 +0200 @@ -8,12 +8,6 @@ { } -Pages::Pages(PageQueue *queue) -: _queue(queue) -{ - _memory = new MemoryIncremental(); -} - Pages::~Pages() { _queue->close(_memory); diff -r eda3afa22450 -r 4c34c6d5a2cc pages/pages.h --- a/pages/pages.h Tue Apr 06 23:20:03 2021 +0200 +++ b/pages/pages.h Wed Apr 07 00:49:13 2021 +0200 @@ -18,8 +18,6 @@ public: explicit Pages(Memory *memory, PageQueue *queue); - explicit Pages(PageQueue *queue); - virtual ~Pages(); virtual Flexpage *remove(); diff -r eda3afa22450 -r 4c34c6d5a2cc pipes/pipe_opener_resource.cc --- a/pipes/pipe_opener_resource.cc Tue Apr 06 23:20:03 2021 +0200 +++ b/pipes/pipe_opener_resource.cc Wed Apr 07 00:49:13 2021 +0200 @@ -13,11 +13,6 @@ { } -PipeOpenerResource::PipeOpenerResource() -{ - _memory = new MemoryIncremental(); -} - int PipeOpenerResource::expected_items() { return PipeOpener_expected_items; diff -r eda3afa22450 -r 4c34c6d5a2cc pipes/pipe_opener_resource.h --- a/pipes/pipe_opener_resource.h Tue Apr 06 23:20:03 2021 +0200 +++ b/pipes/pipe_opener_resource.h Wed Apr 07 00:49:13 2021 +0200 @@ -17,8 +17,6 @@ public: explicit PipeOpenerResource(Memory *memory); - explicit PipeOpenerResource(); - /* Server details. */ int expected_items(); diff -r eda3afa22450 -r 4c34c6d5a2cc pipes/pipe_paging.cc --- a/pipes/pipe_paging.cc Tue Apr 06 23:20:03 2021 +0200 +++ b/pipes/pipe_paging.cc Wed Apr 07 00:49:13 2021 +0200 @@ -18,20 +18,6 @@ _regions[i] = NULL; } -PipePaging::PipePaging(offset_t size) -: _size(size) -{ - /* Reserve space for two pipe regions. */ - - _memory_base = new MemoryIncremental(); - _memory = new MemoryPreallocated(_memory_base, size * 2); - _queue = new PageQueuePartitioned(); - _pages = new Pages(_memory, _queue); - - for (unsigned int i = 0; i < 2; i++) - _regions[i] = NULL; -} - /* Detach one endpoint. */ void PipePaging::detach() @@ -65,11 +51,6 @@ delete _pages; delete _queue; delete _memory; - - /* Delete any underlying memory object. */ - - if (_memory_base != NULL) - delete _memory_base; } /* Add a region to the sequence. */ diff -r eda3afa22450 -r 4c34c6d5a2cc pipes/pipe_paging.h --- a/pipes/pipe_paging.h Tue Apr 06 23:20:03 2021 +0200 +++ b/pipes/pipe_paging.h Wed Apr 07 00:49:13 2021 +0200 @@ -10,7 +10,7 @@ class PipePaging { protected: - Memory *_memory, *_memory_base; + Memory *_memory; Pages *_pages; PageQueue *_queue; @@ -34,8 +34,6 @@ public: explicit PipePaging(Memory *memory, offset_t size); - explicit PipePaging(offset_t size); - virtual void detach(); virtual offset_t region_size()