• R/O
  • SSH
  • HTTPS

eirrepo: Commit


Commit MetaInfo

Revision125 (tree)
Time2018-09-10 21:41:13
Authorquiret

Log Message

- code refactoring
- changed license to MIT license (makes sense because this code in here is not really self-explanatory, topkek); so do what you want with it as long as you give me credit
- added native heap walking functionality (go through all allocations while not modifying the heap)
- changed DynamicTypeSystem allocator model to the new model (we get rid of the passing of memSize for Free because the heap ought to store that itself)
- straightened out the file headers (now with a link to the Eir SDK main page)
- added some more unit tests, especially for the DynamicTypeSystem

Change Summary

Incremental Difference

--- common/sdk/OSUtils.vecvmem.h (revision 124)
+++ common/sdk/OSUtils.vecvmem.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/OSUtils.vecvmem.h
5+* FILE: eirrepo/sdk/OSUtils.vecvmem.h
66 * PURPOSE: Virtual-memory-based vector list of structs
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/OSUtils.vmem.h (revision 124)
+++ common/sdk/OSUtils.vmem.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/OSUtils.vmem.h
5+* FILE: eirrepo/sdk/OSUtils.vmem.h
66 * PURPOSE: OS implementation of virtual memory mapping
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
@@ -17,7 +18,7 @@
1718
1819 #if defined(__linux__)
1920 #include <sys/mman.h>
20-#include <linux/mman.h>
21+#include <linux/mman.h>
2122 #include <unistd.h>
2223 #elif defined(_WIN32)
2324 #define WIN32_LEAN_AND_MEAN
@@ -111,30 +112,30 @@
111112
112113 #ifdef _WIN32
113114 actualMemPtr = VirtualAlloc( memPtr, (SIZE_T)memSize, MEM_RESERVE, PAGE_READWRITE );
114-#elif defined(__linux__)
115- int mmap_flags = MAP_UNINITIALIZED|MAP_PRIVATE|MAP_ANONYMOUS;
116-
117- bool do_fixed = false;
118-
119- if ( memPtr != nullptr )
120- {
121- // We must not use MAP_FIXED because it is broken shit.
122- // Instead we must do verifications.
123- do_fixed = true;
124- }
115+#elif defined(__linux__)
116+ int mmap_flags = MAP_UNINITIALIZED|MAP_PRIVATE|MAP_ANONYMOUS;
125117
126- actualMemPtr = mmap( memPtr, memSize, PROT_NONE, mmap_flags, -1, 0 );
127-
128- if ( actualMemPtr == MAP_FAILED )
129- {
130- return nullptr;
131- }
132-
133- if ( do_fixed && actualMemPtr != memPtr )
134- {
135- munmap( actualMemPtr, memSize );
136- return nullptr;
118+ bool do_fixed = false;
119+
120+ if ( memPtr != nullptr )
121+ {
122+ // We must not use MAP_FIXED because it is broken shit.
123+ // Instead we must do verifications.
124+ do_fixed = true;
137125 }
126+
127+ actualMemPtr = mmap( memPtr, memSize, PROT_NONE, mmap_flags, -1, 0 );
128+
129+ if ( actualMemPtr == MAP_FAILED )
130+ {
131+ return nullptr;
132+ }
133+
134+ if ( do_fixed && actualMemPtr != memPtr )
135+ {
136+ munmap( actualMemPtr, memSize );
137+ return nullptr;
138+ }
138139 #endif //_WIN32
139140
140141 return actualMemPtr;
--- common/sdk/String.h (revision 124)
+++ common/sdk/String.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/String.h
5+* FILE: eirrepo/sdk/String.h
66 * PURPOSE: Optimized String implementation
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/DataUtil.h (revision 124)
+++ common/sdk/DataUtil.h (revision 125)
@@ -1,3 +1,15 @@
1+/*****************************************************************************
2+*
3+* PROJECT: Eir SDK
4+* LICENSE: See LICENSE in the top level directory
5+* FILE: eirrepo/sdk/DataUtil.h
6+* PURPOSE: Simple helpers for memory operations
7+*
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
9+* Multi Theft Auto is available from http://www.multitheftauto.com/
10+*
11+*****************************************************************************/
12+
113 #ifndef _EIRREPO_DATA_UTILITIES_
214 #define _EIRREPO_DATA_UTILITIES_
315
--- common/sdk/MetaHelpers.h (revision 124)
+++ common/sdk/MetaHelpers.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
55 * FILE: eirrepo/sdk/MetaHelpers.h
66 * PURPOSE: Memory management templates
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/OSUtils.arrvmem.h (revision 124)
+++ common/sdk/OSUtils.arrvmem.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/OSUtils.arrvmem.h
5+* FILE: eirrepo/sdk/OSUtils.arrvmem.h
66 * PURPOSE: Virtual-memory-based array of structs
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/OSUtils.vmemconf.h (revision 124)
+++ common/sdk/OSUtils.vmemconf.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/OSUtils.vmemconf.h
5+* FILE: eirrepo/sdk/OSUtils.vmemconf.h
66 * PURPOSE: Virtual-memory-based vector list of structs
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/Map.h (revision 124)
+++ common/sdk/Map.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/Map.h
5+* FILE: eirrepo/sdk/Map.h
66 * PURPOSE: Optimized Map implementation
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/OSUtils.memheap.h (revision 124)
+++ common/sdk/OSUtils.memheap.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/OSUtils.memheap.h
5+* FILE: eirrepo/sdk/OSUtils.memheap.h
66 * PURPOSE: Virtual-memory-based memory heap
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
@@ -257,7 +258,6 @@
257258 return ( memHandle->dataOff + memHandle->dataSize );
258259 }
259260
260- // Returns statistics about this memory allocator.
261261 struct heapStats
262262 {
263263 size_t usedBytes = 0;
@@ -267,6 +267,7 @@
267267 size_t countOfIslands = 0;
268268 };
269269
270+ // Returns statistics about this memory allocator.
270271 inline heapStats GetStatistics( void ) const
271272 {
272273 heapStats stats;
@@ -288,6 +289,25 @@
288289 return stats;
289290 }
290291
292+ // Walks all allocations of this heap allocator.
293+ template <typename callbackType>
294+ AINLINE void WalkAllocations( const callbackType& cb )
295+ {
296+ LIST_FOREACH_BEGIN( VMemIsland, this->listIslands.root, managerNode )
297+
298+ // Even if we walk allocations in memory-order for single islands, we have not ordered the islands (no point),
299+ // so there is no order-guarantee for this function.
300+ item->WalkAllocations(
301+ [&]( VMemAllocation *allocObj )
302+ {
303+ void *memPtr = (char*)allocObj + allocObj->dataOff;
304+
305+ cb( memPtr );
306+ });
307+
308+ LIST_FOREACH_END
309+ }
310+
291311 // Simple realloc helper just because it is being exposed in the CRT aswell.
292312 inline void* Realloc( void *memPtr, size_t newSize, size_t alignment = sizeof(void*) )
293313 {
@@ -919,9 +939,6 @@
919939 {
920940 usageStats stats;
921941
922- bool hasStartOfUsedBytesPos = false;
923- size_t startOfUsedBytesPos;
924-
925942 LIST_FOREACH_BEGIN( VMemFreeBlock, this->sortedByAddrFreeBlocks.root, sortedByAddrNode )
926943
927944 // If we have an allocation associated with this free block, add up the data bytes.
@@ -929,29 +946,17 @@
929946 {
930947 VMemAllocation *allocObj = LIST_GETITEM( VMemAllocation, item, freeSpaceAfterThis );
931948
932- stats.usedBytes += allocObj->dataSize;
933- }
949+ size_t dataSize = allocObj->dataSize;
934950
935- memBlockSlice_t freeRegion = item->freeRegion;
951+ stats.usedBytes += dataSize;
952+ stats.usedMetaBytes += ( dataSize + allocObj->dataOff );
936953
937- if ( hasStartOfUsedBytesPos )
938- {
939- size_t endUsedBytesOffset = freeRegion.GetSliceStartPoint();
940-
941- stats.usedMetaBytes += ( endUsedBytesOffset - startOfUsedBytesPos );
942-
943- // One more allocation.
954+ // We have one more allocation.
944955 stats.countOfAllocations++;
945956 }
946- else
947- {
948- startOfUsedBytesPos = ( freeRegion.GetSliceEndPoint() + 1 );
949957
950- hasStartOfUsedBytesPos = true;
951- }
952-
953958 // Count the free bytes aswell.
954- stats.freeBytes += freeRegion.GetSliceSize();
959+ stats.freeBytes += item->freeRegion.GetSliceSize();
955960
956961 LIST_FOREACH_END
957962
@@ -958,6 +963,22 @@
958963 return stats;
959964 }
960965
966+ // Walks all memory allocations of this island in memory-address order.
967+ template <typename callbackType>
968+ AINLINE void WalkAllocations( const callbackType& cb )
969+ {
970+ LIST_FOREACH_BEGIN( VMemFreeBlock, this->sortedByAddrFreeBlocks.root, sortedByAddrNode )
971+
972+ if ( item != &this->firstFreeSpaceBlock )
973+ {
974+ VMemAllocation *allocObj = LIST_GETITEM( VMemAllocation, item, freeSpaceAfterThis );
975+
976+ cb( allocObj );
977+ }
978+
979+ LIST_FOREACH_END
980+ }
981+
961982 RwListEntry <VMemIsland> managerNode;
962983
963984 NativePageAllocator::pageHandle *allocHandle; // handle into the NativePageAllocator for meta-info
--- common/sdk/ABIHelpers.h (revision 124)
+++ common/sdk/ABIHelpers.h (revision 125)
@@ -1,8 +1,20 @@
1-// Contains classes and functions that help interact across ABI boundaries.
1+/******************************************************************************
2+*
3+* PROJECT: Eir SDK
4+* LICENSE: See LICENSE in the top level directory
5+* FILE: eirrepo/sdk/ABIHelpers.h
6+* PURPOSE: Classes and functions that help interact across ABI boundaries.
7+*
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
9+* Multi Theft Auto is available from http://www.multitheftauto.com/
10+*
11+*****************************************************************************/
212
313 #ifndef _EIRREPO_ABI_HELPERS_
414 #define _EIRREPO_ABI_HELPERS_
515
16+#include "String.h"
17+
618 #include "DataUtil.h"
719
820 namespace ABIStringHelpers
@@ -10,7 +22,7 @@
1022 template <typename subCharType>
1123 static inline const subCharType* GetEmptyString( void )
1224 {
13- return NULL;
25+ return nullptr;
1426 }
1527
1628 template <>
@@ -65,7 +77,7 @@
6577 {
6678 this->container = new virtualContainer();
6779
68- this->container->stringBuffer = NULL;
80+ this->container->stringBuffer = nullptr;
6981 }
7082
7183 inline abiVirtualString( const charType *str, size_t strLen )
@@ -82,7 +94,7 @@
8294 {
8395 this->container = right.container;
8496
85- right.container = NULL;
97+ right.container = nullptr;
8698 }
8799
88100 inline abiVirtualString( const abiVirtualString& right )
@@ -108,7 +120,7 @@
108120 {
109121 delete this->container;
110122
111- this->container = NULL;
123+ this->container = nullptr;
112124 }
113125
114126 if ( virtualContainer *rightCont = right.container )
@@ -151,8 +163,13 @@
151163
152164 inline operator std::basic_string <charType> ( void ) const
153165 {
154- return std::basic_string <charType>( this->c_str(), this->length() );
166+ return std::basic_string <charType> ( this->c_str(), this->length() );
155167 }
168+
169+ inline operator eir::String <charType> ( void ) const
170+ {
171+ return eir::String <charType> ( this->c_str(), this->length() );
172+ }
156173 };
157174
158175 typedef abiVirtualString <char> abiString;
--- common/sdk/PluginHelpers.h (revision 124)
+++ common/sdk/PluginHelpers.h (revision 125)
@@ -1,3 +1,15 @@
1+/*****************************************************************************
2+*
3+* PROJECT: Eir SDK
4+* LICENSE: See LICENSE in the top level directory
5+* FILE: eirrepo/sdk/PluginHelpers.h
6+* PURPOSE: Struct plugins helper objects for quality-of-life
7+*
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
9+* Multi Theft Auto is available from http://www.multitheftauto.com/
10+*
11+*****************************************************************************/
12+
113 #ifndef _PLUGIN_HELPERS_
214 #define _PLUGIN_HELPERS_
315
--- common/sdk/UniChar.strmodel.h (revision 124)
+++ common/sdk/UniChar.strmodel.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: sdk/UniChar.strmodel.h
5+* FILE: eirrepo/sdk/UniChar.strmodel.h
66 * PURPOSE: String-model based functions like comparison based on UniChar
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
@@ -12,6 +13,8 @@
1213 #ifndef _EIRREPO_CHARACTER_CHAIN_FUNCTIONS_
1314 #define _EIRREPO_CHARACTER_CHAIN_FUNCTIONS_
1415
16+#include "MacroUtils.h"
17+
1518 //TODO: find ways to share as much code as possible between the different string model functions!
1619
1720 // IMPORTANT: this function is designed to terminate on '\0' inside any string aswell.
@@ -170,19 +173,19 @@
170173 unboundedCharItemProc <dstCharType> dstProc;
171174
172175 return StringComparatorGeneric( srcStr, dstStr, caseSensitive, srcProc, dstProc );
173-}
174-
175-template <typename srcCharType, typename dstCharType>
176-inline bool StringEqualToZero(
176+}
177+
178+template <typename srcCharType, typename dstCharType>
179+inline bool StringEqualToZero(
177180 const srcCharType *srcStr,
178181 const dstCharType *dstStr,
179- bool caseSensitive
180-)
181-{
182- unboundedCharItemProc <srcCharType> srcProc;
183- unboundedCharItemProc <dstCharType> dstProc;
184-
185- return StringComparatorGeneric( srcStr, dstStr, caseSensitive, srcProc, dstProc );
182+ bool caseSensitive
183+)
184+{
185+ unboundedCharItemProc <srcCharType> srcProc;
186+ unboundedCharItemProc <dstCharType> dstProc;
187+
188+ return StringComparatorGeneric( srcStr, dstStr, caseSensitive, srcProc, dstProc );
186189 }
187190
188-#endif //_EIRREPO_CHARACTER_CHAIN_FUNCTIONS_
191+#endif //_EIRREPO_CHARACTER_CHAIN_FUNCTIONS_
--- common/sdk/MemoryRaw.h (revision 124)
+++ common/sdk/MemoryRaw.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: MTA:Eir
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
55 * FILE: eirrepo/sdk/MemoryRaw.h
66 * PURPOSE: Base memory management definitions for to-the-metal things
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/MacroUtils.h (revision 124)
+++ common/sdk/MacroUtils.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
55 * FILE: eirrepo/sdk/MacroUtils.h
66 * PURPOSE: Common macros in the SDK
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/MemoryUtils.stream.h (revision 124)
+++ common/sdk/MemoryUtils.stream.h (revision 125)
@@ -1,4 +1,14 @@
1-// Memory utilities based on stream processing.
1+/*****************************************************************************
2+*
3+* PROJECT: Eir SDK
4+* LICENSE: See LICENSE in the top level directory
5+* FILE: eirrepo/sdk/MemoryUtils.stream.h
6+* PURPOSE: Memory utilities based on stream processing.
7+*
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
9+* Multi Theft Auto is available from http://www.multitheftauto.com/
10+*
11+*****************************************************************************/
212
313 #ifndef _MEMORY_UTILITIES_STREAM_
414 #define _MEMORY_UTILITIES_STREAM_
--- common/sdk/UniChar.h (revision 124)
+++ common/sdk/UniChar.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: sdk/UniChar.h
5+* FILE: eirrepo/sdk/UniChar.h
66 * PURPOSE: Character environment to parse characters in strings properly
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/MemoryUtils.h (revision 124)
+++ common/sdk/MemoryUtils.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
55 * FILE: eirrepo/sdk/MemoryUtils.h
66 * PURPOSE: Memory management templates
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/DynamicTypeSystem.h (revision 124)
+++ common/sdk/DynamicTypeSystem.h (revision 125)
@@ -1,24 +1,35 @@
1-// Dynamic runtime type abstraction system.
1+/*****************************************************************************
2+*
3+* PROJECT: Eir SDK
4+* LICENSE: See LICENSE in the top level directory
5+* FILE: eirrepo/sdk/DynamicTypeSystem.h
6+* PURPOSE: Dynamic runtime type abstraction system.
7+*
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
9+* Multi Theft Auto is available from http://www.multitheftauto.com/
10+*
11+*****************************************************************************/
12+
213 #ifndef _DYN_TYPE_ABSTRACTION_SYSTEM_
314 #define _DYN_TYPE_ABSTRACTION_SYSTEM_
415
516 #include "rwlist.hpp"
6-#include "MemoryUtils.h"
7-
8-#include <cstring>
17+#include "MemoryUtils.h"
918
19+#include "String.h"
20+
1021 // Memory allocation for boot-strapping.
11-template <typename structType, typename allocatorType>
12-inline structType* _newstruct( allocatorType& allocData )
22+template <typename structType, typename allocatorType, typename... Args>
23+inline structType* _newstruct( void *refMem, Args... theArgs )
1324 {
14- structType *valOut = NULL;
25+ structType *valOut = nullptr;
1526 {
1627 // Attempt to allocate a block of memory for bootstrapping.
17- void *mem = allocData.Allocate( sizeof( structType ) );
28+ void *mem = allocatorType::Allocate( refMem, sizeof( structType ), alignof( structType ) );
1829
1930 if ( mem )
2031 {
21- valOut = new (mem) structType;
32+ valOut = new (mem) structType( std::forward <Args> ( theArgs )... );
2233 }
2334 }
2435 return valOut;
@@ -25,13 +36,13 @@
2536 }
2637
2738 template <typename structType, typename allocatorType>
28-inline void _delstruct( structType *theStruct, allocatorType& allocData )
39+inline void _delstruct( void *refMem, structType *theStruct )
2940 {
3041 theStruct->~structType();
3142
3243 void *mem = theStruct;
3344
34- allocData.Free( mem, sizeof( structType ) );
45+ allocatorType::Free( refMem, mem );
3546 }
3647
3748 // Type sentry struct of the dynamic type system.
@@ -58,7 +69,7 @@
5869
5970 inline rwlock* CreateLock( void ) const
6071 {
61- return NULL;
72+ return nullptr;
6273 }
6374
6475 inline void CloseLock( rwlock *lock ) const
@@ -103,14 +114,17 @@
103114 public:
104115 typedef allocatorType memAllocType;
105116
106- static const unsigned int ANONYMOUS_PLUGIN_ID = 0xFFFFFFFF;
117+ static constexpr unsigned int ANONYMOUS_PLUGIN_ID = 0xFFFFFFFF;
107118
119+ // TODO: actually change this to be dynamic!
120+ static constexpr size_t STANDARD_OBJECT_ALIGNMENT = sizeof(void*);
121+
108122 // Export the system type so extensions can use it.
109123 typedef systemPointer systemPointer_t;
110124
111125 // Exceptions thrown by this system.
112126 class abstraction_construction_exception {};
113- class type_name_conflict_exception {};
127+ class type_name_conflict_exception {};
114128 class undefined_method_exception {};
115129
116130 // Lock provider for MT support.
@@ -120,8 +134,7 @@
120134
121135 inline DynamicTypeSystem( void )
122136 {
123- this->_memAlloc = NULL;
124- this->mainLock = NULL;
137+ this->mainLock = nullptr;
125138 }
126139
127140 inline void Shutdown( void )
@@ -139,7 +152,7 @@
139152 {
140153 this->lockProvider.CloseLock( sysLock );
141154
142- this->mainLock = NULL;
155+ this->mainLock = nullptr;
143156 }
144157 }
145158
@@ -180,7 +193,7 @@
180193 {
181194 lockProvider.LockLeaveRead( theLock );
182195
183- this->theLock = NULL;
196+ this->theLock = nullptr;
184197 }
185198 }
186199
@@ -209,7 +222,7 @@
209222 {
210223 lockProvider.LockLeaveWrite( theLock );
211224
212- this->theLock = NULL;
225+ this->theLock = nullptr;
213226 }
214227 }
215228
@@ -219,9 +232,6 @@
219232 };
220233
221234 public:
222- // This field has to be set by the application runtime.
223- memAllocType *_memAlloc;
224-
225235 // Interface for type lifetime management.
226236 // THIS INTERFACE MUST BE THREAD-SAFE! This means that it has to provided its own locks, when necessary!
227237 struct typeInterface abstract
@@ -249,7 +259,7 @@
249259 inline pluginDescriptor( void )
250260 {
251261 this->pluginId = DynamicTypeSystem::ANONYMOUS_PLUGIN_ID;
252- this->typeInfo = NULL;
262+ this->typeInfo = nullptr;
253263 }
254264
255265 inline pluginDescriptor( unsigned int id, typeInfoBase *typeInfo )
@@ -296,8 +306,11 @@
296306
297307 typeInfoBase( const typeInfoBase& right ) = delete;
298308
299- virtual void Cleanup( memAllocType& memAlloc ) = 0;
309+ // Helper for the Cleanup method.
310+ typedef allocatorType allocatorType;
300311
312+ virtual void Cleanup( void ) = 0;
313+
301314 DynamicTypeSystem *typeSys;
302315
303316 const char *name; // name of this type
@@ -393,7 +406,7 @@
393406 AINLINE static pluginStructType* RESOLVE_STRUCT( systemPointer_t *sysPtr, GenericRTTI *rtObj, typeInfoBase *typeInfo, pluginOffset_t offset )
394407 {
395408 if ( !IsOffsetValid( offset ) )
396- return NULL;
409+ return nullptr;
397410
398411 size_t baseOffset = GetTypeInfoStructOffset( sysPtr, rtObj, typeInfo );
399412
@@ -406,7 +419,7 @@
406419 AINLINE static const pluginStructType* RESOLVE_STRUCT( systemPointer_t *sysPtr, const GenericRTTI *rtObj, typeInfoBase *typeInfo, pluginOffset_t offset )
407420 {
408421 if ( !IsOffsetValid( offset ) )
409- return NULL;
422+ return nullptr;
410423
411424 size_t baseOffset = GetTypeInfoStructOffset( sysPtr, (GenericRTTI*)rtObj, typeInfo );
412425
@@ -473,7 +486,7 @@
473486 {
474487 typeInfoBase *alreadyExisting = FindTypeInfoNolock( typeName, inheritsFrom );
475488
476- if ( alreadyExisting != NULL )
489+ if ( alreadyExisting != nullptr )
477490 {
478491 throw type_name_conflict_exception();
479492 }
@@ -486,7 +499,7 @@
486499 tInfo->isExclusive = false;
487500 tInfo->isAbstract = false;
488501 tInfo->tInterface = tInterface;
489- tInfo->inheritsFrom = NULL;
502+ tInfo->inheritsFrom = nullptr;
490503 tInfo->typeLock = lockProvider.CreateLock();
491504 LIST_INSERT( registeredTypes.root, tInfo->node );
492505
@@ -509,18 +522,18 @@
509522 }
510523
511524 // Already THREAD-SAFE, because memory allocation is THREAD-SAFE and type registration is THREAD-SAFE.
512- inline typeInfoBase* RegisterType( const char *typeName, typeInterface *typeInterface, typeInfoBase *inheritsFrom = NULL )
525+ inline typeInfoBase* RegisterType( const char *typeName, typeInterface *typeInterface, typeInfoBase *inheritsFrom = nullptr )
513526 {
514527 struct typeInfoGeneral : public typeInfoBase
515528 {
516- void Cleanup( memAllocType& memAlloc )
529+ void Cleanup( void ) override
517530 {
518531 // Terminate ourselves.
519- _delstruct( this, memAlloc );
532+ _delstruct <typeInfoGeneral, allocatorType> ( this->typeSys, this );
520533 }
521534 };
522535
523- typeInfoGeneral *info = _newstruct <typeInfoGeneral> ( *_memAlloc );
536+ typeInfoGeneral *info = _newstruct <typeInfoGeneral, allocatorType> ( this );
524537
525538 if ( info )
526539 {
@@ -530,7 +543,7 @@
530543 }
531544 catch( ... )
532545 {
533- _delstruct <typeInfoGeneral> ( info, *_memAlloc );
546+ _delstruct <typeInfoGeneral, allocatorType> ( this, info );
534547
535548 throw;
536549 }
@@ -541,20 +554,20 @@
541554
542555 // THREAD-SAFE because memory allocation is THREAD-SAFE and type registration is THREAD-SAFE.
543556 template <typename structTypeTypeInterface>
544- inline typeInfoBase* RegisterCommonTypeInterface( const char *typeName, structTypeTypeInterface *tInterface, typeInfoBase *inheritsFrom = NULL )
557+ inline typeInfoBase* RegisterCommonTypeInterface( const char *typeName, structTypeTypeInterface *tInterface, typeInfoBase *inheritsFrom = nullptr )
545558 {
546559 struct typeInfoStruct : public typeInfoBase
547560 {
548- void Cleanup( memAllocType& memAlloc )
561+ void Cleanup( void ) override
549562 {
550- _delstruct( tInterface, memAlloc );
551- _delstruct( this, memAlloc );
563+ _delstruct <structTypeTypeInterface, allocatorType> ( this->typeSys, this->tInterface );
564+ _delstruct <typeInfoStruct, allocatorType> ( this->typeSys, this );
552565 }
553566
554567 structTypeTypeInterface *tInterface;
555568 };
556569
557- typeInfoStruct *tInfo = _newstruct <typeInfoStruct> ( *_memAlloc );
570+ typeInfoStruct *tInfo = _newstruct <typeInfoStruct, allocatorType> ( this );
558571
559572 if ( tInfo )
560573 {
@@ -567,7 +580,7 @@
567580 }
568581 catch( ... )
569582 {
570- _delstruct <typeInfoStruct> ( tInfo, *_memAlloc );
583+ _delstruct <typeInfoStruct, allocatorType> ( this, tInfo );
571584
572585 throw;
573586 }
@@ -575,12 +588,12 @@
575588 return tInfo;
576589 }
577590
578- _delstruct( tInterface, *_memAlloc );
579- return NULL;
591+ _delstruct <structTypeTypeInterface, allocatorType> ( this, tInterface );
592+ return nullptr;
580593 }
581594
582595 template <typename structType>
583- inline typeInfoBase* RegisterAbstractType( const char *typeName, typeInfoBase *inheritsFrom = NULL )
596+ inline typeInfoBase* RegisterAbstractType( const char *typeName, typeInfoBase *inheritsFrom = nullptr )
584597 {
585598 struct structTypeInterface : public typeInterface
586599 {
@@ -610,9 +623,9 @@
610623 }
611624 };
612625
613- structTypeInterface *tInterface = _newstruct <structTypeInterface> ( *_memAlloc );
626+ structTypeInterface *tInterface = _newstruct <structTypeInterface, allocatorType> ( this );
614627
615- typeInfoBase *newTypeInfo = NULL;
628+ typeInfoBase *newTypeInfo = nullptr;
616629
617630 if ( tInterface )
618631 {
@@ -629,7 +642,7 @@
629642 }
630643 catch( ... )
631644 {
632- _delstruct <structTypeInterface> ( tInterface, *_memAlloc );
645+ _delstruct <structTypeInterface, allocatorType> ( this, tInterface );
633646
634647 throw;
635648 }
@@ -655,7 +668,7 @@
655668 public:
656669 // THREAD-SAFE, because memory allocation is THREAD-SAFE and type registration is THREAD-SAFE.
657670 template <typename structType>
658- inline typeInfoBase* RegisterStructType( const char *typeName, typeInfoBase *inheritsFrom = NULL, size_t structSize = sizeof( structType ) )
671+ inline typeInfoBase* RegisterStructType( const char *typeName, typeInfoBase *inheritsFrom = nullptr, size_t structSize = sizeof( structType ) )
659672 {
660673 struct structTypeInterface : public typeInterface
661674 {
@@ -687,9 +700,9 @@
687700 size_t structSize;
688701 };
689702
690- structTypeInterface *tInterface = _newstruct <structTypeInterface> ( *_memAlloc );
703+ structTypeInterface *tInterface = _newstruct <structTypeInterface, allocatorType> ( this );
691704
692- typeInfoBase *newTypeInfo = NULL;
705+ typeInfoBase *newTypeInfo = nullptr;
693706
694707 if ( tInterface )
695708 {
@@ -701,7 +714,7 @@
701714 }
702715 catch( ... )
703716 {
704- _delstruct <structTypeInterface> ( tInterface, *_memAlloc );
717+ _delstruct <structTypeInterface, allocatorType> ( this, tInterface );
705718
706719 throw;
707720 }
@@ -712,7 +725,7 @@
712725
713726 // THREAD-SAFEty cannot be guarranteed. Use with caution.
714727 template <typename classType, typename staticRegistry>
715- inline pluginOffset_t StaticPluginRegistryRegisterTypeConstruction( staticRegistry& registry, typeInfoBase *typeInfo, systemPointer_t *sysPtr, void *construction_params = NULL )
728+ inline pluginOffset_t StaticPluginRegistryRegisterTypeConstruction( staticRegistry& registry, typeInfoBase *typeInfo, systemPointer_t *sysPtr, void *construction_params = nullptr )
716729 {
717730 struct structPluginInterface : staticRegistry::pluginInterface
718731 {
@@ -720,7 +733,7 @@
720733 {
721734 void *structMem = pluginId.template RESOLVE_STRUCT <void> ( obj, pluginOffset );
722735
723- if ( structMem == NULL )
736+ if ( structMem == nullptr )
724737 return false;
725738
726739 // Construct the type.
@@ -727,7 +740,7 @@
727740 GenericRTTI *rtObj = typeSys->ConstructPlacement( obj, structMem, typeInfo, construction_params );
728741
729742 // Hack: tell it about the struct.
730- if ( rtObj != NULL )
743+ if ( rtObj != nullptr )
731744 {
732745 void *langObj = DynamicTypeSystem::GetObjectFromTypeStruct( rtObj );
733746
@@ -743,7 +756,7 @@
743756 }
744757 }
745758
746- return ( rtObj != NULL );
759+ return ( rtObj != nullptr );
747760 }
748761
749762 void OnPluginDestruct( typename staticRegistry::hostType_t *obj, typename staticRegistry::pluginOffset_t pluginOffset, typename staticRegistry::pluginDescriptor pluginId ) override
@@ -768,7 +781,7 @@
768781
769782 void DeleteOnUnregister( void ) override
770783 {
771- _delstruct( this, *typeSys->_memAlloc );
784+ _delstruct <structPluginInterface, allocatorType> ( this->typeSys, this );
772785 }
773786
774787 DynamicTypeSystem *typeSys;
@@ -778,7 +791,7 @@
778791
779792 typename staticRegistry::pluginOffset_t offset = 0;
780793
781- structPluginInterface *tInterface = _newstruct <structPluginInterface> ( *_memAlloc );
794+ structPluginInterface *tInterface = _newstruct <structPluginInterface, allocatorType> ( this );
782795
783796 if ( tInterface )
784797 {
@@ -796,12 +809,12 @@
796809
797810 if ( !staticRegistry::IsOffsetValid( offset ) )
798811 {
799- _delstruct( tInterface, *_memAlloc );
812+ _delstruct <structPluginInterface, allocatorType> ( this, tInterface );
800813 }
801814 }
802815 catch( ... )
803816 {
804- _delstruct <structPluginInterface> ( tInterface, *_memAlloc );
817+ _delstruct <structPluginInterface, allocatorType> ( this, tInterface );
805818
806819 throw;
807820 }
@@ -822,13 +835,13 @@
822835
823836 // THREAD-SAFE, because memory allocation is THREAD-SAFE and type registration is THREAD-SAFE.
824837 template <typename structType>
825- inline typeInfoBase* RegisterDynamicStructType( const char *typeName, structTypeMetaInfo *metaInfo, bool freeMetaInfo, typeInfoBase *inheritsFrom = NULL )
838+ inline typeInfoBase* RegisterDynamicStructType( const char *typeName, structTypeMetaInfo *metaInfo, bool freeMetaInfo, typeInfoBase *inheritsFrom = nullptr )
826839 {
827840 struct structTypeInterface : public typeInterface
828841 {
829842 inline structTypeInterface( void )
830843 {
831- this->meta_info = NULL;
844+ this->meta_info = nullptr;
832845 this->freeMetaInfo = false;
833846 }
834847
@@ -840,7 +853,7 @@
840853 {
841854 delete metaInfo;
842855
843- this->meta_info = NULL;
856+ this->meta_info = nullptr;
844857 }
845858 }
846859 }
@@ -874,9 +887,9 @@
874887 bool freeMetaInfo;
875888 };
876889
877- typeInfoBase *newTypeInfo = NULL;
890+ typeInfoBase *newTypeInfo = nullptr;
878891
879- structTypeInterface *tInterface = _newstruct <structTypeInterface> ( *_memAlloc );
892+ structTypeInterface *tInterface = _newstruct <structTypeInterface, allocatorType> ( this );
880893
881894 if ( tInterface )
882895 {
@@ -891,7 +904,7 @@
891904 }
892905 catch( ... )
893906 {
894- _delstruct <structTypeInterface> ( tInterface, *_memAlloc );
907+ _delstruct <structTypeInterface, allocatorType> ( this, tInterface );
895908
896909 throw;
897910 }
@@ -952,7 +965,7 @@
952965 // First construct the parents.
953966 typeInfoBase *inheritedClass = typeInfo->inheritsFrom;
954967
955- if ( inheritedClass != NULL )
968+ if ( inheritedClass != nullptr )
956969 {
957970 parentConstructionSuccess = ConstructPlugins( sysPtr, inheritedClass, rtObj );
958971 }
@@ -965,7 +978,7 @@
965978 // If anything has failed, we destroy everything we already constructed.
966979 if ( !thisConstructionSuccess )
967980 {
968- if ( inheritedClass != NULL )
981+ if ( inheritedClass != nullptr )
969982 {
970983 DestructPlugins( sysPtr, inheritedClass, rtObj );
971984 }
@@ -993,7 +1006,7 @@
9931006
9941007 typeInfoBase *inheritedType = typeInfo->inheritsFrom;
9951008
996- if ( inheritedType != NULL )
1009+ if ( inheritedType != nullptr )
9971010 {
9981011 parentAssignmentSuccess = AssignPlugins( sysPtr, inheritedType, dstRtObj, srcRtObj );
9991012 }
@@ -1115,7 +1128,7 @@
11151128 // THREAD-SAFE, because the typeInterface is THREAD-SAFE and plugin construction is THREAD-SAFE.
11161129 inline GenericRTTI* ConstructPlacement( systemPointer_t *sysPtr, void *objMem, typeInfoBase *typeInfo, void *construct_params )
11171130 {
1118- GenericRTTI *objOut = NULL;
1131+ GenericRTTI *objOut = nullptr;
11191132 {
11201133 // Reference the type info.
11211134 ReferenceTypeInfo( typeInfo );
@@ -1147,7 +1160,7 @@
11471160 catch( ... )
11481161 {
11491162 // We failed to construct the object struct, so it is invalid.
1150- objStruct = NULL;
1163+ objStruct = nullptr;
11511164 }
11521165
11531166 if ( objStruct )
@@ -1168,7 +1181,7 @@
11681181 }
11691182 }
11701183
1171- if ( objOut == NULL )
1184+ if ( objOut == nullptr )
11721185 {
11731186 // Since we did not return a proper object, dereference again.
11741187 DereferenceTypeInfo( typeInfo );
@@ -1180,7 +1193,7 @@
11801193 // THREAD-SAFE, because memory allocation is THREAD-SAFE, GetTypeStructSize is THREAD-SAFE and ConstructPlacement is THREAD-SAFE.
11811194 inline GenericRTTI* Construct( systemPointer_t *sysPtr, typeInfoBase *typeInfo, void *construct_params )
11821195 {
1183- GenericRTTI *objOut = NULL;
1196+ GenericRTTI *objOut = nullptr;
11841197 {
11851198 // We must reference the type info to prevent the exploit where the type struct can change
11861199 // during construction.
@@ -1192,7 +1205,7 @@
11921205
11931206 if ( objMemSize != 0 )
11941207 {
1195- void *objMem = _memAlloc->Allocate( objMemSize );
1208+ void *objMem = allocatorType::Allocate( this, objMemSize, STANDARD_OBJECT_ALIGNMENT );
11961209
11971210 if ( objMem )
11981211 {
@@ -1204,7 +1217,7 @@
12041217 catch( ... )
12051218 {
12061219 // Just to be on the safe side.
1207- _memAlloc->Free( objMem, objMemSize );
1220+ allocatorType::Free( this, objMem );
12081221
12091222 throw;
12101223 }
@@ -1212,7 +1225,7 @@
12121225 if ( !objOut )
12131226 {
12141227 // Deallocate the memory again, as we seem to have failed.
1215- _memAlloc->Free( objMem, objMemSize );
1228+ allocatorType::Free( this, objMem );
12161229 }
12171230 }
12181231 }
@@ -1235,7 +1248,7 @@
12351248 // is called from LOCKED READ CONTEXT and plugin assignment is called from LOCKED READ CONTEXT.
12361249 inline GenericRTTI* ClonePlacement( systemPointer_t *sysPtr, void *objMem, const GenericRTTI *toBeCloned )
12371250 {
1238- GenericRTTI *objOut = NULL;
1251+ GenericRTTI *objOut = nullptr;
12391252 {
12401253 // Grab the type of toBeCloned.
12411254 typeInfoBase *typeInfo = GetTypeInfoFromTypeStruct( toBeCloned );
@@ -1271,7 +1284,7 @@
12711284 catch( ... )
12721285 {
12731286 // We failed to construct the object struct, so it is invalid.
1274- objStruct = NULL;
1287+ objStruct = nullptr;
12751288 }
12761289
12771290 if ( objStruct )
@@ -1313,7 +1326,7 @@
13131326 throw;
13141327 }
13151328
1316- if ( objOut == NULL )
1329+ if ( objOut == nullptr )
13171330 {
13181331 // Since we did not return a proper object, dereference again.
13191332 DereferenceTypeInfo( typeInfo );
@@ -1326,7 +1339,7 @@
13261339 // and ClonePlacement is THREAD_SAFE.
13271340 inline GenericRTTI* Clone( systemPointer_t *sysPtr, const GenericRTTI *toBeCloned )
13281341 {
1329- GenericRTTI *objOut = NULL;
1342+ GenericRTTI *objOut = nullptr;
13301343 {
13311344 // Get the size toBeCloned currently takes.
13321345 // This is an immutable property, because memory cannot magically expand.
@@ -1334,7 +1347,7 @@
13341347
13351348 if ( objMemSize != 0 )
13361349 {
1337- void *objMem = _memAlloc->Allocate( objMemSize );
1350+ void *objMem = allocatorType::Allocate( this, objMemSize, STANDARD_OBJECT_ALIGNMENT );
13381351
13391352 if ( objMem )
13401353 {
@@ -1345,7 +1358,7 @@
13451358 if ( !objOut )
13461359 {
13471360 // Deallocate the memory again, as we seem to have failed.
1348- _memAlloc->Free( objMem, objMemSize );
1361+ allocatorType::Free( this, objMem );
13491362 }
13501363 }
13511364 }
@@ -1381,7 +1394,7 @@
13811394 {
13821395 // We have to lock here, because this has to happen atomically on the whole type system.
13831396 // Because inside of the whole type system, we assume there is not another type with the same resolution.
1384- scoped_rwlock_write sysLock( this->lockProvider, ( requiresSystemLock ? this->mainLock : NULL ) );
1397+ scoped_rwlock_write sysLock( this->lockProvider, ( requiresSystemLock ? this->mainLock : nullptr ) );
13851398
13861399 // Make sure we can even do that.
13871400 // Verify that no other type with that name exists which inherits from said class.
@@ -1402,10 +1415,10 @@
14021415
14031416 if ( prevInherit != inheritedClass )
14041417 {
1405- scoped_rwlock_write inheritedLock( this->lockProvider, ( prevInherit ? prevInherit->typeLock : NULL ) );
1406- scoped_rwlock_write newInheritLock( this->lockProvider, ( inheritedClass ? inheritedClass->typeLock : NULL ) );
1418+ scoped_rwlock_write inheritedLock( this->lockProvider, ( prevInherit ? prevInherit->typeLock : nullptr ) );
1419+ scoped_rwlock_write newInheritLock( this->lockProvider, ( inheritedClass ? inheritedClass->typeLock : nullptr ) );
14071420
1408- if ( inheritedClass != NULL )
1421+ if ( inheritedClass != nullptr )
14091422 {
14101423 // Make sure that we NEVER do circular inheritance!
14111424 rtti_assert( IsTypeInheritingFromNolock( subClass, inheritedClass ) == false );
@@ -1565,12 +1578,6 @@
15651578 // DestroyPlacement is THREAD-SAFE and memory allocation is THREAD-SAFE.
15661579 inline void Destroy( systemPointer_t *sysPtr, GenericRTTI *typeStruct )
15671580 {
1568- // Get the actual type struct size.
1569- // The returned object size is of course an IMMUTABLE property.
1570- size_t objMemSize = GetTypeStructSize( sysPtr, typeStruct );
1571-
1572- rtti_assert( objMemSize != 0 ); // it cannot be zero.
1573-
15741581 // Delete the object from the memory.
15751582 DestroyPlacement( sysPtr, typeStruct );
15761583
@@ -1577,7 +1584,7 @@
15771584 // Free the memory.
15781585 void *rttiMem = (void*)typeStruct;
15791586
1580- _memAlloc->Free( rttiMem, objMemSize );
1587+ allocatorType::Free( this, rttiMem );
15811588 }
15821589
15831590 // Calling this method is only permitted on types that YOU KNOW
@@ -1590,7 +1597,7 @@
15901597 inline void DeleteType( typeInfoBase *typeInfo )
15911598 {
15921599 // Make sure we do not inherit from anything anymore.
1593- if ( typeInfo->inheritsFrom != NULL )
1600+ if ( typeInfo->inheritsFrom != nullptr )
15941601 {
15951602 scoped_rwlock_write sysLock( this->lockProvider, this->mainLock );
15961603
@@ -1600,7 +1607,7 @@
16001607 {
16011608 scoped_rwlock_write inheritedLock( this->lockProvider, inheritsFrom->typeLock );
16021609
1603- typeInfo->inheritsFrom = NULL;
1610+ typeInfo->inheritsFrom = nullptr;
16041611
16051612 inheritsFrom->inheritanceCount--;
16061613 }
@@ -1614,7 +1621,7 @@
16141621
16151622 if ( item->inheritsFrom == typeInfo )
16161623 {
1617- SetTypeInfoInheritingClass( item, NULL );
1624+ SetTypeInfoInheritingClass( item, nullptr );
16181625 }
16191626
16201627 LIST_FOREACH_END
@@ -1633,13 +1640,13 @@
16331640 LIST_REMOVE( typeInfo->node );
16341641 }
16351642
1636- typeInfo->Cleanup( *_memAlloc );
1643+ typeInfo->Cleanup();
16371644 }
16381645
16391646 // THREAD-SAFE, because it uses GLOBAL SYSTEM READ LOCK when iterating through the type nodes.
16401647 struct type_iterator
16411648 {
1642- const DynamicTypeSystem& typeSys;
1649+ DynamicTypeSystem& typeSys;
16431650
16441651 // When iterating through types, we must hold a lock.
16451652 scoped_rwlock_read typeConsistencyLock;
@@ -1647,7 +1654,7 @@
16471654 const RwList <typeInfoBase>& listRoot;
16481655 RwListEntry <typeInfoBase> *curNode;
16491656
1650- inline type_iterator( const DynamicTypeSystem& typeSys )
1657+ inline type_iterator( DynamicTypeSystem& typeSys )
16511658 : typeSys( typeSys ),
16521659 typeConsistencyLock( typeSys.lockProvider, typeSys.mainLock ), // WE MUST GET THE LOCK BEFORE WE ACQUIRE THE LIST ROOT, for nicety :3
16531660 listRoot( typeSys.registeredTypes )
@@ -1780,7 +1787,7 @@
17801787
17811788 LIST_FOREACH_END
17821789
1783- return NULL;
1790+ return nullptr;
17841791 }
17851792
17861793 public:
@@ -1795,9 +1802,9 @@
17951802 // Type resolution based on type descriptors.
17961803 // THREAD-SAFE, because it uses THREAD-SAFE type_resolution_iterator object and the
17971804 // FindTypeInfo function is THREAD-SAFE.
1798- inline typeInfoBase* ResolveTypeInfo( const char *typePath, typeInfoBase *baseTypeInfo = NULL )
1805+ inline typeInfoBase* ResolveTypeInfo( const char *typePath, typeInfoBase *baseTypeInfo = nullptr )
17991806 {
1800- typeInfoBase *returnedTypeInfo = NULL;
1807+ typeInfoBase *returnedTypeInfo = nullptr;
18011808 {
18021809 typeInfoBase *currentType = baseTypeInfo;
18031810
@@ -1810,7 +1817,7 @@
18101817
18111818 currentType = FindTypeInfo( curToken.c_str(), currentType );
18121819
1813- if ( currentType == NULL )
1820+ if ( currentType == nullptr )
18141821 {
18151822 break;
18161823 }
@@ -1824,4 +1831,4 @@
18241831 }
18251832 };
18261833
1827-#endif //_DYN_TYPE_ABSTRACTION_SYSTEM_
1834+#endif //_DYN_TYPE_ABSTRACTION_SYSTEM_
--- common/sdk/Endian.h (revision 124)
+++ common/sdk/Endian.h (revision 125)
@@ -1,3 +1,15 @@
1+/*****************************************************************************
2+*
3+* PROJECT: Eir SDK
4+* LICENSE: See LICENSE in the top level directory
5+* FILE: eirrepo/sdk/Endian.h
6+* PURPOSE: Endianness utilities header
7+*
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
9+* Multi Theft Auto is available from http://www.multitheftauto.com/
10+*
11+*****************************************************************************/
12+
113 #ifndef _ENDIAN_COMPAT_HEADER_
214 #define _ENDIAN_COMPAT_HEADER_
315
--- common/sdk/eirutils.h (revision 124)
+++ common/sdk/eirutils.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/eirutils.h
5+* FILE: eirrepo/sdk/eirutils.h
66 * PURPOSE: Things that are commonly used but do not warrant for own header
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
@@ -32,4 +33,33 @@
3233 return len;
3334 }
3435
36+// Providing the everything-purpose standard allocator pattern in the Eir SDK!
37+// We want a common setup where the link to the DynamicTypeSystem (DTS) is fixed to the position of the DTS.
38+#define DEFINE_HEAP_REDIR_ALLOC( allocTypeName ) \
39+ struct allocTypeName \
40+ { \
41+ static inline void* Allocate( void *refMem, size_t memSize, size_t alignment ); \
42+ static inline bool Resize( void *refMem, void *objMem, size_t reqNewSize ); \
43+ static inline void Free( void *refMem, void *memPtr ); \
44+ };
45+
46+// This thing assumes that the object pointed at by allocNode is of type "NativeHeapAllocator",
47+// but you may of course implemnet your own thing that has the same semantics.
48+#define IMPL_HEAP_REDIR_ALLOC( allocTypeName, hostStructTypeName, redirNode, allocNode ) \
49+ void* allocTypeName::Allocate( void *refMem, size_t memSize, size_t alignment ) \
50+ { \
51+ hostStructTypeName *hostStruct = LIST_GETITEM( hostStructTypeName, refMem, redirNode ); \
52+ return hostStruct->allocNode.Allocate( memSize, alignment ); \
53+ } \
54+ bool allocTypeName::Resize( void *refMem, void *objMem, size_t reqNewSize ) \
55+ { \
56+ hostStructTypeName *hostStruct = LIST_GETITEM( hostStructTypeName, refMem, redirNode ); \
57+ return hostStruct->allocNode.SetAllocationSize( objMem, reqNewSize ); \
58+ } \
59+ void allocTypeName::Free( void *refMem, void *memPtr ) \
60+ { \
61+ hostStructTypeName *hostStruct = LIST_GETITEM( hostStructTypeName, refMem, redirNode ); \
62+ hostStruct->allocNode.Free( memPtr ); \
63+ }
64+
3565 #endif //_EIR_COMMON_SDK_UTILITIES_
\ No newline at end of file
--- common/sdk/UniChar.casesense.h (revision 124)
+++ common/sdk/UniChar.casesense.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: sdk/UniChar.casesense.h
5+* FILE: eirrepo/sdk/UniChar.casesense.h
66 * PURPOSE: Character environment case-sensitivity routines
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
@@ -12,6 +13,8 @@
1213 #ifndef _UNICHAR_CASE_SENSITIVITY_
1314 #define _UNICHAR_CASE_SENSITIVITY_
1415
16+#include "MacroUtils.h"
17+
1518 // The main reason this file got created is because std::ctype <char32_t> was undefined under Linux.
1619 // Hence I have to perform these things myself.
1720
@@ -62,9 +65,9 @@
6265
6366 dyna_toupper_lookup <wchar_t> _dyna_redir;
6467 };
65-
66-typedef std::conditional <sizeof(wchar_t) == sizeof(char32_t), utf32_wchar_toupper_lookup, dyna_toupper_lookup <char32_t>>::type char32_toupper_baseclass;
6768
69+typedef std::conditional <sizeof(wchar_t) == sizeof(char32_t), utf32_wchar_toupper_lookup, dyna_toupper_lookup <char32_t>>::type char32_toupper_baseclass;
70+
6871 template <>
6972 struct toupper_lookup <char32_t> : public char32_toupper_baseclass
7073 {
@@ -87,4 +90,4 @@
8790 dyna_toupper_lookup <char> _dyna_redir;
8891 };
8992
90-#endif //_UNICHAR_CASE_SENSITIVITY_
93+#endif //_UNICHAR_CASE_SENSITIVITY_
--- common/sdk/Vector.h (revision 124)
+++ common/sdk/Vector.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/Vector.h
5+* FILE: eirrepo/sdk/Vector.h
66 * PURPOSE: Optimized Vector implementation
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/AVLTree.h (revision 124)
+++ common/sdk/AVLTree.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/AVLTree.h
5+* FILE: eirrepo/sdk/AVLTree.h
66 * PURPOSE: AVL-tree implementation (for the native heap allocator)
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/sdk/OSUtils.h (revision 124)
+++ common/sdk/OSUtils.h (revision 125)
@@ -1,10 +1,11 @@
11 /*****************************************************************************
22 *
3-* PROJECT: Multi Theft Auto v1.2
3+* PROJECT: Eir SDK
44 * LICENSE: See LICENSE in the top level directory
5-* FILE: Shared/core/OSUtils.h
5+* FILE: eirrepo/sdk/OSUtils.h
66 * PURPOSE: Implementation dependant routines for native features
77 *
8+* Find the Eir SDK at: https://osdn.net/projects/eirrepo/
89 * Multi Theft Auto is available from http://www.multitheftauto.com/
910 *
1011 *****************************************************************************/
--- common/LICENSE (revision 124)
+++ common/LICENSE (revision 125)
@@ -1,674 +1,16 @@
1- GNU GENERAL PUBLIC LICENSE
2- Version 3, 29 June 2007
1+Copyright 2018 Martin Turski <turningtides@outlook.de>
32
4- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5- Everyone is permitted to copy and distribute verbatim copies
6- of this license document, but changing it is not allowed.
3+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
4+associated documentation files (the "Software"), to deal in the Software without restriction, including
5+without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
6+sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
7+subject to the following conditions:
78
8- Preamble
9+The above copyright notice and this permission notice shall be included in all copies or
10+substantial portions of the Software.
911
10- The GNU General Public License is a free, copyleft license for
11-software and other kinds of works.
12-
13- The licenses for most software and other practical works are designed
14-to take away your freedom to share and change the works. By contrast,
15-the GNU General Public License is intended to guarantee your freedom to
16-share and change all versions of a program--to make sure it remains free
17-software for all its users. We, the Free Software Foundation, use the
18-GNU General Public License for most of our software; it applies also to
19-any other work released this way by its authors. You can apply it to
20-your programs, too.
21-
22- When we speak of free software, we are referring to freedom, not
23-price. Our General Public Licenses are designed to make sure that you
24-have the freedom to distribute copies of free software (and charge for
25-them if you wish), that you receive source code or can get it if you
26-want it, that you can change the software or use pieces of it in new
27-free programs, and that you know you can do these things.
28-
29- To protect your rights, we need to prevent others from denying you
30-these rights or asking you to surrender the rights. Therefore, you have
31-certain responsibilities if you distribute copies of the software, or if
32-you modify it: responsibilities to respect the freedom of others.
33-
34- For example, if you distribute copies of such a program, whether
35-gratis or for a fee, you must pass on to the recipients the same
36-freedoms that you received. You must make sure that they, too, receive
37-or can get the source code. And you must show them these terms so they
38-know their rights.
39-
40- Developers that use the GNU GPL protect your rights with two steps:
41-(1) assert copyright on the software, and (2) offer you this License
42-giving you legal permission to copy, distribute and/or modify it.
43-
44- For the developers' and authors' protection, the GPL clearly explains
45-that there is no warranty for this free software. For both users' and
46-authors' sake, the GPL requires that modified versions be marked as
47-changed, so that their problems will not be attributed erroneously to
48-authors of previous versions.
49-
50- Some devices are designed to deny users access to install or run
51-modified versions of the software inside them, although the manufacturer
52-can do so. This is fundamentally incompatible with the aim of
53-protecting users' freedom to change the software. The systematic
54-pattern of such abuse occurs in the area of products for individuals to
55-use, which is precisely where it is most unacceptable. Therefore, we
56-have designed this version of the GPL to prohibit the practice for those
57-products. If such problems arise substantially in other domains, we
58-stand ready to extend this provision to those domains in future versions
59-of the GPL, as needed to protect the freedom of users.
60-
61- Finally, every program is threatened constantly by software patents.
62-States should not allow patents to restrict development and use of
63-software on general-purpose computers, but in those that do, we wish to
64-avoid the special danger that patents applied to a free program could
65-make it effectively proprietary. To prevent this, the GPL assures that
66-patents cannot be used to render the program non-free.
67-
68- The precise terms and conditions for copying, distribution and
69-modification follow.
70-
71- TERMS AND CONDITIONS
72-
73- 0. Definitions.
74-
75- "This License" refers to version 3 of the GNU General Public License.
76-
77- "Copyright" also means copyright-like laws that apply to other kinds of
78-works, such as semiconductor masks.
79-
80- "The Program" refers to any copyrightable work licensed under this
81-License. Each licensee is addressed as "you". "Licensees" and
82-"recipients" may be individuals or organizations.
83-
84- To "modify" a work means to copy from or adapt all or part of the work
85-in a fashion requiring copyright permission, other than the making of an
86-exact copy. The resulting work is called a "modified version" of the
87-earlier work or a work "based on" the earlier work.
88-
89- A "covered work" means either the unmodified Program or a work based
90-on the Program.
91-
92- To "propagate" a work means to do anything with it that, without
93-permission, would make you directly or secondarily liable for
94-infringement under applicable copyright law, except executing it on a
95-computer or modifying a private copy. Propagation includes copying,
96-distribution (with or without modification), making available to the
97-public, and in some countries other activities as well.
98-
99- To "convey" a work means any kind of propagation that enables other
100-parties to make or receive copies. Mere interaction with a user through
101-a computer network, with no transfer of a copy, is not conveying.
102-
103- An interactive user interface displays "Appropriate Legal Notices"
104-to the extent that it includes a convenient and prominently visible
105-feature that (1) displays an appropriate copyright notice, and (2)
106-tells the user that there is no warranty for the work (except to the
107-extent that warranties are provided), that licensees may convey the
108-work under this License, and how to view a copy of this License. If
109-the interface presents a list of user commands or options, such as a
110-menu, a prominent item in the list meets this criterion.
111-
112- 1. Source Code.
113-
114- The "source code" for a work means the preferred form of the work
115-for making modifications to it. "Object code" means any non-source
116-form of a work.
117-
118- A "Standard Interface" means an interface that either is an official
119-standard defined by a recognized standards body, or, in the case of
120-interfaces specified for a particular programming language, one that
121-is widely used among developers working in that language.
122-
123- The "System Libraries" of an executable work include anything, other
124-than the work as a whole, that (a) is included in the normal form of
125-packaging a Major Component, but which is not part of that Major
126-Component, and (b) serves only to enable use of the work with that
127-Major Component, or to implement a Standard Interface for which an
128-implementation is available to the public in source code form. A
129-"Major Component", in this context, means a major essential component
130-(kernel, window system, and so on) of the specific operating system
131-(if any) on which the executable work runs, or a compiler used to
132-produce the work, or an object code interpreter used to run it.
133-
134- The "Corresponding Source" for a work in object code form means all
135-the source code needed to generate, install, and (for an executable
136-work) run the object code and to modify the work, including scripts to
137-control those activities. However, it does not include the work's
138-System Libraries, or general-purpose tools or generally available free
139-programs which are used unmodified in performing those activities but
140-which are not part of the work. For example, Corresponding Source
141-includes interface definition files associated with source files for
142-the work, and the source code for shared libraries and dynamically
143-linked subprograms that the work is specifically designed to require,
144-such as by intimate data communication or control flow between those
145-subprograms and other parts of the work.
146-
147- The Corresponding Source need not include anything that users
148-can regenerate automatically from other parts of the Corresponding
149-Source.
150-
151- The Corresponding Source for a work in source code form is that
152-same work.
153-
154- 2. Basic Permissions.
155-
156- All rights granted under this License are granted for the term of
157-copyright on the Program, and are irrevocable provided the stated
158-conditions are met. This License explicitly affirms your unlimited
159-permission to run the unmodified Program. The output from running a
160-covered work is covered by this License only if the output, given its
161-content, constitutes a covered work. This License acknowledges your
162-rights of fair use or other equivalent, as provided by copyright law.
163-
164- You may make, run and propagate covered works that you do not
165-convey, without conditions so long as your license otherwise remains
166-in force. You may convey covered works to others for the sole purpose
167-of having them make modifications exclusively for you, or provide you
168-with facilities for running those works, provided that you comply with
169-the terms of this License in conveying all material for which you do
170-not control copyright. Those thus making or running the covered works
171-for you must do so exclusively on your behalf, under your direction
172-and control, on terms that prohibit them from making any copies of
173-your copyrighted material outside their relationship with you.
174-
175- Conveying under any other circumstances is permitted solely under
176-the conditions stated below. Sublicensing is not allowed; section 10
177-makes it unnecessary.
178-
179- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
180-
181- No covered work shall be deemed part of an effective technological
182-measure under any applicable law fulfilling obligations under article
183-11 of the WIPO copyright treaty adopted on 20 December 1996, or
184-similar laws prohibiting or restricting circumvention of such
185-measures.
186-
187- When you convey a covered work, you waive any legal power to forbid
188-circumvention of technological measures to the extent such circumvention
189-is effected by exercising rights under this License with respect to
190-the covered work, and you disclaim any intention to limit operation or
191-modification of the work as a means of enforcing, against the work's
192-users, your or third parties' legal rights to forbid circumvention of
193-technological measures.
194-
195- 4. Conveying Verbatim Copies.
196-
197- You may convey verbatim copies of the Program's source code as you
198-receive it, in any medium, provided that you conspicuously and
199-appropriately publish on each copy an appropriate copyright notice;
200-keep intact all notices stating that this License and any
201-non-permissive terms added in accord with section 7 apply to the code;
202-keep intact all notices of the absence of any warranty; and give all
203-recipients a copy of this License along with the Program.
204-
205- You may charge any price or no price for each copy that you convey,
206-and you may offer support or warranty protection for a fee.
207-
208- 5. Conveying Modified Source Versions.
209-
210- You may convey a work based on the Program, or the modifications to
211-produce it from the Program, in the form of source code under the
212-terms of section 4, provided that you also meet all of these conditions:
213-
214- a) The work must carry prominent notices stating that you modified
215- it, and giving a relevant date.
216-
217- b) The work must carry prominent notices stating that it is
218- released under this License and any conditions added under section
219- 7. This requirement modifies the requirement in section 4 to
220- "keep intact all notices".
221-
222- c) You must license the entire work, as a whole, under this
223- License to anyone who comes into possession of a copy. This
224- License will therefore apply, along with any applicable section 7
225- additional terms, to the whole of the work, and all its parts,
226- regardless of how they are packaged. This License gives no
227- permission to license the work in any other way, but it does not
228- invalidate such permission if you have separately received it.
229-
230- d) If the work has interactive user interfaces, each must display
231- Appropriate Legal Notices; however, if the Program has interactive
232- interfaces that do not display Appropriate Legal Notices, your
233- work need not make them do so.
234-
235- A compilation of a covered work with other separate and independent
236-works, which are not by their nature extensions of the covered work,
237-and which are not combined with it such as to form a larger program,
238-in or on a volume of a storage or distribution medium, is called an
239-"aggregate" if the compilation and its resulting copyright are not
240-used to limit the access or legal rights of the compilation's users
241-beyond what the individual works permit. Inclusion of a covered work
242-in an aggregate does not cause this License to apply to the other
243-parts of the aggregate.
244-
245- 6. Conveying Non-Source Forms.
246-
247- You may convey a covered work in object code form under the terms
248-of sections 4 and 5, provided that you also convey the
249-machine-readable Corresponding Source under the terms of this License,
250-in one of these ways:
251-
252- a) Convey the object code in, or embodied in, a physical product
253- (including a physical distribution medium), accompanied by the
254- Corresponding Source fixed on a durable physical medium
255- customarily used for software interchange.
256-
257- b) Convey the object code in, or embodied in, a physical product
258- (including a physical distribution medium), accompanied by a
259- written offer, valid for at least three years and valid for as
260- long as you offer spare parts or customer support for that product
261- model, to give anyone who possesses the object code either (1) a
262- copy of the Corresponding Source for all the software in the
263- product that is covered by this License, on a durable physical
264- medium customarily used for software interchange, for a price no
265- more than your reasonable cost of physically performing this
266- conveying of source, or (2) access to copy the
267- Corresponding Source from a network server at no charge.
268-
269- c) Convey individual copies of the object code with a copy of the
270- written offer to provide the Corresponding Source. This
271- alternative is allowed only occasionally and noncommercially, and
272- only if you received the object code with such an offer, in accord
273- with subsection 6b.
274-
275- d) Convey the object code by offering access from a designated
276- place (gratis or for a charge), and offer equivalent access to the
277- Corresponding Source in the same way through the same place at no
278- further charge. You need not require recipients to copy the
279- Corresponding Source along with the object code. If the place to
280- copy the object code is a network server, the Corresponding Source
281- may be on a different server (operated by you or a third party)
282- that supports equivalent copying facilities, provided you maintain
283- clear directions next to the object code saying where to find the
284- Corresponding Source. Regardless of what server hosts the
285- Corresponding Source, you remain obligated to ensure that it is
286- available for as long as needed to satisfy these requirements.
287-
288- e) Convey the object code using peer-to-peer transmission, provided
289- you inform other peers where the object code and Corresponding
290- Source of the work are being offered to the general public at no
291- charge under subsection 6d.
292-
293- A separable portion of the object code, whose source code is excluded
294-from the Corresponding Source as a System Library, need not be
295-included in conveying the object code work.
296-
297- A "User Product" is either (1) a "consumer product", which means any
298-tangible personal property which is normally used for personal, family,
299-or household purposes, or (2) anything designed or sold for incorporation
300-into a dwelling. In determining whether a product is a consumer product,
301-doubtful cases shall be resolved in favor of coverage. For a particular
302-product received by a particular user, "normally used" refers to a
303-typical or common use of that class of product, regardless of the status
304-of the particular user or of the way in which the particular user
305-actually uses, or expects or is expected to use, the product. A product
306-is a consumer product regardless of whether the product has substantial
307-commercial, industrial or non-consumer uses, unless such uses represent
308-the only significant mode of use of the product.
309-
310- "Installation Information" for a User Product means any methods,
311-procedures, authorization keys, or other information required to install
312-and execute modified versions of a covered work in that User Product from
313-a modified version of its Corresponding Source. The information must
314-suffice to ensure that the continued functioning of the modified object
315-code is in no case prevented or interfered with solely because
316-modification has been made.
317-
318- If you convey an object code work under this section in, or with, or
319-specifically for use in, a User Product, and the conveying occurs as
320-part of a transaction in which the right of possession and use of the
321-User Product is transferred to the recipient in perpetuity or for a
322-fixed term (regardless of how the transaction is characterized), the
323-Corresponding Source conveyed under this section must be accompanied
324-by the Installation Information. But this requirement does not apply
325-if neither you nor any third party retains the ability to install
326-modified object code on the User Product (for example, the work has
327-been installed in ROM).
328-
329- The requirement to provide Installation Information does not include a
330-requirement to continue to provide support service, warranty, or updates
331-for a work that has been modified or installed by the recipient, or for
332-the User Product in which it has been modified or installed. Access to a
333-network may be denied when the modification itself materially and
334-adversely affects the operation of the network or violates the rules and
335-protocols for communication across the network.
336-
337- Corresponding Source conveyed, and Installation Information provided,
338-in accord with this section must be in a format that is publicly
339-documented (and with an implementation available to the public in
340-source code form), and must require no special password or key for
341-unpacking, reading or copying.
342-
343- 7. Additional Terms.
344-
345- "Additional permissions" are terms that supplement the terms of this
346-License by making exceptions from one or more of its conditions.
347-Additional permissions that are applicable to the entire Program shall
348-be treated as though they were included in this License, to the extent
349-that they are valid under applicable law. If additional permissions
350-apply only to part of the Program, that part may be used separately
351-under those permissions, but the entire Program remains governed by
352-this License without regard to the additional permissions.
353-
354- When you convey a copy of a covered work, you may at your option
355-remove any additional permissions from that copy, or from any part of
356-it. (Additional permissions may be written to require their own
357-removal in certain cases when you modify the work.) You may place
358-additional permissions on material, added by you to a covered work,
359-for which you have or can give appropriate copyright permission.
360-
361- Notwithstanding any other provision of this License, for material you
362-add to a covered work, you may (if authorized by the copyright holders of
363-that material) supplement the terms of this License with terms:
364-
365- a) Disclaiming warranty or limiting liability differently from the
366- terms of sections 15 and 16 of this License; or
367-
368- b) Requiring preservation of specified reasonable legal notices or
369- author attributions in that material or in the Appropriate Legal
370- Notices displayed by works containing it; or
371-
372- c) Prohibiting misrepresentation of the origin of that material, or
373- requiring that modified versions of such material be marked in
374- reasonable ways as different from the original version; or
375-
376- d) Limiting the use for publicity purposes of names of licensors or
377- authors of the material; or
378-
379- e) Declining to grant rights under trademark law for use of some
380- trade names, trademarks, or service marks; or
381-
382- f) Requiring indemnification of licensors and authors of that
383- material by anyone who conveys the material (or modified versions of
384- it) with contractual assumptions of liability to the recipient, for
385- any liability that these contractual assumptions directly impose on
386- those licensors and authors.
387-
388- All other non-permissive additional terms are considered "further
389-restrictions" within the meaning of section 10. If the Program as you
390-received it, or any part of it, contains a notice stating that it is
391-governed by this License along with a term that is a further
392-restriction, you may remove that term. If a license document contains
393-a further restriction but permits relicensing or conveying under this
394-License, you may add to a covered work material governed by the terms
395-of that license document, provided that the further restriction does
396-not survive such relicensing or conveying.
397-
398- If you add terms to a covered work in accord with this section, you
399-must place, in the relevant source files, a statement of the
400-additional terms that apply to those files, or a notice indicating
401-where to find the applicable terms.
402-
403- Additional terms, permissive or non-permissive, may be stated in the
404-form of a separately written license, or stated as exceptions;
405-the above requirements apply either way.
406-
407- 8. Termination.
408-
409- You may not propagate or modify a covered work except as expressly
410-provided under this License. Any attempt otherwise to propagate or
411-modify it is void, and will automatically terminate your rights under
412-this License (including any patent licenses granted under the third
413-paragraph of section 11).
414-
415- However, if you cease all violation of this License, then your
416-license from a particular copyright holder is reinstated (a)
417-provisionally, unless and until the copyright holder explicitly and
418-finally terminates your license, and (b) permanently, if the copyright
419-holder fails to notify you of the violation by some reasonable means
420-prior to 60 days after the cessation.
421-
422- Moreover, your license from a particular copyright holder is
423-reinstated permanently if the copyright holder notifies you of the
424-violation by some reasonable means, this is the first time you have
425-received notice of violation of this License (for any work) from that
426-copyright holder, and you cure the violation prior to 30 days after
427-your receipt of the notice.
428-
429- Termination of your rights under this section does not terminate the
430-licenses of parties who have received copies or rights from you under
431-this License. If your rights have been terminated and not permanently
432-reinstated, you do not qualify to receive new licenses for the same
433-material under section 10.
434-
435- 9. Acceptance Not Required for Having Copies.
436-
437- You are not required to accept this License in order to receive or
438-run a copy of the Program. Ancillary propagation of a covered work
439-occurring solely as a consequence of using peer-to-peer transmission
440-to receive a copy likewise does not require acceptance. However,
441-nothing other than this License grants you permission to propagate or
442-modify any covered work. These actions infringe copyright if you do
443-not accept this License. Therefore, by modifying or propagating a
444-covered work, you indicate your acceptance of this License to do so.
445-
446- 10. Automatic Licensing of Downstream Recipients.
447-
448- Each time you convey a covered work, the recipient automatically
449-receives a license from the original licensors, to run, modify and
450-propagate that work, subject to this License. You are not responsible
451-for enforcing compliance by third parties with this License.
452-
453- An "entity transaction" is a transaction transferring control of an
454-organization, or substantially all assets of one, or subdividing an
455-organization, or merging organizations. If propagation of a covered
456-work results from an entity transaction, each party to that
457-transaction who receives a copy of the work also receives whatever
458-licenses to the work the party's predecessor in interest had or could
459-give under the previous paragraph, plus a right to possession of the
460-Corresponding Source of the work from the predecessor in interest, if
461-the predecessor has it or can get it with reasonable efforts.
462-
463- You may not impose any further restrictions on the exercise of the
464-rights granted or affirmed under this License. For example, you may
465-not impose a license fee, royalty, or other charge for exercise of
466-rights granted under this License, and you may not initiate litigation
467-(including a cross-claim or counterclaim in a lawsuit) alleging that
468-any patent claim is infringed by making, using, selling, offering for
469-sale, or importing the Program or any portion of it.
470-
471- 11. Patents.
472-
473- A "contributor" is a copyright holder who authorizes use under this
474-License of the Program or a work on which the Program is based. The
475-work thus licensed is called the contributor's "contributor version".
476-
477- A contributor's "essential patent claims" are all patent claims
478-owned or controlled by the contributor, whether already acquired or
479-hereafter acquired, that would be infringed by some manner, permitted
480-by this License, of making, using, or selling its contributor version,
481-but do not include claims that would be infringed only as a
482-consequence of further modification of the contributor version. For
483-purposes of this definition, "control" includes the right to grant
484-patent sublicenses in a manner consistent with the requirements of
485-this License.
486-
487- Each contributor grants you a non-exclusive, worldwide, royalty-free
488-patent license under the contributor's essential patent claims, to
489-make, use, sell, offer for sale, import and otherwise run, modify and
490-propagate the contents of its contributor version.
491-
492- In the following three paragraphs, a "patent license" is any express
493-agreement or commitment, however denominated, not to enforce a patent
494-(such as an express permission to practice a patent or covenant not to
495-sue for patent infringement). To "grant" such a patent license to a
496-party means to make such an agreement or commitment not to enforce a
497-patent against the party.
498-
499- If you convey a covered work, knowingly relying on a patent license,
500-and the Corresponding Source of the work is not available for anyone
501-to copy, free of charge and under the terms of this License, through a
502-publicly available network server or other readily accessible means,
503-then you must either (1) cause the Corresponding Source to be so
504-available, or (2) arrange to deprive yourself of the benefit of the
505-patent license for this particular work, or (3) arrange, in a manner
506-consistent with the requirements of this License, to extend the patent
507-license to downstream recipients. "Knowingly relying" means you have
508-actual knowledge that, but for the patent license, your conveying the
509-covered work in a country, or your recipient's use of the covered work
510-in a country, would infringe one or more identifiable patents in that
511-country that you have reason to believe are valid.
512-
513- If, pursuant to or in connection with a single transaction or
514-arrangement, you convey, or propagate by procuring conveyance of, a
515-covered work, and grant a patent license to some of the parties
516-receiving the covered work authorizing them to use, propagate, modify
517-or convey a specific copy of the covered work, then the patent license
518-you grant is automatically extended to all recipients of the covered
519-work and works based on it.
520-
521- A patent license is "discriminatory" if it does not include within
522-the scope of its coverage, prohibits the exercise of, or is
523-conditioned on the non-exercise of one or more of the rights that are
524-specifically granted under this License. You may not convey a covered
525-work if you are a party to an arrangement with a third party that is
526-in the business of distributing software, under which you make payment
527-to the third party based on the extent of your activity of conveying
528-the work, and under which the third party grants, to any of the
529-parties who would receive the covered work from you, a discriminatory
530-patent license (a) in connection with copies of the covered work
531-conveyed by you (or copies made from those copies), or (b) primarily
532-for and in connection with specific products or compilations that
533-contain the covered work, unless you entered into that arrangement,
534-or that patent license was granted, prior to 28 March 2007.
535-
536- Nothing in this License shall be construed as excluding or limiting
537-any implied license or other defenses to infringement that may
538-otherwise be available to you under applicable patent law.
539-
540- 12. No Surrender of Others' Freedom.
541-
542- If conditions are imposed on you (whether by court order, agreement or
543-otherwise) that contradict the conditions of this License, they do not
544-excuse you from the conditions of this License. If you cannot convey a
545-covered work so as to satisfy simultaneously your obligations under this
546-License and any other pertinent obligations, then as a consequence you may
547-not convey it at all. For example, if you agree to terms that obligate you
548-to collect a royalty for further conveying from those to whom you convey
549-the Program, the only way you could satisfy both those terms and this
550-License would be to refrain entirely from conveying the Program.
551-
552- 13. Use with the GNU Affero General Public License.
553-
554- Notwithstanding any other provision of this License, you have
555-permission to link or combine any covered work with a work licensed
556-under version 3 of the GNU Affero General Public License into a single
557-combined work, and to convey the resulting work. The terms of this
558-License will continue to apply to the part which is the covered work,
559-but the special requirements of the GNU Affero General Public License,
560-section 13, concerning interaction through a network will apply to the
561-combination as such.
562-
563- 14. Revised Versions of this License.
564-
565- The Free Software Foundation may publish revised and/or new versions of
566-the GNU General Public License from time to time. Such new versions will
567-be similar in spirit to the present version, but may differ in detail to
568-address new problems or concerns.
569-
570- Each version is given a distinguishing version number. If the
571-Program specifies that a certain numbered version of the GNU General
572-Public License "or any later version" applies to it, you have the
573-option of following the terms and conditions either of that numbered
574-version or of any later version published by the Free Software
575-Foundation. If the Program does not specify a version number of the
576-GNU General Public License, you may choose any version ever published
577-by the Free Software Foundation.
578-
579- If the Program specifies that a proxy can decide which future
580-versions of the GNU General Public License can be used, that proxy's
581-public statement of acceptance of a version permanently authorizes you
582-to choose that version for the Program.
583-
584- Later license versions may give you additional or different
585-permissions. However, no additional obligations are imposed on any
586-author or copyright holder as a result of your choosing to follow a
587-later version.
588-
589- 15. Disclaimer of Warranty.
590-
591- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
592-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
593-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
594-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
595-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
596-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
597-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
598-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
599-
600- 16. Limitation of Liability.
601-
602- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
603-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
604-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
605-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
606-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
607-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
608-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
609-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
610-SUCH DAMAGES.
611-
612- 17. Interpretation of Sections 15 and 16.
613-
614- If the disclaimer of warranty and limitation of liability provided
615-above cannot be given local legal effect according to their terms,
616-reviewing courts shall apply local law that most closely approximates
617-an absolute waiver of all civil liability in connection with the
618-Program, unless a warranty or assumption of liability accompanies a
619-copy of the Program in return for a fee.
620-
621- END OF TERMS AND CONDITIONS
622-
623- How to Apply These Terms to Your New Programs
624-
625- If you develop a new program, and you want it to be of the greatest
626-possible use to the public, the best way to achieve this is to make it
627-free software which everyone can redistribute and change under these terms.
628-
629- To do so, attach the following notices to the program. It is safest
630-to attach them to the start of each source file to most effectively
631-state the exclusion of warranty; and each file should have at least
632-the "copyright" line and a pointer to where the full notice is found.
633-
634- <one line to give the program's name and a brief idea of what it does.>
635- Copyright (C) <year> <name of author>
636-
637- This program is free software: you can redistribute it and/or modify
638- it under the terms of the GNU General Public License as published by
639- the Free Software Foundation, either version 3 of the License, or
640- (at your option) any later version.
641-
642- This program is distributed in the hope that it will be useful,
643- but WITHOUT ANY WARRANTY; without even the implied warranty of
644- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
645- GNU General Public License for more details.
646-
647- You should have received a copy of the GNU General Public License
648- along with this program. If not, see <http://www.gnu.org/licenses/>.
649-
650-Also add information on how to contact you by electronic and paper mail.
651-
652- If the program does terminal interaction, make it output a short
653-notice like this when it starts in an interactive mode:
654-
655- <program> Copyright (C) <year> <name of author>
656- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657- This is free software, and you are welcome to redistribute it
658- under certain conditions; type `show c' for details.
659-
660-The hypothetical commands `show w' and `show c' should show the appropriate
661-parts of the General Public License. Of course, your program's commands
662-might be different; for a GUI interface, you would use an "about box".
663-
664- You should also get your employer (if you work as a programmer) or school,
665-if any, to sign a "copyright disclaimer" for the program, if necessary.
666-For more information on this, and how to apply and follow the GNU GPL, see
667-<http://www.gnu.org/licenses/>.
668-
669- The GNU General Public License does not permit incorporating your program
670-into proprietary programs. If your program is a subroutine library, you
671-may consider it more useful to permit linking proprietary applications with
672-the library. If this is what you want to do, use the GNU Lesser General
673-Public License instead of this License. But first, please read
674-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
12+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
13+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
14+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
15+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
--- unittests/src/main.cpp (revision 124)
+++ unittests/src/main.cpp (revision 125)
@@ -37,8 +37,6 @@
3737 MAP_TESTS();
3838 STRING_TESTS();
3939
40- //Test_DTSConditionalStructing();
41-
4240 // Done.
4341 return 0;
4442 }
\ No newline at end of file
--- unittests/src/dynamictypesystem.cpp (revision 124)
+++ unittests/src/dynamictypesystem.cpp (revision 125)
@@ -2,30 +2,38 @@
22 #include <sdk/MemoryUtils.stream.h>
33 #include <sdk/DynamicTypeSystem.h>
44
5-void Test_DTSConditionalStructing( void )
5+#include <sdk/rwlist.hpp>
6+#include <sdk/OSUtils.memheap.h>
7+#include <sdk/eirutils.h>
8+
9+DEFINE_HEAP_REDIR_ALLOC( dtsHeapAllocator );
10+
11+typedef DynamicTypeSystem <dtsHeapAllocator, void, dtsDefaultLockProvider> testTypeSystem_t;
12+
13+struct dtsStruct
614 {
7- struct dtsHeapAllocator
8- {
9- inline void* Allocate( size_t memSize )
10- {
11- return malloc( memSize );
12- }
15+ NativeHeapAllocator heapAlloc;
16+ testTypeSystem_t typeSystem;
17+};
1318
14- inline void Free( void *memPtr, size_t memSize )
15- {
16- return free( memPtr );
17- }
18- };
19+IMPL_HEAP_REDIR_ALLOC( dtsHeapAllocator, dtsStruct, typeSystem, heapAlloc );
1920
20- dtsHeapAllocator _memAlloc;
21+DEFINE_HEAP_REDIR_ALLOC( condDTSHeapAllocator );
2122
22- typedef DynamicTypeSystem <dtsHeapAllocator, void, dtsDefaultLockProvider, conditionalStructRegistryFlavor> testTypeSystem_t;
23+typedef DynamicTypeSystem <condDTSHeapAllocator, void, dtsDefaultLockProvider, conditionalStructRegistryFlavor> condTypeSystem_t;
2324
24- testTypeSystem_t typeSystem;
25+struct dtsCondStruct
26+{
27+ NativeHeapAllocator heapAlloc;
28+ condTypeSystem_t typeSystem;
29+};
2530
26- // Initialize the typeSystem.
27- typeSystem._memAlloc = &_memAlloc;
31+IMPL_HEAP_REDIR_ALLOC( condDTSHeapAllocator, dtsCondStruct, typeSystem, heapAlloc );
2832
33+void Test_DTSConditionalStructing( void )
34+{
35+ dtsCondStruct dtsHost;
36+
2937 // We create two types that have different plugins attached to them, depending on the runtime.
3038 struct test_type_construct_params
3139 {
@@ -54,7 +62,7 @@
5462 bool isTestPluginAvailable;
5563 };
5664
57- testTypeSystem_t::typeInfoBase *primTypeInfo = typeSystem.RegisterStructType <my_test_type> ( "test_type", NULL );
65+ auto *primTypeInfo = dtsHost.typeSystem.RegisterStructType <my_test_type> ( "test_type", NULL );
5866
5967 assert( primTypeInfo != NULL );
6068
@@ -74,14 +82,14 @@
7482 int theRealDeal = 42;
7583 };
7684
77- struct my_test_plugin_availability : public testTypeSystem_t::conditionalPluginStructInterface
85+ struct my_test_plugin_availability : public condTypeSystem_t::conditionalPluginStructInterface
7886 {
79- bool IsPluginAvailableDuringRuntime( testTypeSystem_t::pluginDescriptor desc ) const override
87+ bool IsPluginAvailableDuringRuntime( condTypeSystem_t::pluginDescriptor desc ) const override
8088 {
8189 return isPluginAvailable;
8290 }
8391
84- bool IsPluginAvailableAtObject( const GenericRTTI *rtObj, testTypeSystem_t::pluginDescriptor desc ) const override
92+ bool IsPluginAvailableAtObject( const GenericRTTI *rtObj, condTypeSystem_t::pluginDescriptor desc ) const override
8593 {
8694 testTypeSystem_t::typeInfoBase *typeInfo = testTypeSystem_t::GetTypeInfoFromTypeStruct( rtObj );
8795
@@ -101,8 +109,8 @@
101109 my_test_plugin_availability tplug_avail;
102110 tplug_avail.isPluginAvailable = true;
103111
104- testTypeSystem_t::pluginOffset_t pluginOff = typeSystem.RegisterDependantConditionalStructPlugin <my_test_plugin> ( primTypeInfo, testTypeSystem_t::ANONYMOUS_PLUGIN_ID, &tplug_avail );
105- (void)pluginOff;
112+ auto pluginOff = dtsHost.typeSystem.RegisterDependantConditionalStructPlugin <my_test_plugin> ( primTypeInfo, condTypeSystem_t::ANONYMOUS_PLUGIN_ID, &tplug_avail );
113+ (void)pluginOff;
106114
107115 GenericRTTI *firstObj;
108116 {
@@ -110,7 +118,7 @@
110118 cparams.take_num = 1337.9001;
111119 cparams.isTestPluginAvailable = tplug_avail.isPluginAvailable;
112120
113- firstObj = typeSystem.Construct( NULL, primTypeInfo, &cparams );
121+ firstObj = dtsHost.typeSystem.Construct( NULL, primTypeInfo, &cparams );
114122 }
115123
116124 assert( firstObj != NULL );
@@ -124,12 +132,12 @@
124132 cparams.take_num = 0xCAFEBABE;
125133 cparams.isTestPluginAvailable = tplug_avail.isPluginAvailable;
126134
127- secObj = typeSystem.Construct( NULL, primTypeInfo, &cparams );
135+ secObj = dtsHost.typeSystem.Construct( NULL, primTypeInfo, &cparams );
128136 }
129137
130138 // Check the object sizes of both constructed objects.
131- size_t firstObjSize = typeSystem.GetTypeStructSize( NULL, firstObj );
132- size_t secObjSize = typeSystem.GetTypeStructSize( NULL, secObj );
139+ size_t firstObjSize = dtsHost.typeSystem.GetTypeStructSize( NULL, firstObj );
140+ size_t secObjSize = dtsHost.typeSystem.GetTypeStructSize( NULL, secObj );
133141
134142 assert( firstObjSize == ( sizeof(GenericRTTI) + sizeof(my_test_type) + sizeof(my_test_plugin) ) );
135143 assert( secObjSize == ( sizeof(GenericRTTI) + sizeof(my_test_type) ) );
@@ -141,11 +149,165 @@
141149 assert( firstNativeObj->num == 1337.9001 );
142150 }
143151
144- typeSystem.Destroy( NULL, secObj );
145- typeSystem.Destroy( NULL, firstObj );
152+ dtsHost.typeSystem.Destroy( NULL, secObj );
153+ dtsHost.typeSystem.Destroy( NULL, firstObj );
146154 }
147155
148156 void DTS_TESTS( void )
149157 {
150158 //Test_DTSConditionalStructing();
151-}
159+
160+ // Some object to test DTS with.
161+ struct testObject
162+ {
163+ inline testObject( void *sysPtr, void *cparams )
164+ {
165+ return;
166+ }
167+
168+ inline testObject( const testObject& right )
169+ {
170+ this->copied = true;
171+ }
172+
173+ inline ~testObject( void )
174+ {
175+ return;
176+ }
177+
178+ bool copied = false;
179+ };
180+
181+ printf( "testing DTS object register..." );
182+ {
183+ dtsStruct dts;
184+
185+ testTypeSystem_t::typeInfoBase *typeInfo = dts.typeSystem.RegisterStructType <testObject> ( "testObject", nullptr );
186+
187+ assert( typeInfo != nullptr );
188+ }
189+ printf( "ok.\n" );
190+
191+ // Now do quick tests that depend on a registered type.
192+ {
193+ dtsStruct dts;
194+
195+ auto testType = dts.typeSystem.RegisterStructType <testObject> ( "testObject", nullptr );
196+
197+ assert( testType != nullptr );
198+
199+ printf( "testing DTS object create..." );
200+ {
201+ GenericRTTI *rtObj = dts.typeSystem.Construct( nullptr, testType, nullptr );
202+
203+ assert( rtObj != nullptr );
204+ assert( testTypeSystem_t::GetTypeInfoFromTypeStruct( rtObj ) == testType );
205+
206+ testObject *obj = (testObject*)testTypeSystem_t::GetObjectFromTypeStruct( rtObj );
207+
208+ assert( obj != nullptr );
209+ assert( obj->copied == false );
210+
211+ dts.typeSystem.Destroy( nullptr, rtObj );
212+ }
213+ printf( "ok.\n" );
214+
215+ printf( "testing DTS object clone..." );
216+ {
217+ GenericRTTI *rtObj = dts.typeSystem.Construct( nullptr, testType, nullptr );
218+
219+ assert( rtObj != nullptr );
220+
221+ GenericRTTI *clonedObj = dts.typeSystem.Clone( nullptr, rtObj );
222+
223+ assert( clonedObj != nullptr );
224+ assert( testTypeSystem_t::GetTypeInfoFromTypeStruct( clonedObj ) == testTypeSystem_t::GetTypeInfoFromTypeStruct( rtObj ) );
225+
226+ dts.typeSystem.Destroy( nullptr, clonedObj );
227+ dts.typeSystem.Destroy( nullptr, rtObj );
228+ }
229+ printf( "ok.\n" );
230+
231+ // Some sort of test plugin.
232+ struct testPlugin
233+ {
234+ int value = 42;
235+ };
236+
237+ printf( "testing DTS object struct plugin..." );
238+ {
239+ testTypeSystem_t::pluginOffset_t pluginOff = dts.typeSystem.RegisterStructPlugin <testPlugin> ( testType );
240+
241+ assert( testTypeSystem_t::IsOffsetValid( pluginOff ) == true );
242+
243+ GenericRTTI *rtObj = dts.typeSystem.Construct( nullptr, testType, nullptr );
244+
245+ assert( rtObj != nullptr );
246+
247+ testPlugin *plugin = testTypeSystem_t::RESOLVE_STRUCT <testPlugin> ( nullptr, rtObj, testType, pluginOff );
248+
249+ assert( plugin != nullptr );
250+ assert( plugin->value == 42 );
251+
252+ dts.typeSystem.Destroy( nullptr, rtObj );
253+
254+ dts.typeSystem.UnregisterPlugin( testType, pluginOff );
255+ }
256+ printf( "ok.\n" );
257+
258+ // An invalid plugin.
259+ struct testPluginInvalid
260+ {
261+ inline testPluginInvalid( void )
262+ {
263+ throw 1;
264+ }
265+ };
266+
267+ printf( "testing DTS object struct plugin invalid..." );
268+ {
269+ auto pluginOff = dts.typeSystem.RegisterStructPlugin <testPluginInvalid> ( testType );
270+
271+ assert( testTypeSystem_t::IsOffsetValid( pluginOff ) == true );
272+
273+ GenericRTTI *rtObj = dts.typeSystem.Construct( nullptr, testType, nullptr );
274+
275+ assert( rtObj == nullptr );
276+
277+ dts.typeSystem.UnregisterPlugin( testType, pluginOff );
278+ }
279+ printf( "ok.\n" );
280+
281+ // A dependant struct plugin.
282+ struct depTestPlugin
283+ {
284+ inline void Initialize( GenericRTTI *rtObj )
285+ {
286+ return;
287+ }
288+
289+ inline void Shutdown( GenericRTTI *rtObj )
290+ {
291+ return;
292+ }
293+ };
294+
295+ printf( "testing DTS object dependant struct plugin..." );
296+ {
297+ auto pluginOff = dts.typeSystem.RegisterDependantStructPlugin <depTestPlugin> ( testType );
298+
299+ assert( testTypeSystem_t::IsOffsetValid( pluginOff ) == true );
300+
301+ GenericRTTI *rtObj = dts.typeSystem.Construct( nullptr, testType, nullptr );
302+
303+ assert( rtObj != nullptr );
304+
305+ dts.typeSystem.Destroy( nullptr, rtObj );
306+
307+ dts.typeSystem.UnregisterPlugin( testType, pluginOff );
308+ }
309+ printf( "ok.\n" );
310+
311+ // Clean-up is done automatically.
312+ }
313+}
--- unittests/src/heaptests.cpp (revision 124)
+++ unittests/src/heaptests.cpp (revision 125)
@@ -181,4 +181,23 @@
181181 assert( heap2.GetStatistics().usedBytes == 0 );
182182 }
183183 printf( "ok.\n" );
184+
185+ printf( "testing native heap allocator walking..." );
186+ {
187+ NativeHeapAllocator heap;
188+
189+ void *oneMem = heap.Allocate( 588 );
190+
191+ assert( oneMem != nullptr );
192+ assert( heap.GetStatistics().countOfAllocations == 1 );
193+
194+ heap.WalkAllocations(
195+ [&]( void *objPtr )
196+ {
197+ assert( objPtr == oneMem );
198+ });
199+
200+ heap.Free( oneMem );
201+ }
202+ printf( "ok.\n" );
184203 }
\ No newline at end of file
Show on old repository browser