Merge LGPL

indra/llcharacter/llkeyframemotion.cpp

@@ -44,7 +44,7 @@
 #include "message.h"
 #include "lltimer.h"
 
-#include <ndexceptions.h> // <FS:ND/> For nd::exceptions::xran
+#include "nd/ndexceptions.h" // <FS:ND/> For nd::exceptions::xran
 
 //-----------------------------------------------------------------------------
 // Static Definitions

indra/llcommon/CMakeLists.txt

@@ -266,8 +266,9 @@ set(llcommon_HEADER_FILES
     )
 
 # <FS:ND> Add all nd* files. memory pool, intrinsics, ...
-set(llcommon_ND_SOURCE_FILES ndallocators.cpp ndintrin.cpp ndmemorypool.cpp ndexceptions.cpp ndmallocstats.cpp ndfile.cpp )
-set(llcommon_ND_HEADER_FILES ndintrin.h ndlocks.h ndmemory.h ndmemorypool.h ndpooldefines.h ndexceptions.h ndmallocstats.h ndstackwalk.h ndcallstack.h ndobjectpool.h ndstlallocator.h ndfile.h )
+
+FILE( GLOB llcommon_ND_SOURCE_FILES nd/nd*.cpp )
+FILE( GLOB llcommon_ND_HEADER_FILES nd/nd*.h )
 
 SOURCE_GROUP( nd FILES ${llcommon_ND_SOURCE_FILES} ${llcommon_ND_HEADER_FILES} )
 

indra/llcommon/llapr.h

@@ -275,7 +275,7 @@ void LL_COMMON_API ll_apr_assert_status(apr_status_t status, apr_dso_handle_t* h
 
 extern "C" LL_COMMON_API apr_pool_t* gAPRPoolp; // Global APR memory pool
 
-#include "ndfile.h"
+#include "nd/ndfile.h"
 typedef ll::apr::LLAPRFile LLAPRFile;
 //typedef nd::apr::ndFile LLAPRFile;
 

indra/llcommon/llmemory.cpp

@@ -47,7 +47,7 @@
 #include "llsys.h"
 #include "llframetimer.h"
 
-#include "ndmemorypool.h" // <FS:ND/> tcmalloc replacement
+#include "nd/ndmemorypool.h" // <FS:ND/> tcmalloc replacement
 
 //----------------------------------------------------------------------------
 

indra/llcommon/llmemory.h

@@ -38,7 +38,7 @@ class LLMutex ;
 
 // <FS:ND> No tcmalloc
 #ifdef ND_NO_TCMALLOC
-#include "ndmemory.h"
+#include "nd/ndmemory.h"
 #else
 
 inline void* ll_aligned_malloc( size_t size, int align )

indra/llcommon/llrefcount.h

@@ -28,7 +28,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "ndintrin.h" // <FS:ND/> For FAA/FAD
+#include "nd/ndintrin.h" // <FS:ND/> For FAA/FAD
 
 #define LL_REF_COUNT_DEBUG 0
 #if LL_REF_COUNT_DEBUG

indra/llcommon/llsys.cpp

@@ -93,7 +93,7 @@ const char MEMINFO_FILE[] = "/proc/meminfo";
 extern int errno;
 #endif
 
-#include "ndmemorypool.h" // <FS:ND/> tcmalloc replacement
+#include "nd/ndmemorypool.h" // <FS:ND/> tcmalloc replacement
 
 static const S32 CPUINFO_BUFFER_SIZE = 16383;
 LLCPUInfo gSysCPU;

indra/llcommon/nd/ndallocators.cpp

@@ -29,7 +29,7 @@
 #include "ndpooldefines.h"
 #include "ndmemorypool.h"
 
-#ifdef ND_NO_TCMALLOC
+#if defined(ND_NO_TCMALLOC)
 namespace nd
 {
 	namespace allocators
@@ -56,6 +56,7 @@ namespace nd
 	}
 }
 
+#ifdef ND_OVERRIDE_NEW
 void *operator new(size_t nSize )
 {
 	return nd::allocators::malloc( nSize, 16 );
@@ -75,6 +76,7 @@ void operator delete[]( void *pMem )
 {
 	nd::allocators::free( pMem );
 }
+#endif
 
 #else
 namespace nd

indra/llcommon/nd/ndpooldefines.h

@@ -32,25 +32,30 @@
 #define BITS_PER_U8 (8)
 #define BITS_PER_U32 ( sizeof(U32) * BITS_PER_U8 )
 
+#define ND_OVERRIDE_NEW 0
+
+// Define those to log the stacktrace for allocations with certain size. You better know what you do when enabing this, ND_OVERRIDE_NEW is best set to 1
+#if 0
+ #undef ND_USE_MEMORY_POOL
+ #define ND_USE_MEMORY_POOL 1
+
+ #define LOG_ALLOCATION_STACKS
+ #define MIN_ALLOC_SIZE_FOR_LOG_STACK 32
+ #define MAX_ALLOC_SIZE_FOR_LOG_STACK 1024
+ #define LOG_STACKSIZE 16
+ #define TOP_STACKS_TO_DUMP 10
+#endif
+
 #ifdef ND_NO_TCMALLOC
-	#define MAX_PAGES (150)
-	#define POOL_CHUNK_SIZE (64)
-	#define POOL_CHUNK_ALIGNMENT (16)
-	#define PAGE_SIZE (FROM_MB(1) )
-	#define BITMAP_SIZE ( PAGE_SIZE / BITS_PER_U8 / POOL_CHUNK_SIZE )
+ #define MAX_PAGES (150)
+ #define POOL_CHUNK_SIZE (64)
+ #define POOL_CHUNK_ALIGNMENT (16)
+ #define PAGE_SIZE (FROM_MB(1) )
+ #define BITMAP_SIZE ( PAGE_SIZE / BITS_PER_U8 / POOL_CHUNK_SIZE )
 #else
-	#define MAX_PAGES (0)
+ #define MAX_PAGES (0)
 #endif
 
 #define STATS_FREQ ( 15 )
 
-// Define those to log the stacktrace for allocations with certain size. You better know what you do when enabing this
-#if 0
-	#define LOG_ALLOCATION_STACKS
-	#define MIN_ALLOC_SIZE_FOR_LOG_STACK 32
-	#define MAX_ALLOC_SIZE_FOR_LOG_STACK 1024
-	#define LOG_STACKSIZE 16
-	#define TOP_STACKS_TO_DUMP 10
-#endif
-
 #endif

indra/llmessage/lldatapacker.h

@@ -27,7 +27,7 @@
 #ifndef LL_LLDATAPACKER_H 
 #define LL_LLDATAPACKER_H
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 class LLColor4;
 class LLColor4U;

indra/llmessage/lliopipe.h

@@ -35,7 +35,7 @@
 
 #include "llsd.h"
 
-#include "ndintrin.h"
+#include "nd/ndintrin.h"
 
 class LLIOPipe;
 class LLPumpIO;

indra/llmessage/llmessagetemplate.h

@@ -31,7 +31,7 @@
 #include "message.h" // TODO: babbage: Remove...
 #include "llstl.h"
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 class LLMsgVarData
 {

indra/llmessage/lltemplatemessagedispatcher.cpp

@@ -33,7 +33,7 @@
 #include "llsd.h"
 #include "lltemplatemessagereader.h"
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 LLTemplateMessageDispatcher::LLTemplateMessageDispatcher(LLTemplateMessageReader &template_message_reader) :
 	mTemplateMessageReader(template_message_reader)

indra/llmessage/lltemplatemessagereader.cpp

@@ -38,7 +38,7 @@
 #include "v3math.h"
 #include "v4math.h"
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 LLTemplateMessageReader::LLTemplateMessageReader(message_template_number_map_t&
 												 number_template_map) :

indra/llmessage/message.cpp

@@ -81,7 +81,7 @@
 #include "v4math.h"
 #include "lltransfertargetvfile.h"
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 // Constants
 //const char* MESSAGE_LOG_FILENAME = "message.log";

indra/newview/llappviewer.cpp

@@ -242,8 +242,8 @@
 // define a self-registering event API object
 #include "llappviewerlistener.h"
 
-#include "ndmemorypool.h" // <FS:ND/> tcmalloc replacement
-#include "ndmallocstats.h" // <FS:ND/> collect stats about memory allocations
+#include "nd/ndmemorypool.h" // <FS:ND/> tcmalloc replacement
+#include "nd/ndmallocstats.h" // <FS:ND/> collect stats about memory allocations
 
 
 #if (LL_LINUX || LL_SOLARIS) && LL_GTK

indra/newview/llspatialpartition.cpp

@@ -54,7 +54,7 @@
 #include "llglslshader.h"
 #include "llviewershadermgr.h"
 
-#include "ndobjectpool.h" // <FS:ND/> For operator new/delete
+#include "nd/ndobjectpool.h" // <FS:ND/> For operator new/delete
 
 static LLFastTimer::DeclareTimer FTM_FRUSTUM_CULL("Frustum Culling");
 static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound Partition");
@@ -5088,4 +5088,4 @@ void LLDrawInfo::operator delete(void* ptr)
 	sDrawinfoPool.freeMemoryOfObject( ptr );
 }
 
-// </FS:ND>
+// </FS:ND>

indra/newview/llviewerpartsim.cpp

@@ -41,7 +41,7 @@
 #include "llspatialpartition.h"
 #include "llvovolume.h"
 
-#include "ndobjectpool.h" // <FS:ND/> For operator new/delete
+#include "nd/ndobjectpool.h" // <FS:ND/> For operator new/delete
 
 const F32 PART_SIM_BOX_SIDE = 16.f;
 const F32 PART_SIM_BOX_OFFSET = 0.5f*PART_SIM_BOX_SIDE;
@@ -856,4 +856,4 @@ void LLViewerPart::operator delete(void* ptr)
 	sViewerpartPool.freeMemoryOfObject( ptr );
 }
 
-// </FS:ND>
+// </FS:ND>

indra/newview/skins/default/xui/en/floater_about.xml

@@ -261,7 +261,7 @@ Additional code generously contributed to Firestorm by:
        top_pad="10"
        width="435"
        word_wrap="true">
-Albatroz Hird, Alexie Birman, Andromeda Rage, Armin Weatherwax, Casper Warden, Chalice Yao, Cron Stardust, Damian Zhaoying, Dawa Gurbux, Felyza Wishbringer, f0rbidden, Fractured Crystal, Hitomi Tiponi, Katharine Berry, Kittin Ninetails, Kool Koolhoven, Lance Corrimal, Magne Metaverse LLC, Magus Freston, MartinRJ Fayray, Melancholy Lemon, Miguael Liamano, Mimika Oh, Mister Acacia, Mysty Saunders, Nagi Michinaga, nhede Core, NiranV Dean, Nogardrevlis Lectar, paperwork, Peyton Menges, programmtest, Qwerty Venom, Revolution Smythe, Sahkolihaa Contepomi, sal Kaligawa, Satomi Ahn, Shin Wasp, Shyotl Kuhr, Sione Lomu, Sunset Faulkes, Thickbrick Sleaford, Vaalith Jinn, Whirly Fizzle, Zwagoth Klaar and others.
+Albatroz Hird, Alexie Birman, Andromeda Rage, Armin Weatherwax, Casper Warden, Chalice Yao, Cron Stardust, Damian Zhaoying, Dawa Gurbux, Felyza Wishbringer, f0rbidden, Fractured Crystal, Hitomi Tiponi, Katharine Berry, Kittin Ninetails, Kool Koolhoven, Lance Corrimal, Magne Metaverse LLC, Magus Freston, MartinRJ Fayray, Melancholy Lemon, Miguael Liamano, Mimika Oh, Mister Acacia, Mysty Saunders, Nagi Michinaga, Name Short, nhede Core, NiranV Dean, Nogardrevlis Lectar, paperwork, Peyton Menges, programmtest, Qwerty Venom, Revolution Smythe, Sahkolihaa Contepomi, sal Kaligawa, Satomi Ahn, Shin Wasp, Shyotl Kuhr, Sione Lomu, Skills Hak, Sunset Faulkes, Thickbrick Sleaford, Vaalith Jinn, Whirly Fizzle, Zwagoth Klaar and others.
       </text_editor>
 
       <text