From 5fd13843f7ada744d221ea473ba781809cd97a85 Mon Sep 17 00:00:00 2001 From: smatz Date: Sat, 19 Feb 2011 18:23:45 +0000 Subject: (svn r22112) -Codechange: register all pools in a pool vector --- src/core/pool_func.cpp | 30 ++++++++++++++++++++++++++++++ src/core/pool_type.hpp | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 src/core/pool_func.cpp (limited to 'src/core') diff --git a/src/core/pool_func.cpp b/src/core/pool_func.cpp new file mode 100644 index 000000000..4c55293eb --- /dev/null +++ b/src/core/pool_func.cpp @@ -0,0 +1,30 @@ +/* $Id$ */ + +/* + * This file is part of OpenTTD. + * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. + * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . + */ + +/** @file pool_func.cpp Implementation of PoolBase methods. */ + +#include "../stdafx.h" +#include "pool_type.hpp" + +PoolBase::~PoolBase() +{ + PoolVector *pools = PoolBase::GetPools(); + pools->Erase(pools->Find(this)); + if (pools->Length() == 0) delete pools; +} + +/* static */ void PoolBase::CleanAll() +{ + PoolVector *pools = PoolBase::GetPools(); + PoolBase **end = pools->End(); + for (PoolBase **ppool = pools->Begin(); ppool != end; ppool++) { + PoolBase *pool = *ppool; + pool->CleanPool(); + } +} diff --git a/src/core/pool_type.hpp b/src/core/pool_type.hpp index 395aa8438..e96608bdb 100644 --- a/src/core/pool_type.hpp +++ b/src/core/pool_type.hpp @@ -12,6 +12,47 @@ #ifndef POOL_TYPE_HPP #define POOL_TYPE_HPP +#include "smallvec_type.hpp" + +typedef SmallVector PoolVector; ///< Vector of pointers to PoolBase + +/** Base class for base of all pools. */ +struct PoolBase { + /** + * Function used to access the vector of all pools. + * @return pointer to vector of all pools + */ + static PoolVector *GetPools() + { + static PoolVector *pools = new PoolVector(); + return pools; + } + + /** + * Clean all pools - calls Pool::CleanPool() + */ + static void CleanAll(); + + /** + * Contructor registers this object in the pool vector. + */ + PoolBase() + { + *PoolBase::GetPools()->Append() = this; + } + + /** + * Destructor removes this object from the pool vector and + * deletes the vector itself if this was the last item removed. + */ + ~PoolBase(); + + /** + * Virtual method that deletes all items in the pool. + */ + virtual void CleanPool() = 0; +}; + /** * Base class for all pools. * @tparam Titem Type of the class/struct that is going to be pooled @@ -23,7 +64,7 @@ * @warning when Tcache is enabled *all* instances of this pool's item must be of the same size. */ template -struct Pool { +struct Pool : PoolBase { static const size_t MAX_SIZE = Tmax_size; ///< Make template parameter accessible from outside const char * const name; ///< Name of this pool @@ -40,7 +81,7 @@ struct Pool { Titem **data; ///< Pointer to array of pointers to Titem Pool(const char *name); - void CleanPool(); + virtual void CleanPool(); /** * Returs Titem with given index -- cgit v1.2.3-54-g00ecf