From afc2942e37e6815a77858eaccaebd9b4868c9b47 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 21 Feb 2024 13:55:12 -0800 Subject: [PATCH] delete unused class. Merge pages in mempool --- moses2/MemPool.cpp | 10 +++++++ moses2/MemPool.h | 72 ---------------------------------------------- 2 files changed, 10 insertions(+), 72 deletions(-) diff --git a/moses2/MemPool.cpp b/moses2/MemPool.cpp index 51e1d015e..619624954 100755 --- a/moses2/MemPool.cpp +++ b/moses2/MemPool.cpp @@ -97,6 +97,16 @@ uint8_t *MemPool::More(std::size_t size) void MemPool::Reset() { + if (m_pages.size() > 1) { + size_t total = 0; + for (size_t i = 0; i < m_pages.size(); ++i) { + total += m_pages[i]->size; + } + RemoveAllInColl(m_pages); + Page* page = new Page(total); + m_pages.push_back(page); + } + m_currPage = 0; current_ = m_pages[0]->mem; } diff --git a/moses2/MemPool.h b/moses2/MemPool.h index 6c2f891b4..75923f55c 100755 --- a/moses2/MemPool.h +++ b/moses2/MemPool.h @@ -70,78 +70,6 @@ private: MemPool &operator=(const MemPool &); }; -//////////////////////////////////////////////////////////////////////////////////////////////// -template -class ObjectPoolContiguous -{ - -public: - ObjectPoolContiguous(std::size_t initSize = 100000) : - m_size(0), m_actualSize(initSize) { - m_vec = (T*) malloc(sizeof(T) * initSize); - } - - ~ObjectPoolContiguous() { - free(m_vec); - } - - void Add(T &obj) { - if (m_size >= m_actualSize) { - //std::cerr << std::endl << "MORE " << m_size << std::endl; - m_actualSize *= 2; - m_vec = (T*) realloc(m_vec, sizeof(T) * m_actualSize); - - } - m_vec[m_size] = obj; - ++m_size; - } - - bool IsEmpty() const { - return m_size == 0; - } - - void Reset() { - m_size = 0; - } - - // vector op - size_t GetSize() const { - return m_size; - } - - const T& operator[](size_t ind) const { - return m_vec[ind]; - } - - // stack op - const T &Get() const { - return m_vec[m_size - 1]; - } - - void Pop() { - --m_size; - } - - T *GetData() { - return m_vec; - } - - template - void Sort(const ORDERER &orderer) { - std::sort(m_vec, m_vec + m_size, orderer); - } - -private: - T *m_vec; - size_t m_size, m_actualSize; - - // no copying - ObjectPoolContiguous(const ObjectPoolContiguous &); - ObjectPoolContiguous &operator=(const ObjectPoolContiguous &); -}; - -////////////////////////////////////////////////////////////////////////////////////////// - }