cpp/openttd-patchpack/source Changeset - r17356:7ed6661a1400

Changeset - r17356:7ed6661a1400

Parent rev.

Child rev.

[Not reviewed]

master

0 6 1

smatz - 14 years ago 2011-02-19 18:23:45
smatz@openttd.org

(svn r22112) -Codechange: register all pools in a pool vector

7 files changed with 86 insertions and 2 deletions:

projects/openttd_vs100.vcxproj

projects/openttd_vs100.vcxproj.filters

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/core/pool_func.cpp

src/core/pool_type.hpp

0 comments (0 inline, 0 general)

projects/openttd_vs100.vcxproj

➞

Show inline comments

@@ @@ -619,6 +619,7 @@ @@
     <ClInclude Include="..\src\core\math_func.hpp" />
     <ClInclude Include="..\src\core\mem_func.hpp" />
     <ClInclude Include="..\src\core\overflowsafe_type.hpp" />
     <ClCompile Include="..\src\core\pool_func.cpp" />
     <ClInclude Include="..\src\core\pool_func.hpp" />
     <ClInclude Include="..\src\core\pool_type.hpp" />
     <ClCompile Include="..\src\core\random_func.cpp" />

projects/openttd_vs100.vcxproj.filters

➞

Show inline comments

@@ @@ -1077,6 +1077,9 @@ @@
     <ClInclude Include="..\src\core\overflowsafe_type.hpp">
       <Filter>Core Source Code</Filter>
     </ClInclude>
     <ClCompile Include="..\src\core\pool_func.cpp">
       <Filter>Core Source Code</Filter>
     </ClCompile>
     <ClInclude Include="..\src\core\pool_func.hpp">
       <Filter>Core Source Code</Filter>
     </ClInclude>

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -1755,6 +1755,10 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\pool_func.cpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\pool_func.hpp"
+				>
 			</File>

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -1752,6 +1752,10 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\pool_func.cpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\pool_func.hpp"
+				>
 			</File>

source.list

➞

Show inline comments

@@ @@ -369,6 +369,7 @@ core/math_func.cpp @@
 core/math_func.hpp
 core/mem_func.hpp
 core/overflowsafe_type.hpp
 core/pool_func.cpp
 core/pool_func.hpp
 core/pool_type.hpp
 core/random_func.cpp

src/core/pool_func.cpp

➞

Show inline comments

@@ new file 100644 @@
 /* $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 <http://www.gnu.org/licenses/>.
  */
 /** @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();
+	}
+}

src/core/pool_type.hpp

➞

Show inline comments

@@ @@ -12,6 +12,47 @@ @@
 #ifndef POOL_TYPE_HPP
 #define POOL_TYPE_HPP
 #include "smallvec_type.hpp"
 typedef SmallVector<struct PoolBase *, 4> 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 <class Titem, typename Tindex, size_t Tgrowth_step, size_t Tmax_size, bool Tcache = false, bool Tzero = true>
 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

0 comments (0 inline, 0 general)