aboutsummaryrefslogtreecommitdiff
path: root/mp/src/tier1
diff options
context:
space:
mode:
authorMichael Sartain <[email protected]>2014-10-02 08:25:55 -0700
committerMichael Sartain <[email protected]>2014-10-02 08:25:55 -0700
commit55ed12f8d1eb6887d348be03aee5573d44177ffb (patch)
tree3686f7ca78c780cd9a3d367b79a9d9250c1be7c0 /mp/src/tier1
parent* Added support for Visual C++ 2013 Express to VPC (diff)
downloadsource-sdk-2013-55ed12f8d1eb6887d348be03aee5573d44177ffb.tar.xz
source-sdk-2013-55ed12f8d1eb6887d348be03aee5573d44177ffb.zip
Updated the SDK with the latest code from the TF and HL2 branches.
Diffstat (limited to 'mp/src/tier1')
-rw-r--r--mp/src/tier1/KeyValues.cpp29
-rw-r--r--mp/src/tier1/characterset.cpp2
-rw-r--r--mp/src/tier1/convar.cpp19
-rw-r--r--mp/src/tier1/generichash.cpp44
-rw-r--r--mp/src/tier1/interface.cpp25
-rw-r--r--mp/src/tier1/pathmatch.cpp2
-rw-r--r--mp/src/tier1/snappy-internal.h6
-rw-r--r--mp/src/tier1/snappy-sinksource.cpp8
-rw-r--r--mp/src/tier1/snappy-stubs-internal.h219
-rw-r--r--mp/src/tier1/snappy.cpp532
-rw-r--r--mp/src/tier1/splitstring.cpp3
-rw-r--r--mp/src/tier1/strtools.cpp47
-rw-r--r--mp/src/tier1/tier1.vpc2
-rw-r--r--mp/src/tier1/utlbinaryblock.cpp116
-rw-r--r--mp/src/tier1/utlbufferutil.cpp3
-rw-r--r--mp/src/tier1/utlstring.cpp705
16 files changed, 1235 insertions, 527 deletions
diff --git a/mp/src/tier1/KeyValues.cpp b/mp/src/tier1/KeyValues.cpp
index 19d6d66c..c72172ca 100644
--- a/mp/src/tier1/KeyValues.cpp
+++ b/mp/src/tier1/KeyValues.cpp
@@ -725,7 +725,7 @@ void KeyValues::WriteConvertedString( IBaseFileSystem *filesystem, FileHandle_t
j++;
}
- INTERNALWRITE(convertedString, strlen(convertedString));
+ INTERNALWRITE(convertedString, Q_strlen(convertedString));
}
@@ -1348,8 +1348,11 @@ const char *KeyValues::GetString( const char *keyName, const char *defaultValue
Q_snprintf( buf, sizeof( buf ), "%f", dat->m_flValue );
SetString( keyName, buf );
break;
- case TYPE_INT:
case TYPE_PTR:
+ Q_snprintf( buf, sizeof( buf ), "%lld", (int64)(size_t)dat->m_pValue );
+ SetString( keyName, buf );
+ break;
+ case TYPE_INT:
Q_snprintf( buf, sizeof( buf ), "%d", dat->m_iValue );
SetString( keyName, buf );
break;
@@ -1398,8 +1401,11 @@ const wchar_t *KeyValues::GetWString( const char *keyName, const wchar_t *defaul
swprintf(wbuf, Q_ARRAYSIZE(wbuf), L"%f", dat->m_flValue);
SetWString( keyName, wbuf);
break;
- case TYPE_INT:
case TYPE_PTR:
+ swprintf( wbuf, Q_ARRAYSIZE(wbuf), L"%lld", (int64)(size_t)dat->m_pValue );
+ SetWString( keyName, wbuf );
+ break;
+ case TYPE_INT:
swprintf( wbuf, Q_ARRAYSIZE(wbuf), L"%d", dat->m_iValue );
SetWString( keyName, wbuf );
break;
@@ -1441,10 +1447,17 @@ const wchar_t *KeyValues::GetWString( const char *keyName, const wchar_t *defaul
//-----------------------------------------------------------------------------
// Purpose: Get a bool interpretation of the key.
//-----------------------------------------------------------------------------
-bool KeyValues::GetBool( const char *keyName, bool defaultValue )
+bool KeyValues::GetBool( const char *keyName, bool defaultValue, bool* optGotDefault )
{
if ( FindKey( keyName ) )
+ {
+ if ( optGotDefault )
+ (*optGotDefault) = false;
return 0 != GetInt( keyName, 0 );
+ }
+
+ if ( optGotDefault )
+ (*optGotDefault) = true;
return defaultValue;
}
@@ -1582,7 +1595,7 @@ void KeyValues::SetWString( const char *keyName, const wchar_t *value )
}
// allocate memory for the new value and copy it in
- int len = wcslen( value );
+ int len = Q_wcslen( value );
dat->m_wsValue = new wchar_t[len + 1];
Q_memcpy( dat->m_wsValue, value, (len+1) * sizeof(wchar_t) );
@@ -1828,7 +1841,7 @@ KeyValues *KeyValues::MakeCopy( void ) const
{
if ( m_wsValue )
{
- int len = wcslen( m_wsValue );
+ int len = Q_wcslen( m_wsValue );
newKeyValue->m_wsValue = new wchar_t[len+1];
Q_memcpy( newKeyValue->m_wsValue, m_wsValue, (len+1)*sizeof(wchar_t));
}
@@ -2647,13 +2660,13 @@ bool KeyValues::ReadAsBinary( CUtlBuffer &buffer, int nStackDepth )
void *KeyValues::operator new( size_t iAllocSize )
{
MEM_ALLOC_CREDIT();
- return KeyValuesSystem()->AllocKeyValuesMemory(iAllocSize);
+ return KeyValuesSystem()->AllocKeyValuesMemory( (int)iAllocSize );
}
void *KeyValues::operator new( size_t iAllocSize, int nBlockUse, const char *pFileName, int nLine )
{
MemAlloc_PushAllocDbgInfo( pFileName, nLine );
- void *p = KeyValuesSystem()->AllocKeyValuesMemory(iAllocSize);
+ void *p = KeyValuesSystem()->AllocKeyValuesMemory( (int)iAllocSize );
MemAlloc_PopAllocDbgInfo();
return p;
}
diff --git a/mp/src/tier1/characterset.cpp b/mp/src/tier1/characterset.cpp
index 01b669a4..a7c518b1 100644
--- a/mp/src/tier1/characterset.cpp
+++ b/mp/src/tier1/characterset.cpp
@@ -34,7 +34,7 @@ void CharacterSetBuild( characterset_t *pSetBuffer, const char *pszSetString )
while ( pszSetString[i] )
{
- pSetBuffer->set[ pszSetString[i] ] = 1;
+ pSetBuffer->set[ (unsigned)pszSetString[i] ] = 1;
i++;
}
diff --git a/mp/src/tier1/convar.cpp b/mp/src/tier1/convar.cpp
index c49a6efb..956ad91d 100644
--- a/mp/src/tier1/convar.cpp
+++ b/mp/src/tier1/convar.cpp
@@ -116,7 +116,7 @@ ConCommandBase::ConCommandBase( void )
//-----------------------------------------------------------------------------
ConCommandBase::ConCommandBase( const char *pName, const char *pHelpString /*=0*/, int flags /*= 0*/ )
{
- Create( pName, pHelpString, flags );
+ CreateBase( pName, pHelpString, flags );
}
//-----------------------------------------------------------------------------
@@ -153,16 +153,14 @@ CVarDLLIdentifier_t ConCommandBase::GetDLLIdentifier() const
// *pHelpString -
// flags -
//-----------------------------------------------------------------------------
-void ConCommandBase::Create( const char *pName, const char *pHelpString /*= 0*/, int flags /*= 0*/ )
+void ConCommandBase::CreateBase( const char *pName, const char *pHelpString /*= 0*/, int flags /*= 0*/ )
{
- static char *empty_string = "";
-
m_bRegistered = false;
// Name should be static data
Assert( pName );
m_pszName = pName;
- m_pszHelpString = pHelpString ? pHelpString : empty_string;
+ m_pszHelpString = pHelpString ? pHelpString : "";
m_nFlags = flags;
@@ -517,7 +515,7 @@ ConCommand::ConCommand( const char *pName, FnCommandCallbackVoid_t callback, con
m_bHasCompletionCallback = completionFunc != 0 ? true : false;
// Setup the rest
- BaseClass::Create( pName, pHelpString, flags );
+ BaseClass::CreateBase( pName, pHelpString, flags );
}
ConCommand::ConCommand( const char *pName, FnCommandCallback_t callback, const char *pHelpString /*= 0*/, int flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/ )
@@ -530,7 +528,7 @@ ConCommand::ConCommand( const char *pName, FnCommandCallback_t callback, const c
m_bUsingCommandCallbackInterface = false;
// Setup the rest
- BaseClass::Create( pName, pHelpString, flags );
+ BaseClass::CreateBase( pName, pHelpString, flags );
}
ConCommand::ConCommand( const char *pName, ICommandCallback *pCallback, const char *pHelpString /*= 0*/, int flags /*= 0*/, ICommandCompletionCallback *pCompletionCallback /*= 0*/ )
@@ -543,7 +541,7 @@ ConCommand::ConCommand( const char *pName, ICommandCallback *pCallback, const ch
m_bUsingCommandCallbackInterface = true;
// Setup the rest
- BaseClass::Create( pName, pHelpString, flags );
+ BaseClass::CreateBase( pName, pHelpString, flags );
}
//-----------------------------------------------------------------------------
@@ -976,7 +974,7 @@ void ConVar::Create( const char *pName, const char *pDefaultValue, int flags /*=
Assert( 0 );
}
- BaseClass::Create( pName, pHelpString, flags );
+ BaseClass::CreateBase( pName, pHelpString, flags );
}
//-----------------------------------------------------------------------------
@@ -1051,8 +1049,7 @@ const char *ConVar::GetDefault( void ) const
void ConVar::SetDefault( const char *pszDefault )
{
- static char *empty_string = "";
- m_pszDefaultValue = pszDefault ? pszDefault : empty_string;
+ m_pszDefaultValue = pszDefault ? pszDefault : "";
Assert( m_pszDefaultValue );
}
diff --git a/mp/src/tier1/generichash.cpp b/mp/src/tier1/generichash.cpp
index a3a4a8a5..c5d3d38e 100644
--- a/mp/src/tier1/generichash.cpp
+++ b/mp/src/tier1/generichash.cpp
@@ -142,12 +142,12 @@ unsigned FASTCALL HashStringCaselessConventional( const char *pszKey )
//-----------------------------------------------------------------------------
unsigned FASTCALL HashInt( const int n )
{
- register unsigned even, odd;
+ unsigned even, odd;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
@@ -159,16 +159,16 @@ unsigned FASTCALL HashInt( const int n )
//-----------------------------------------------------------------------------
unsigned FASTCALL Hash4( const void *pKey )
{
- register const uint32 * p = (const uint32 *) pKey;
- register unsigned even,
- odd,
- n;
+ const uint32 * p = (const uint32 *) pKey;
+ unsigned even,
+ odd,
+ n;
n = *p;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
@@ -181,16 +181,16 @@ unsigned FASTCALL Hash4( const void *pKey )
//-----------------------------------------------------------------------------
unsigned FASTCALL Hash8( const void *pKey )
{
- register const uint32 * p = (const uint32 *) pKey;
- register unsigned even,
- odd,
- n;
+ const uint32 * p = (const uint32 *) pKey;
+ unsigned even,
+ odd,
+ n;
n = *p;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
@@ -209,16 +209,16 @@ unsigned FASTCALL Hash8( const void *pKey )
//-----------------------------------------------------------------------------
unsigned FASTCALL Hash12( const void *pKey )
{
- register const uint32 * p = (const uint32 *) pKey;
- register unsigned even,
- odd,
- n;
+ const uint32 * p = (const uint32 *) pKey;
+ unsigned even,
+ odd,
+ n;
n = *p;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
@@ -243,16 +243,16 @@ unsigned FASTCALL Hash12( const void *pKey )
//-----------------------------------------------------------------------------
unsigned FASTCALL Hash16( const void *pKey )
{
- register const uint32 * p = (const uint32 *) pKey;
- register unsigned even,
- odd,
- n;
+ const uint32 * p = (const uint32 *) pKey;
+ unsigned even,
+ odd,
+ n;
n = *p;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
diff --git a/mp/src/tier1/interface.cpp b/mp/src/tier1/interface.cpp
index c221ac87..c970e5c6 100644
--- a/mp/src/tier1/interface.cpp
+++ b/mp/src/tier1/interface.cpp
@@ -143,6 +143,7 @@ static void *Sys_GetProcAddress( const char *pModuleName, const char *pName )
#endif
}
+#if !defined(LINUX)
static void *Sys_GetProcAddress( HMODULE hModule, const char *pName )
{
#ifdef WIN32
@@ -151,6 +152,7 @@ static void *Sys_GetProcAddress( HMODULE hModule, const char *pName )
return (void *)dlsym( (void *)hModule, pName );
#endif
}
+#endif
bool Sys_IsDebuggerPresent()
{
@@ -540,3 +542,26 @@ void CDllDemandLoader::Unload()
m_hModule = 0;
}
}
+
+#if defined( STAGING_ONLY ) && defined( _WIN32 )
+
+typedef USHORT( WINAPI RtlCaptureStackBackTrace_FUNC )(
+ ULONG frames_to_skip,
+ ULONG frames_to_capture,
+ PVOID *backtrace,
+ PULONG backtrace_hash );
+
+extern "C" int backtrace( void **buffer, int size )
+{
+ HMODULE hNTDll = GetModuleHandleA( "ntdll.dll" );
+ static RtlCaptureStackBackTrace_FUNC * const pfnRtlCaptureStackBackTrace =
+ ( RtlCaptureStackBackTrace_FUNC * )GetProcAddress( hNTDll, "RtlCaptureStackBackTrace" );
+
+ if ( !pfnRtlCaptureStackBackTrace )
+ return 0;
+
+ return (int)pfnRtlCaptureStackBackTrace( 2, size, buffer, 0 );
+}
+
+#endif // STAGING_ONLY && _WIN32
+
diff --git a/mp/src/tier1/pathmatch.cpp b/mp/src/tier1/pathmatch.cpp
index c29c6ed3..f828a9ae 100644
--- a/mp/src/tier1/pathmatch.cpp
+++ b/mp/src/tier1/pathmatch.cpp
@@ -316,6 +316,7 @@ inline __attribute__ ((always_inline)) static int utf8casecmp_loop(const uint32_
}
}
+#ifdef UTF8_PATHMATCH
static int utf8casecmp(const char *str1, const char *str2)
{
uint32_t *folded1 = fold_utf8(str1);
@@ -325,6 +326,7 @@ static int utf8casecmp(const char *str1, const char *str2)
delete[] folded2;
return retval;
}
+#endif
// Simple object to help make sure a DIR* from opendir
// gets closed when it goes out of scope.
diff --git a/mp/src/tier1/snappy-internal.h b/mp/src/tier1/snappy-internal.h
index 8bc4a529..c99d3313 100644
--- a/mp/src/tier1/snappy-internal.h
+++ b/mp/src/tier1/snappy-internal.h
@@ -50,7 +50,7 @@ class WorkingMemory {
uint16 small_table_[1<<10]; // 2KB
uint16* large_table_; // Allocated only when needed
- SNAPPY_DISALLOW_COPY_AND_ASSIGN(WorkingMemory);
+ DISALLOW_COPY_AND_ASSIGN(WorkingMemory);
};
// Flat array compression that does not emit the "uncompressed length"
@@ -85,7 +85,7 @@ char* CompressFragment(const char* input,
static inline int FindMatchLength(const char* s1,
const char* s2,
const char* s2_limit) {
- DCHECK_GE(s2_limit, s2);
+ assert(s2_limit >= s2);
int matched = 0;
// Find out how long the match is. We loop over the data 64 bits at a
@@ -122,7 +122,7 @@ static inline int FindMatchLength(const char* s1,
const char* s2,
const char* s2_limit) {
// Implementation based on the x86-64 version, above.
- DCHECK_GE(s2_limit, s2);
+ assert(s2_limit >= s2);
int matched = 0;
while (s2 <= s2_limit - 4 &&
diff --git a/mp/src/tier1/snappy-sinksource.cpp b/mp/src/tier1/snappy-sinksource.cpp
index 2dd88a36..8e868bb4 100644
--- a/mp/src/tier1/snappy-sinksource.cpp
+++ b/mp/src/tier1/snappy-sinksource.cpp
@@ -36,7 +36,8 @@ Source::~Source() { }
Sink::~Sink() { }
-char* Sink::GetAppendBuffer(size_t, char* scratch) {
+char* Sink::GetAppendBuffer(size_t length, char* scratch) {
+ (void)length;
return scratch;
}
@@ -64,9 +65,10 @@ void UncheckedByteArraySink::Append(const char* data, size_t n) {
dest_ += n;
}
-char* UncheckedByteArraySink::GetAppendBuffer(size_t, char*) {
+char* UncheckedByteArraySink::GetAppendBuffer(size_t len, char* scratch) {
+ (void)scratch;
+ (void)len;
return dest_;
}
-
}
diff --git a/mp/src/tier1/snappy-stubs-internal.h b/mp/src/tier1/snappy-stubs-internal.h
index ec5d1018..1413825a 100644
--- a/mp/src/tier1/snappy-stubs-internal.h
+++ b/mp/src/tier1/snappy-stubs-internal.h
@@ -37,18 +37,18 @@
#include "tier0/platform.h"
-// don't use iostream, this make us fail to run under OS X 10.5
-//#include <iostream>
#include <string>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_SYS_MMAN
+#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif
+#include "snappy-stubs-public.h"
+
#if defined(__x86_64__)
// Enable 64-bit optimized versions of some routines.
@@ -65,13 +65,13 @@
// header file is never used from any public header files.
using namespace std;
-// We only define ARRAYSIZE if it isn't already defined, because this definition
-// is not very good.
-#ifndef ARRAYSIZE
// The size of an array, if known at compile-time.
// Will give unexpected results if used on a pointer.
-#define ARRAYSIZE(a) (sizeof(a) / sizeof(*(a)))
+// We undefine it first, since some compilers already have a definition.
+#ifdef ARRAYSIZE
+#undef ARRAYSIZE
#endif
+#define ARRAYSIZE(a) (sizeof(a) / sizeof(*(a)))
// Static prediction hints.
#ifdef HAVE_BUILTIN_EXPECT
@@ -87,117 +87,19 @@ using namespace std;
// version (anyone who wants to regenerate it can just do the call
// themselves within main()).
#define DEFINE_bool(flag_name, default_value, description) \
- bool FLAGS_ ## flag_name = default_value;
+ bool FLAGS_ ## flag_name = default_value
#define DECLARE_bool(flag_name) \
- extern bool FLAGS_ ## flag_name;
-#define REGISTER_MODULE_INITIALIZER(name, code)
-
-#define SNAPPY_DISALLOW_COPY_AND_ASSIGN(TypeName) \
- TypeName(const TypeName&); \
- void operator=(const TypeName&)
+ extern bool FLAGS_ ## flag_name
namespace snappy {
static const uint32 kuint32max = static_cast<uint32>(0xFFFFFFFF);
static const int64 kint64max = static_cast<int64>(0x7FFFFFFFFFFFFFFFLL);
-// Logging.
-
-#define LOG(level) LogMessage()
-#define VLOG(level) true ? (void)0 : \
- snappy::LogMessageVoidify() & snappy::LogMessage()
-
-class LogMessage {
- public:
- LogMessage() { }
- ~LogMessage() {
- fprintf( stderr, "\n" );
- //cerr << endl;
- }
-
- LogMessage& operator<<(const std::string& msg) {
- //cerr << msg;
- fprintf( stderr, "%s", msg.c_str() );
-
- return *this;
- }
- LogMessage& operator<<(int x) {
- fprintf( stderr, "%d", x );
- //cerr << x;
- return *this;
- }
-};
-
-// Asserts, both versions activated in debug mode only,
-// and ones that are always active.
-
-#define CRASH_UNLESS(condition) \
- PREDICT_TRUE(condition) ? (void)0 : \
- snappy::LogMessageVoidify() & snappy::LogMessageCrash()
-
-class LogMessageCrash : public LogMessage {
- public:
- LogMessageCrash() { }
-#if _MSC_VER == 1700 || _MSC_VER == 1800
-// Bogus warning from VS 2012 and VS 2013:
-// warning C4722: 'snappy::LogMessageCrash::~LogMessageCrash' : destructor never returns, potential memory leak
-#pragma warning(push)
-#pragma warning(disable : 4722)
-#endif
- ~LogMessageCrash() {
- fprintf( stderr, "\n" );
-// cerr << endl;
- abort();
- }
-};
-#if _MSC_VER == 1700 || _MSC_VER == 1800
-#pragma warning(pop)
-#endif
-
-// This class is used to explicitly ignore values in the conditional
-// logging macros. This avoids compiler warnings like "value computed
-// is not used" and "statement has no effect".
-
-class LogMessageVoidify {
- public:
- LogMessageVoidify() { }
- // This has to be an operator with a precedence lower than << but
- // higher than ?:
- void operator&(const LogMessage&) { }
-};
-
-#define CHECK(cond) CRASH_UNLESS(cond)
-#define CHECK_LE(a, b) CRASH_UNLESS((a) <= (b))
-#define CHECK_GE(a, b) CRASH_UNLESS((a) >= (b))
-#define CHECK_EQ(a, b) CRASH_UNLESS((a) == (b))
-#define CHECK_NE(a, b) CRASH_UNLESS((a) != (b))
-#define CHECK_LT(a, b) CRASH_UNLESS((a) < (b))
-#define CHECK_GT(a, b) CRASH_UNLESS((a) > (b))
-
-#ifdef NDEBUG
-
-#define DCHECK(cond) CRASH_UNLESS(true)
-#define DCHECK_LE(a, b) CRASH_UNLESS(true)
-#define DCHECK_GE(a, b) CRASH_UNLESS(true)
-#define DCHECK_EQ(a, b) CRASH_UNLESS(true)
-#define DCHECK_NE(a, b) CRASH_UNLESS(true)
-#define DCHECK_LT(a, b) CRASH_UNLESS(true)
-#define DCHECK_GT(a, b) CRASH_UNLESS(true)
-
-#else
-
-#define DCHECK(cond) CHECK(cond)
-#define DCHECK_LE(a, b) CHECK_LE(a, b)
-#define DCHECK_GE(a, b) CHECK_GE(a, b)
-#define DCHECK_EQ(a, b) CHECK_EQ(a, b)
-#define DCHECK_NE(a, b) CHECK_NE(a, b)
-#define DCHECK_LT(a, b) CHECK_LT(a, b)
-#define DCHECK_GT(a, b) CHECK_GT(a, b)
-
-#endif
-
// Potentially unaligned loads and stores.
+// x86 and PowerPC can simply do these loads and stores native.
+
#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__)
#define UNALIGNED_LOAD16(_p) (*reinterpret_cast<const uint16 *>(_p))
@@ -208,6 +110,49 @@ class LogMessageVoidify {
#define UNALIGNED_STORE32(_p, _val) (*reinterpret_cast<uint32 *>(_p) = (_val))
#define UNALIGNED_STORE64(_p, _val) (*reinterpret_cast<uint64 *>(_p) = (_val))
+// ARMv7 and newer support native unaligned accesses, but only of 16-bit
+// and 32-bit values (not 64-bit); older versions either raise a fatal signal,
+// do an unaligned read and rotate the words around a bit, or do the reads very
+// slowly (trip through kernel mode). There's no simple #define that says just
+// “ARMv7 or higher”, so we have to filter away all ARMv5 and ARMv6
+// sub-architectures.
+//
+// This is a mess, but there's not much we can do about it.
+
+#elif defined(__arm__) && \
+ !defined(__ARM_ARCH_4__) && \
+ !defined(__ARM_ARCH_4T__) && \
+ !defined(__ARM_ARCH_5__) && \
+ !defined(__ARM_ARCH_5T__) && \
+ !defined(__ARM_ARCH_5TE__) && \
+ !defined(__ARM_ARCH_5TEJ__) && \
+ !defined(__ARM_ARCH_6__) && \
+ !defined(__ARM_ARCH_6J__) && \
+ !defined(__ARM_ARCH_6K__) && \
+ !defined(__ARM_ARCH_6Z__) && \
+ !defined(__ARM_ARCH_6ZK__) && \
+ !defined(__ARM_ARCH_6T2__)
+
+#define UNALIGNED_LOAD16(_p) (*reinterpret_cast<const uint16 *>(_p))
+#define UNALIGNED_LOAD32(_p) (*reinterpret_cast<const uint32 *>(_p))
+
+#define UNALIGNED_STORE16(_p, _val) (*reinterpret_cast<uint16 *>(_p) = (_val))
+#define UNALIGNED_STORE32(_p, _val) (*reinterpret_cast<uint32 *>(_p) = (_val))
+
+// TODO(user): NEON supports unaligned 64-bit loads and stores.
+// See if that would be more efficient on platforms supporting it,
+// at least for copies.
+
+inline uint64 UNALIGNED_LOAD64(const void *p) {
+ uint64 t;
+ memcpy(&t, p, sizeof t);
+ return t;
+}
+
+inline void UNALIGNED_STORE64(void *p, uint64 v) {
+ memcpy(p, &v, sizeof v);
+}
+
#else
// These functions are provided for architectures that don't support
@@ -245,9 +190,31 @@ inline void UNALIGNED_STORE64(void *p, uint64 v) {
#endif
+// This can be more efficient than UNALIGNED_LOAD64 + UNALIGNED_STORE64
+// on some platforms, in particular ARM.
+inline void UnalignedCopy64(const void *src, void *dst) {
+ if (sizeof(void *) == 8) {
+ UNALIGNED_STORE64(dst, UNALIGNED_LOAD64(src));
+ } else {
+ const char *src_char = reinterpret_cast<const char *>(src);
+ char *dst_char = reinterpret_cast<char *>(dst);
+
+ UNALIGNED_STORE32(dst_char, UNALIGNED_LOAD32(src_char));
+ UNALIGNED_STORE32(dst_char + 4, UNALIGNED_LOAD32(src_char + 4));
+ }
+}
+
// The following guarantees declaration of the byte swap functions.
#ifdef WORDS_BIGENDIAN
+#ifdef HAVE_SYS_BYTEORDER_H
+#include <sys/byteorder.h>
+#endif
+
+#ifdef HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
+
#ifdef _MSC_VER
#include <stdlib.h>
#define bswap_16(x) _byteswap_ushort(x)
@@ -261,8 +228,38 @@ inline void UNALIGNED_STORE64(void *p, uint64 v) {
#define bswap_32(x) OSSwapInt32(x)
#define bswap_64(x) OSSwapInt64(x)
-#else
+#elif defined(HAVE_BYTESWAP_H)
#include <byteswap.h>
+
+#elif defined(bswap32)
+// FreeBSD defines bswap{16,32,64} in <sys/endian.h> (already #included).
+#define bswap_16(x) bswap16(x)
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+
+#elif defined(BSWAP_64)
+// Solaris 10 defines BSWAP_{16,32,64} in <sys/byteorder.h> (already #included).
+#define bswap_16(x) BSWAP_16(x)
+#define bswap_32(x) BSWAP_32(x)
+#define bswap_64(x) BSWAP_64(x)
+
+#else
+
+inline uint16 bswap_16(uint16 x) {
+ return (x << 8) | (x >> 8);
+}
+
+inline uint32 bswap_32(uint32 x) {
+ x = ((x & 0xff00ff00UL) >> 8) | ((x & 0x00ff00ffUL) << 8);
+ return (x >> 16) | (x << 16);
+}
+
+inline uint64 bswap_64(uint64 x) {
+ x = ((x & 0xff00ff00ff00ff00ULL) >> 8) | ((x & 0x00ff00ff00ff00ffULL) << 8);
+ x = ((x & 0xffff0000ffff0000ULL) >> 16) | ((x & 0x0000ffff0000ffffULL) << 16);
+ return (x >> 32) | (x << 32);
+}
+
#endif
#endif // WORDS_BIGENDIAN
@@ -332,7 +329,7 @@ class Bits {
static int FindLSBSetNonZero64(uint64 n);
private:
- SNAPPY_DISALLOW_COPY_AND_ASSIGN(Bits);
+ DISALLOW_COPY_AND_ASSIGN(Bits);
};
#ifdef HAVE_BUILTIN_CTZ
diff --git a/mp/src/tier1/snappy.cpp b/mp/src/tier1/snappy.cpp
index b617049e..72e26e01 100644
--- a/mp/src/tier1/snappy.cpp
+++ b/mp/src/tier1/snappy.cpp
@@ -37,8 +37,17 @@
#include <vector>
#ifdef _WIN32
+
#pragma warning(disable:4018) // warning C4018: '<' : signed/unsigned mismatch
#pragma warning(disable:4389) // warning C4389: '==' : signed/unsigned mismatch
+
+/* Define like size_t, omitting the "unsigned" */
+#ifdef _WIN64
+typedef __int64 ssize_t;
+#else
+typedef int ssize_t;
+#endif
+
#endif //_WIN32
namespace snappy {
@@ -86,6 +95,7 @@ enum {
COPY_2_BYTE_OFFSET = 2,
COPY_4_BYTE_OFFSET = 3
};
+static const int kMaximumTagLength = 5; // COPY_4_BYTE_OFFSET plus the actual offset.
// Copy "len" bytes from "src" to "op", one byte at a time. Used for
// handling COPY operations where the input and output regions may
@@ -98,8 +108,8 @@ enum {
// ababababababababababab
// Note that this does not match the semantics of either memcpy()
// or memmove().
-static inline void IncrementalCopy(const char* src, char* op, int len) {
- DCHECK_GT(len, 0);
+static inline void IncrementalCopy(const char* src, char* op, ssize_t len) {
+ assert(len > 0);
do {
*op++ = *src++;
} while (--len > 0);
@@ -140,22 +150,22 @@ namespace {
const int kMaxIncrementCopyOverflow = 10;
-} // namespace
-
-static inline void IncrementalCopyFastPath(const char* src, char* op, int len) {
+inline void IncrementalCopyFastPath(const char* src, char* op, ssize_t len) {
while (op - src < 8) {
- UNALIGNED_STORE64(op, UNALIGNED_LOAD64(src));
+ UnalignedCopy64(src, op);
len -= op - src;
op += op - src;
}
while (len > 0) {
- UNALIGNED_STORE64(op, UNALIGNED_LOAD64(src));
+ UnalignedCopy64(src, op);
src += 8;
op += 8;
len -= 8;
}
}
+} // namespace
+
static inline char* EmitLiteral(char* op,
const char* literal,
int len,
@@ -176,8 +186,8 @@ static inline char* EmitLiteral(char* op,
// - The output will always have 32 spare bytes (see
// MaxCompressedLength).
if (allow_fast_path && len <= 16) {
- UNALIGNED_STORE64(op, UNALIGNED_LOAD64(literal));
- UNALIGNED_STORE64(op + 8, UNALIGNED_LOAD64(literal + 8));
+ UnalignedCopy64(literal, op);
+ UnalignedCopy64(literal + 8, op + 8);
return op + len;
}
} else {
@@ -198,25 +208,25 @@ static inline char* EmitLiteral(char* op,
return op + len;
}
-static inline char* EmitCopyLessThan64(char* op, int offset, int len) {
- DCHECK_LE(len, 64);
- DCHECK_GE(len, 4);
- DCHECK_LT(offset, 65536);
+static inline char* EmitCopyLessThan64(char* op, size_t offset, int len) {
+ assert(len <= 64);
+ assert(len >= 4);
+ assert(offset < 65536);
if ((len < 12) && (offset < 2048)) {
- int len_minus_4 = len - 4;
+ size_t len_minus_4 = len - 4;
assert(len_minus_4 < 8); // Must fit in 3 bits
- *op++ = COPY_1_BYTE_OFFSET | ((len_minus_4) << 2) | ((offset >> 8) << 5);
+ *op++ = (char)(COPY_1_BYTE_OFFSET + ((len_minus_4) << 2) + ((offset >> 8) << 5));
*op++ = offset & 0xff;
} else {
- *op++ = COPY_2_BYTE_OFFSET | ((len-1) << 2);
- LittleEndian::Store16(op, offset);
+ *op++ = COPY_2_BYTE_OFFSET + ((len-1) << 2);
+ LittleEndian::Store16(op, (snappy::uint16)offset);
op += 2;
}
return op;
}
-static inline char* EmitCopy(char* op, int offset, int len) {
+static inline char* EmitCopy(char* op, size_t offset, int len) {
// Emit 64 byte copies but make sure to keep at least four bytes reserved
while (len >= 68) {
op = EmitCopyLessThan64(op, offset, 64);
@@ -253,12 +263,10 @@ uint16* WorkingMemory::GetHashTable(size_t input_size, int* table_size) {
// compression, and if the input is short, we won't need that
// many hash table entries anyway.
assert(kMaxHashTableSize >= 256);
- int htsize = 256;
+ size_t htsize = 256;
while (htsize < kMaxHashTableSize && htsize < input_size) {
htsize <<= 1;
}
- CHECK_EQ(0, htsize & (htsize - 1)) << ": must be power of two";
- CHECK_LE(htsize, kMaxHashTableSize) << ": hash table too large";
uint16* table;
if (htsize <= ARRAYSIZE(small_table_)) {
@@ -270,22 +278,55 @@ uint16* WorkingMemory::GetHashTable(size_t input_size, int* table_size) {
table = large_table_;
}
- *table_size = htsize;
+ *table_size = (int)htsize;
memset(table, 0, htsize * sizeof(*table));
return table;
}
} // end namespace internal
-// For 0 <= offset <= 4, GetUint32AtOffset(UNALIGNED_LOAD64(p), offset) will
+// For 0 <= offset <= 4, GetUint32AtOffset(GetEightBytesAt(p), offset) will
// equal UNALIGNED_LOAD32(p + offset). Motivation: On x86-64 hardware we have
// empirically found that overlapping loads such as
// UNALIGNED_LOAD32(p) ... UNALIGNED_LOAD32(p+1) ... UNALIGNED_LOAD32(p+2)
// are slower than UNALIGNED_LOAD64(p) followed by shifts and casts to uint32.
+//
+// We have different versions for 64- and 32-bit; ideally we would avoid the
+// two functions and just inline the UNALIGNED_LOAD64 call into
+// GetUint32AtOffset, but GCC (at least not as of 4.6) is seemingly not clever
+// enough to avoid loading the value multiple times then. For 64-bit, the load
+// is done when GetEightBytesAt() is called, whereas for 32-bit, the load is
+// done at GetUint32AtOffset() time.
+
+#ifdef ARCH_K8
+
+typedef uint64 EightBytesReference;
+
+static inline EightBytesReference GetEightBytesAt(const char* ptr) {
+ return UNALIGNED_LOAD64(ptr);
+}
+
static inline uint32 GetUint32AtOffset(uint64 v, int offset) {
- DCHECK(0 <= offset && offset <= 4) << offset;
+ assert(offset >= 0);
+ assert(offset <= 4);
return v >> (LittleEndian::IsLittleEndian() ? 8 * offset : 32 - 8 * offset);
}
+#else
+
+typedef const char* EightBytesReference;
+
+static inline EightBytesReference GetEightBytesAt(const char* ptr) {
+ return ptr;
+}
+
+static inline uint32 GetUint32AtOffset(const char* v, int offset) {
+ assert(offset >= 0);
+ assert(offset <= 4);
+ return UNALIGNED_LOAD32(v + offset);
+}
+
+#endif
+
// Flat array compression that does not emit the "uncompressed length"
// prefix. Compresses "input" string to the "*op" buffer.
//
@@ -298,29 +339,29 @@ static inline uint32 GetUint32AtOffset(uint64 v, int offset) {
// Returns an "end" pointer into "op" buffer.
// "end - op" is the compressed size of "input".
namespace internal {
-char* CompressFragment(const char* const input,
- const size_t input_size,
+char* CompressFragment(const char* input,
+ size_t input_size,
char* op,
uint16* table,
const int table_size) {
// "ip" is the input pointer, and "op" is the output pointer.
const char* ip = input;
- CHECK_LE(input_size, kBlockSize);
- CHECK_EQ(table_size & (table_size - 1), 0) << ": table must be power of two";
+ assert(input_size <= kBlockSize);
+ assert((table_size & (table_size - 1)) == 0); // table must be power of two
const int shift = 32 - Bits::Log2Floor(table_size);
- DCHECK_EQ(kuint32max >> shift, table_size - 1);
+ assert(static_cast<int>(kuint32max >> shift) == table_size - 1);
const char* ip_end = input + input_size;
const char* base_ip = ip;
// Bytes in [next_emit, ip) will be emitted as literal bytes. Or
// [next_emit, ip_end) after the main loop.
const char* next_emit = ip;
- const int kInputMarginBytes = 15;
+ const size_t kInputMarginBytes = 15;
if (PREDICT_TRUE(input_size >= kInputMarginBytes)) {
const char* ip_limit = input + input_size - kInputMarginBytes;
for (uint32 next_hash = Hash(++ip, shift); ; ) {
- DCHECK_LT(next_emit, ip);
+ assert(next_emit < ip);
// The body of this loop calls EmitLiteral once and then EmitCopy one or
// more times. (The exception is that when we're close to exhausting
// the input we goto emit_remainder.)
@@ -353,7 +394,7 @@ char* CompressFragment(const char* const input,
do {
ip = next_ip;
uint32 hash = next_hash;
- DCHECK_EQ(hash, Hash(ip, shift));
+ assert(hash == Hash(ip, shift));
uint32 bytes_between_hash_lookups = skip++ >> 5;
next_ip = ip + bytes_between_hash_lookups;
if (PREDICT_FALSE(next_ip > ip_limit)) {
@@ -361,8 +402,8 @@ char* CompressFragment(const char* const input,
}
next_hash = Hash(next_ip, shift);
candidate = base_ip + table[hash];
- DCHECK_GE(candidate, base_ip);
- DCHECK_LT(candidate, ip);
+ assert(candidate >= base_ip);
+ assert(candidate < ip);
table[hash] = ip - base_ip;
} while (PREDICT_TRUE(UNALIGNED_LOAD32(ip) !=
@@ -371,7 +412,7 @@ char* CompressFragment(const char* const input,
// Step 2: A 4-byte match has been found. We'll later see if more
// than 4 bytes match. But, prior to the match, input
// bytes [next_emit, ip) are unmatched. Emit them as "literal bytes."
- DCHECK_LE(next_emit + 16, ip_end);
+ assert(next_emit + 16 <= ip_end);
op = EmitLiteral(op, next_emit, ip - next_emit, true);
// Step 3: Call EmitCopy, and then see if another EmitCopy could
@@ -382,7 +423,7 @@ char* CompressFragment(const char* const input,
// though we don't yet know how big the literal will be. We handle that
// by proceeding to the next iteration of the main loop. We also can exit
// this loop via goto if we get close to exhausting the input.
- uint64 input_bytes = 0;
+ EightBytesReference input_bytes;
uint32 candidate_bytes = 0;
do {
@@ -391,8 +432,8 @@ char* CompressFragment(const char* const input,
const char* base = ip;
int matched = 4 + FindMatchLength(candidate + 4, ip + 4, ip_end);
ip += matched;
- int offset = base - candidate;
- DCHECK_EQ(0, memcmp(base, candidate, matched));
+ size_t offset = base - candidate;
+ assert(0 == memcmp(base, candidate, matched));
op = EmitCopy(op, offset, matched);
// We could immediately start working at ip now, but to improve
// compression we first update table[Hash(ip - 1, ...)].
@@ -401,7 +442,7 @@ char* CompressFragment(const char* const input,
if (PREDICT_FALSE(ip >= ip_limit)) {
goto emit_remainder;
}
- input_bytes = UNALIGNED_LOAD64(insert_tail);
+ input_bytes = GetEightBytesAt(insert_tail);
uint32 prev_hash = HashBytes(GetUint32AtOffset(input_bytes, 0), shift);
table[prev_hash] = ip - base_ip - 1;
uint32 cur_hash = HashBytes(GetUint32AtOffset(input_bytes, 1), shift);
@@ -439,12 +480,31 @@ char* CompressFragment(const char* const input,
// bool CheckLength() const;
//
// // Called repeatedly during decompression
-// bool Append(const char* ip, uint32 length, bool allow_fast_path);
-// bool AppendFromSelf(uint32 offset, uint32 length);
-// };
+// bool Append(const char* ip, size_t length);
+// bool AppendFromSelf(uint32 offset, size_t length);
//
-// "allow_fast_path" is a parameter that says if there is at least 16
-// readable bytes in "ip". It is currently only used by SnappyArrayWriter.
+// // The rules for how TryFastAppend differs from Append are somewhat
+// // convoluted:
+// //
+// // - TryFastAppend is allowed to decline (return false) at any
+// // time, for any reason -- just "return false" would be
+// // a perfectly legal implementation of TryFastAppend.
+// // The intention is for TryFastAppend to allow a fast path
+// // in the common case of a small append.
+// // - TryFastAppend is allowed to read up to <available> bytes
+// // from the input buffer, whereas Append is allowed to read
+// // <length>. However, if it returns true, it must leave
+// // at least five (kMaximumTagLength) bytes in the input buffer
+// // afterwards, so that there is always enough space to read the
+// // next tag without checking for a refill.
+// // - TryFastAppend must always return decline (return false)
+// // if <length> is 61 or more, as in this case the literal length is not
+// // decoded fully. In practice, this should not be a big problem,
+// // as it is unlikely that one would implement a fast path accepting
+// // this much data.
+// //
+// bool TryFastAppend(const char* ip, size_t available, size_t length);
+// };
// -----------------------------------------------------------------------
// Lookup table for decompression code. Generated by ComputeTable() below.
@@ -511,9 +571,9 @@ static uint16 MakeEntry(unsigned int extra,
unsigned int len,
unsigned int copy_offset) {
// Check that all of the fields fit within the allocated space
- DCHECK_EQ(extra, extra & 0x7); // At most 3 bits
- DCHECK_EQ(copy_offset, copy_offset & 0x7); // At most 3 bits
- DCHECK_EQ(len, len & 0x7f); // At most 7 bits
+ assert(extra == (extra & 0x7)); // At most 3 bits
+ assert(copy_offset == (copy_offset & 0x7)); // At most 3 bits
+ assert(len == (len & 0x7f)); // At most 7 bits
return len | (copy_offset << 8) | (extra << 11);
}
@@ -571,9 +631,15 @@ static void ComputeTable() {
}
// Check that each entry was initialized exactly once.
- CHECK_EQ(assigned, 256);
+ if (assigned != 256) {
+ fprintf(stderr, "ComputeTable: assigned only %d of 256\n", assigned);
+ abort();
+ }
for (int i = 0; i < 256; i++) {
- CHECK_NE(dst[i], 0xffff);
+ if (dst[i] == 0xffff) {
+ fprintf(stderr, "ComputeTable: did not assign byte %d\n", i);
+ abort();
+ }
}
if (FLAGS_snappy_dump_decompression_table) {
@@ -588,10 +654,13 @@ static void ComputeTable() {
// Check that computed table matched recorded table
for (int i = 0; i < 256; i++) {
- CHECK_EQ(dst[i], char_table[i]);
+ if (dst[i] != char_table[i]) {
+ fprintf(stderr, "ComputeTable: byte %d: computed (%x), expect (%x)\n",
+ i, static_cast<int>(dst[i]), static_cast<int>(char_table[i]));
+ abort();
+ }
}
}
-REGISTER_MODULE_INITIALIZER(snappy, ComputeTable());
#endif /* !NDEBUG */
// Helper class for decompression
@@ -602,7 +671,7 @@ class SnappyDecompressor {
const char* ip_limit_; // Points just past buffered bytes
uint32 peeked_; // Bytes peeked from reader (need to skip)
bool eof_; // Hit end of input without an error?
- char scratch_[5]; // Temporary buffer for PeekFast() boundaries
+ char scratch_[kMaximumTagLength]; // See RefillTag().
// Ensure that all of the tag metadata for the next tag is available
// in [ip_..ip_limit_-1]. Also ensures that [ip,ip+4] is readable even
@@ -634,7 +703,7 @@ class SnappyDecompressor {
// On succcess, stores the length in *result and returns true.
// On failure, returns false.
bool ReadUncompressedLength(uint32* result) {
- DCHECK(ip_ == NULL); // Must not have read anything yet
+ assert(ip_ == NULL); // Must not have read anything yet
// Length is encoded in 1..5 bytes
*result = 0;
uint32 shift = 0;
@@ -659,40 +728,63 @@ class SnappyDecompressor {
template <class Writer>
void DecompressAllTags(Writer* writer) {
const char* ip = ip_;
- for ( ;; ) {
- if (ip_limit_ - ip < 5) {
- ip_ = ip;
- if (!RefillTag()) return;
- ip = ip_;
- }
+ // We could have put this refill fragment only at the beginning of the loop.
+ // However, duplicating it at the end of each branch gives the compiler more
+ // scope to optimize the <ip_limit_ - ip> expression based on the local
+ // context, which overall increases speed.
+ #define MAYBE_REFILL() \
+ if (ip_limit_ - ip < kMaximumTagLength) { \
+ ip_ = ip; \
+ if (!RefillTag()) return; \
+ ip = ip_; \
+ }
+
+ MAYBE_REFILL();
+ for ( ;; ) {
const unsigned char c = *(reinterpret_cast<const unsigned char*>(ip++));
- const uint32 entry = char_table[c];
- const uint32 trailer = LittleEndian::Load32(ip) & wordmask[entry >> 11];
- ip += entry >> 11;
- const uint32 length = entry & 0xff;
if ((c & 0x3) == LITERAL) {
- uint32 literal_length = length + trailer;
- uint32 avail = ip_limit_ - ip;
+ size_t literal_length = (c >> 2) + 1u;
+ if (writer->TryFastAppend(ip, ip_limit_ - ip, literal_length)) {
+ assert(literal_length < 61);
+ ip += literal_length;
+ // NOTE(user): There is no MAYBE_REFILL() here, as TryFastAppend()
+ // will not return true unless there's already at least five spare
+ // bytes in addition to the literal.
+ continue;
+ }
+ if (PREDICT_FALSE(literal_length >= 61)) {
+ // Long literal.
+ const size_t literal_length_length = literal_length - 60;
+ literal_length =
+ (LittleEndian::Load32(ip) & wordmask[literal_length_length]) + 1;
+ ip += literal_length_length;
+ }
+
+ size_t avail = ip_limit_ - ip;
while (avail < literal_length) {
- bool allow_fast_path = (avail >= 16);
- if (!writer->Append(ip, avail, allow_fast_path)) return;
+ if (!writer->Append(ip, avail)) return;
literal_length -= avail;
reader_->Skip(peeked_);
size_t n;
ip = reader_->Peek(&n);
- avail = (uint32)n;
- peeked_ = avail;
+ avail = n;
+ peeked_ = (snappy::uint32)avail;
if (avail == 0) return; // Premature end of input
ip_limit_ = ip + avail;
}
- bool allow_fast_path = (avail >= 16);
- if (!writer->Append(ip, literal_length, allow_fast_path)) {
+ if (!writer->Append(ip, literal_length)) {
return;
}
ip += literal_length;
+ MAYBE_REFILL();
} else {
+ const uint32 entry = char_table[c];
+ const uint32 trailer = LittleEndian::Load32(ip) & wordmask[entry >> 11];
+ const uint32 length = entry & 0xff;
+ ip += entry >> 11;
+
// copy_offset/256 is encoded in bits 8..10. By just fetching
// those bits, we get copy_offset (since the bit-field starts at
// bit 8).
@@ -700,8 +792,11 @@ class SnappyDecompressor {
if (!writer->AppendFromSelf(copy_offset + trailer, length)) {
return;
}
+ MAYBE_REFILL();
}
}
+
+#undef MAYBE_REFILL
}
};
@@ -712,7 +807,7 @@ bool SnappyDecompressor::RefillTag() {
reader_->Skip(peeked_); // All peeked bytes are used up
size_t n;
ip = reader_->Peek(&n);
- peeked_ = (uint32)n;
+ peeked_ = (snappy::uint32)n;
if (n == 0) {
eof_ = true;
return false;
@@ -721,11 +816,11 @@ bool SnappyDecompressor::RefillTag() {
}
// Read the tag character
- DCHECK_LT(ip, ip_limit_);
+ assert(ip < ip_limit_);
const unsigned char c = *(reinterpret_cast<const unsigned char*>(ip));
const uint32 entry = char_table[c];
const uint32 needed = (entry >> 11) + 1; // +1 byte for 'c'
- DCHECK_LE(needed, sizeof(scratch_));
+ assert(needed <= sizeof(scratch_));
// Read more bytes from reader if needed
uint32 nbuf = ip_limit_ - ip;
@@ -741,15 +836,15 @@ bool SnappyDecompressor::RefillTag() {
size_t length;
const char* src = reader_->Peek(&length);
if (length == 0) return false;
- uint32 to_add = min<uint32>(needed - nbuf, (uint32)length);
+ uint32 to_add = Min(needed - nbuf, (uint32)length);
memcpy(scratch_ + nbuf, src, to_add);
nbuf += to_add;
reader_->Skip(to_add);
}
- DCHECK_EQ(nbuf, needed);
+ assert(nbuf == needed);
ip_ = scratch_;
ip_limit_ = scratch_ + needed;
- } else if (nbuf < 5) {
+ } else if (nbuf < kMaximumTagLength) {
// Have enough bytes, but move into scratch_ so that we do not
// read past end of input
memmove(scratch_, ip, nbuf);
@@ -765,23 +860,23 @@ bool SnappyDecompressor::RefillTag() {
}
template <typename Writer>
-static bool InternalUncompress(Source* r,
- Writer* writer,
- uint32 max_len) {
+static bool InternalUncompress(Source* r, Writer* writer) {
// Read the uncompressed length from the front of the compressed input
SnappyDecompressor decompressor(r);
uint32 uncompressed_len = 0;
if (!decompressor.ReadUncompressedLength(&uncompressed_len)) return false;
- // Protect against possible DoS attack
- if (static_cast<uint64>(uncompressed_len) > max_len) {
- return false;
- }
+ return InternalUncompressAllTags(&decompressor, writer, uncompressed_len);
+}
+template <typename Writer>
+static bool InternalUncompressAllTags(SnappyDecompressor* decompressor,
+ Writer* writer,
+ uint32 uncompressed_len) {
writer->SetExpectedLength(uncompressed_len);
// Process the entire input
- decompressor.DecompressAllTags(writer);
- return (decompressor.eof() && writer->CheckLength());
+ decompressor->DecompressAllTags(writer);
+ return (decompressor->eof() && writer->CheckLength());
}
bool GetUncompressedLength(Source* source, uint32* result) {
@@ -791,9 +886,9 @@ bool GetUncompressedLength(Source* source, uint32* result) {
size_t Compress(Source* reader, Sink* writer) {
size_t written = 0;
- int N = (int)reader->Available();
+ size_t N = reader->Available();
char ulength[Varint::kMax32];
- char* p = Varint::Encode32(ulength, N);
+ char* p = Varint::Encode32(ulength, (snappy::uint32)N);
writer->Append(ulength, p-ulength);
written += (p - ulength);
@@ -805,11 +900,11 @@ size_t Compress(Source* reader, Sink* writer) {
// Get next block to compress (without copying if possible)
size_t fragment_size;
const char* fragment = reader->Peek(&fragment_size);
- DCHECK_NE(fragment_size, 0) << ": premature end of input";
- const int num_to_read = min(N, kBlockSize);
+ assert(fragment_size != 0); // premature end of input
+ const size_t num_to_read = min(N, kBlockSize);
size_t bytes_read = fragment_size;
- int pending_advance = 0;
+ size_t pending_advance = 0;
if (bytes_read >= num_to_read) {
// Buffer returned by reader is large enough
pending_advance = num_to_read;
@@ -827,23 +922,23 @@ size_t Compress(Source* reader, Sink* writer) {
while (bytes_read < num_to_read) {
fragment = reader->Peek(&fragment_size);
- size_t n = min<size_t>(fragment_size, num_to_read - bytes_read);
+ size_t n = Min(fragment_size, num_to_read - bytes_read);
memcpy(scratch + bytes_read, fragment, n);
bytes_read += n;
reader->Skip(n);
}
- DCHECK_EQ(bytes_read, num_to_read);
+ assert(bytes_read == num_to_read);
fragment = scratch;
fragment_size = num_to_read;
}
- DCHECK_EQ(fragment_size, num_to_read);
+ assert(fragment_size == num_to_read);
// Get encoding table for compression
int table_size;
uint16* table = wmem.GetHashTable(num_to_read, &table_size);
// Compress input_fragment and append to dest
- const size_t max_output = MaxCompressedLength(num_to_read);
+ const int max_output = (int)MaxCompressedLength(num_to_read);
// Need a scratch buffer for the output, in case the byte sink doesn't
// have room for us directly.
@@ -871,6 +966,183 @@ size_t Compress(Source* reader, Sink* writer) {
}
// -----------------------------------------------------------------------
+// IOVec interfaces
+// -----------------------------------------------------------------------
+
+// A type that writes to an iovec.
+// Note that this is not a "ByteSink", but a type that matches the
+// Writer template argument to SnappyDecompressor::DecompressAllTags().
+class SnappyIOVecWriter {
+ private:
+ const struct iovec* output_iov_;
+ const size_t output_iov_count_;
+
+ // We are currently writing into output_iov_[curr_iov_index_].
+ int curr_iov_index_;
+
+ // Bytes written to output_iov_[curr_iov_index_] so far.
+ size_t curr_iov_written_;
+
+ // Total bytes decompressed into output_iov_ so far.
+ size_t total_written_;
+
+ // Maximum number of bytes that will be decompressed into output_iov_.
+ size_t output_limit_;
+
+ inline char* GetIOVecPointer(int index, size_t offset) {
+ return reinterpret_cast<char*>(output_iov_[index].iov_base) +
+ offset;
+ }
+
+ public:
+ // Does not take ownership of iov. iov must be valid during the
+ // entire lifetime of the SnappyIOVecWriter.
+ inline SnappyIOVecWriter(const struct iovec* iov, size_t iov_count)
+ : output_iov_(iov),
+ output_iov_count_(iov_count),
+ curr_iov_index_(0),
+ curr_iov_written_(0),
+ total_written_(0),
+ output_limit_((size_t)-1) {
+ }
+
+ inline void SetExpectedLength(size_t len) {
+ output_limit_ = len;
+ }
+
+ inline bool CheckLength() const {
+ return total_written_ == output_limit_;
+ }
+
+ inline bool Append(const char* ip, size_t len) {
+ if (total_written_ + len > output_limit_) {
+ return false;
+ }
+
+ while (len > 0) {
+ assert(curr_iov_written_ <= output_iov_[curr_iov_index_].iov_len);
+ if (curr_iov_written_ >= output_iov_[curr_iov_index_].iov_len) {
+ // This iovec is full. Go to the next one.
+ if (curr_iov_index_ + 1 >= output_iov_count_) {
+ return false;
+ }
+ curr_iov_written_ = 0;
+ ++curr_iov_index_;
+ }
+
+ const size_t to_write = Min(
+ len, output_iov_[curr_iov_index_].iov_len - curr_iov_written_);
+ memcpy(GetIOVecPointer(curr_iov_index_, curr_iov_written_),
+ ip,
+ to_write);
+ curr_iov_written_ += to_write;
+ total_written_ += to_write;
+ ip += to_write;
+ len -= to_write;
+ }
+
+ return true;
+ }
+
+ inline bool TryFastAppend(const char* ip, size_t available, size_t len) {
+ const size_t space_left = output_limit_ - total_written_;
+ if (len <= 16 && available >= 16 + kMaximumTagLength && space_left >= 16 &&
+ output_iov_[curr_iov_index_].iov_len - curr_iov_written_ >= 16) {
+ // Fast path, used for the majority (about 95%) of invocations.
+ char* ptr = GetIOVecPointer(curr_iov_index_, curr_iov_written_);
+ UnalignedCopy64(ip, ptr);
+ UnalignedCopy64(ip + 8, ptr + 8);
+ curr_iov_written_ += len;
+ total_written_ += len;
+ return true;
+ }
+
+ return false;
+ }
+
+ inline bool AppendFromSelf(size_t offset, size_t len) {
+ if (offset > total_written_ || offset == 0) {
+ return false;
+ }
+ const size_t space_left = output_limit_ - total_written_;
+ if (len > space_left) {
+ return false;
+ }
+
+ // Locate the iovec from which we need to start the copy.
+ int from_iov_index = curr_iov_index_;
+ size_t from_iov_offset = curr_iov_written_;
+ while (offset > 0) {
+ if (from_iov_offset >= offset) {
+ from_iov_offset -= offset;
+ break;
+ }
+
+ offset -= from_iov_offset;
+ --from_iov_index;
+ assert(from_iov_index >= 0);
+ from_iov_offset = output_iov_[from_iov_index].iov_len;
+ }
+
+ // Copy <len> bytes starting from the iovec pointed to by from_iov_index to
+ // the current iovec.
+ while (len > 0) {
+ assert(from_iov_index <= curr_iov_index_);
+ if (from_iov_index != curr_iov_index_) {
+ const size_t to_copy = Min(
+ output_iov_[from_iov_index].iov_len - from_iov_offset,
+ len);
+ Append(GetIOVecPointer(from_iov_index, from_iov_offset), to_copy);
+ len -= to_copy;
+ if (len > 0) {
+ ++from_iov_index;
+ from_iov_offset = 0;
+ }
+ } else {
+ assert(curr_iov_written_ <= output_iov_[curr_iov_index_].iov_len);
+ size_t to_copy = Min(output_iov_[curr_iov_index_].iov_len -
+ curr_iov_written_,
+ len);
+ if (to_copy == 0) {
+ // This iovec is full. Go to the next one.
+ if (curr_iov_index_ + 1 >= output_iov_count_) {
+ return false;
+ }
+ ++curr_iov_index_;
+ curr_iov_written_ = 0;
+ continue;
+ }
+ if (to_copy > len) {
+ to_copy = len;
+ }
+ IncrementalCopy(GetIOVecPointer(from_iov_index, from_iov_offset),
+ GetIOVecPointer(curr_iov_index_, curr_iov_written_),
+ to_copy);
+ curr_iov_written_ += to_copy;
+ from_iov_offset += to_copy;
+ total_written_ += to_copy;
+ len -= to_copy;
+ }
+ }
+
+ return true;
+ }
+
+};
+
+bool RawUncompressToIOVec(const char* compressed, size_t compressed_length,
+ const struct iovec* iov, size_t iov_cnt) {
+ ByteArraySource reader(compressed, compressed_length);
+ return RawUncompressToIOVec(&reader, iov, iov_cnt);
+}
+
+bool RawUncompressToIOVec(Source* compressed, const struct iovec* iov,
+ size_t iov_cnt) {
+ SnappyIOVecWriter output(iov, iov_cnt);
+ return InternalUncompress(compressed, &output);
+}
+
+// -----------------------------------------------------------------------
// Flat array interfaces
// -----------------------------------------------------------------------
@@ -897,34 +1169,51 @@ class SnappyArrayWriter {
return op_ == op_limit_;
}
- inline bool Append(const char* ip, uint32 len, bool allow_fast_path) {
+ inline bool Append(const char* ip, size_t len) {
char* op = op_;
- const int space_left = op_limit_ - op;
- if (allow_fast_path && len <= 16 && space_left >= 16) {
- // Fast path, used for the majority (about 90%) of dynamic invocations.
- UNALIGNED_STORE64(op, UNALIGNED_LOAD64(ip));
- UNALIGNED_STORE64(op + 8, UNALIGNED_LOAD64(ip + 8));
- } else {
- if (space_left < len) {
- return false;
- }
- memcpy(op, ip, len);
+ const size_t space_left = op_limit_ - op;
+ if (space_left < len) {
+ return false;
}
+ memcpy(op, ip, len);
op_ = op + len;
return true;
}
- inline bool AppendFromSelf(uint32 offset, uint32 len) {
+ inline bool TryFastAppend(const char* ip, size_t available, size_t len) {
char* op = op_;
- const int space_left = op_limit_ - op;
+ const size_t space_left = op_limit_ - op;
+ if (len <= 16 && available >= 16 + kMaximumTagLength && space_left >= 16) {
+ // Fast path, used for the majority (about 95%) of invocations.
+ UnalignedCopy64(ip, op);
+ UnalignedCopy64(ip + 8, op + 8);
+ op_ = op + len;
+ return true;
+ } else {
+ return false;
+ }
+ }
- if (op - base_ <= offset - 1u) { // -1u catches offset==0
+ inline bool AppendFromSelf(size_t offset, size_t len) {
+ char* op = op_;
+ const size_t space_left = op_limit_ - op;
+
+ // Check if we try to append from before the start of the buffer.
+ // Normally this would just be a check for "produced < offset",
+ // but "produced <= offset - 1u" is equivalent for every case
+ // except the one where offset==0, where the right side will wrap around
+ // to a very big number. This is convenient, as offset==0 is another
+ // invalid case that we also want to catch, so that we do not go
+ // into an infinite loop.
+ assert(op >= base_);
+ size_t produced = op - base_;
+ if (produced <= offset - 1u) {
return false;
}
if (len <= 16 && offset >= 8 && space_left >= 16) {
// Fast path, used for the majority (70-80%) of dynamic invocations.
- UNALIGNED_STORE64(op, UNALIGNED_LOAD64(op - offset));
- UNALIGNED_STORE64(op + 8, UNALIGNED_LOAD64(op - offset + 8));
+ UnalignedCopy64(op - offset, op);
+ UnalignedCopy64(op - offset + 8, op + 8);
} else {
if (space_left >= len + kMaxIncrementCopyOverflow) {
IncrementalCopyFastPath(op - offset, op, len);
@@ -948,7 +1237,7 @@ bool RawUncompress(const char* compressed, size_t n, char* uncompressed) {
bool RawUncompress(Source* compressed, char* uncompressed) {
SnappyArrayWriter output(uncompressed);
- return InternalUncompress(compressed, &output, kuint32max);
+ return InternalUncompress(compressed, &output);
}
bool Uncompress(const char* compressed, size_t n, string* uncompressed) {
@@ -956,9 +1245,9 @@ bool Uncompress(const char* compressed, size_t n, string* uncompressed) {
if (!GetUncompressedLength(compressed, n, &ulength)) {
return false;
}
- // Protect against possible DoS attack
- if ((static_cast<uint64>(ulength) + uncompressed->size()) >
- uncompressed->max_size()) {
+ // On 32-bit builds: max_size() < kuint32max. Check for that instead
+ // of crashing (e.g., consider externally specified compressed data).
+ if (ulength > uncompressed->max_size()) {
return false;
}
STLStringResizeUninitialized(uncompressed, ulength);
@@ -980,12 +1269,17 @@ class SnappyDecompressionValidator {
inline bool CheckLength() const {
return expected_ == produced_;
}
- inline bool Append(const char* ip, uint32 len, bool allow_fast_path) {
+ inline bool Append(const char* ip, size_t len) {
produced_ += len;
return produced_ <= expected_;
}
- inline bool AppendFromSelf(uint32 offset, uint32 len) {
- if (produced_ <= offset - 1u) return false; // -1u catches offset==0
+ inline bool TryFastAppend(const char* ip, size_t available, size_t length) {
+ return false;
+ }
+ inline bool AppendFromSelf(size_t offset, size_t len) {
+ // See SnappyArrayWriter::AppendFromSelf for an explanation of
+ // the "offset - 1u" trick.
+ if (produced_ <= offset - 1u) return false;
produced_ += len;
return produced_ <= expected_;
}
@@ -994,7 +1288,7 @@ class SnappyDecompressionValidator {
bool IsValidCompressedBuffer(const char* compressed, size_t n) {
ByteArraySource reader(compressed, n);
SnappyDecompressionValidator writer;
- return InternalUncompress(&reader, &writer, kuint32max);
+ return InternalUncompress(&reader, &writer);
}
void RawCompress(const char* input,
diff --git a/mp/src/tier1/splitstring.cpp b/mp/src/tier1/splitstring.cpp
index 461aa61d..448f6d03 100644
--- a/mp/src/tier1/splitstring.cpp
+++ b/mp/src/tier1/splitstring.cpp
@@ -70,7 +70,8 @@ void CSplitString::Construct( const char *pString, const char **pSeparators, int
else
{
// Copy the rest of the string
- if ( int nTokenLength = strlen( pCurPos ) )
+ int nTokenLength = strlen( pCurPos );
+ if ( nTokenLength )
{
//////////////////////////////////////////////////////////////////////////
// There's no need to cut this token, because there's no separator after it.
diff --git a/mp/src/tier1/strtools.cpp b/mp/src/tier1/strtools.cpp
index 9b1bfa84..ad301750 100644
--- a/mp/src/tier1/strtools.cpp
+++ b/mp/src/tier1/strtools.cpp
@@ -1190,6 +1190,7 @@ bool Q_IsMeanSpaceW( wchar_t wch )
case L'\x200B': // ZERO-WIDTH SPACE
case L'\x200C': // ZERO-WIDTH NON-JOINER
case L'\x200D': // ZERO WIDTH JOINER
+ case L'\x200E': // LEFT-TO-RIGHT MARK
case L'\x2028': // LINE SEPARATOR
case L'\x2029': // PARAGRAPH SEPARATOR
case L'\x202F': // NARROW NO-BREAK SPACE
@@ -1240,6 +1241,48 @@ static wchar_t *StripWhitespaceWorker( int cchLength, wchar_t *pwch, bool *pbStr
return pwch;
}
+//-----------------------------------------------------------------------------
+// Purpose: Strips all evil characters (ie. zero-width no-break space)
+// from a string.
+//-----------------------------------------------------------------------------
+bool Q_RemoveAllEvilCharacters( char *pch )
+{
+ // convert to unicode
+ int cch = Q_strlen( pch );
+ int cubDest = (cch + 1 ) * sizeof( wchar_t );
+ wchar_t *pwch = (wchar_t *)stackalloc( cubDest );
+ int cwch = Q_UTF8ToUnicode( pch, pwch, cubDest );
+
+ bool bStrippedWhitespace = false;
+
+ // Walk through and skip over evil characters
+ int nWalk = 0;
+ for( int i=0; i<cwch; ++i )
+ {
+ if( !Q_IsMeanSpaceW( pwch[i] ) )
+ {
+ pwch[nWalk] = pwch[i];
+ ++nWalk;
+ }
+ else
+ {
+ bStrippedWhitespace = true;
+ }
+ }
+
+ // Null terminate
+ pwch[nWalk-1] = L'\0';
+
+
+ // copy back, if necessary
+ if ( bStrippedWhitespace )
+ {
+ Q_UnicodeToUTF8( pwch, pch, cch );
+ }
+
+ return bStrippedWhitespace;
+}
+
//-----------------------------------------------------------------------------
// Purpose: strips leading and trailing whitespace
@@ -1422,7 +1465,6 @@ int V_UCS2ToUnicode( const ucs2 *pUCS2, wchar_t *pUnicode, int cubDestSizeInByte
char *pOut = (char *)pUnicode;
if ( conv_t > 0 )
{
- cchResult = 0;
cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );
iconv_close( conv_t );
if ( (int)cchResult < 0 )
@@ -1463,7 +1505,6 @@ int V_UnicodeToUCS2( const wchar_t *pUnicode, int cubSrcInBytes, char *pUCS2, in
char *pOut = pUCS2;
if ( conv_t > 0 )
{
- cchResult = 0;
cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUCS2 );
iconv_close( conv_t );
if ( (int)cchResult < 0 )
@@ -1510,7 +1551,6 @@ int V_UCS2ToUTF8( const ucs2 *pUCS2, char *pUTF8, int cubDestSizeInBytes )
char *pOut = (char *)pUTF8;
if ( conv_t > 0 )
{
- cchResult = 0;
const size_t nBytesToWrite = nMaxUTF8;
cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );
@@ -1556,7 +1596,6 @@ int V_UTF8ToUCS2( const char *pUTF8, int cubSrcInBytes, ucs2 *pUCS2, int cubDest
char *pOut = (char *)pUCS2;
if ( conv_t > 0 )
{
- cchResult = 0;
cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );
iconv_close( conv_t );
if ( (int)cchResult < 0 )
diff --git a/mp/src/tier1/tier1.vpc b/mp/src/tier1/tier1.vpc
index 0387dac2..bc3438a7 100644
--- a/mp/src/tier1/tier1.vpc
+++ b/mp/src/tier1/tier1.vpc
@@ -72,6 +72,7 @@ $Project "tier1"
$File "utlbufferutil.cpp"
$File "utlstring.cpp"
$File "utlsymbol.cpp"
+ $File "utlbinaryblock.cpp"
$File "pathmatch.cpp" [$LINUXALL]
$File "snappy.cpp"
$File "snappy-sinksource.cpp"
@@ -147,6 +148,7 @@ $Project "tier1"
$File "$SRCDIR\public\tier1\utlsymbol.h"
$File "$SRCDIR\public\tier1\utlsymbollarge.h"
$File "$SRCDIR\public\tier1\utlvector.h"
+ $File "$SRCDIR\public\tier1\utlbinaryblock.h"
$File "$SRCDIR\common\xbox\xboxstubs.h" [$WINDOWS]
}
}
diff --git a/mp/src/tier1/utlbinaryblock.cpp b/mp/src/tier1/utlbinaryblock.cpp
new file mode 100644
index 00000000..7f64c4ec
--- /dev/null
+++ b/mp/src/tier1/utlbinaryblock.cpp
@@ -0,0 +1,116 @@
+//====== Copyright 1996-2004, Valve Corporation, All rights reserved. =======
+//
+// Purpose:
+//
+//=============================================================================
+
+#include "tier1/utlbinaryblock.h"
+
+//-----------------------------------------------------------------------------
+// Base class, containing simple memory management
+//-----------------------------------------------------------------------------
+CUtlBinaryBlock::CUtlBinaryBlock( int growSize, int initSize ) : m_Memory( growSize, initSize )
+{
+ m_nActualLength = 0;
+}
+
+CUtlBinaryBlock::CUtlBinaryBlock( void* pMemory, int nSizeInBytes, int nInitialLength ) : m_Memory( (unsigned char*)pMemory, nSizeInBytes )
+{
+ m_nActualLength = nInitialLength;
+}
+
+CUtlBinaryBlock::CUtlBinaryBlock( const void* pMemory, int nSizeInBytes ) : m_Memory( (const unsigned char*)pMemory, nSizeInBytes )
+{
+ m_nActualLength = nSizeInBytes;
+}
+
+CUtlBinaryBlock::CUtlBinaryBlock( const CUtlBinaryBlock& src )
+{
+ Set( src.Get(), src.Length() );
+}
+
+void CUtlBinaryBlock::Get( void *pValue, int nLen ) const
+{
+ Assert( nLen > 0 );
+ if ( m_nActualLength < nLen )
+ {
+ nLen = m_nActualLength;
+ }
+
+ if ( nLen > 0 )
+ {
+ memcpy( pValue, m_Memory.Base(), nLen );
+ }
+}
+
+void CUtlBinaryBlock::SetLength( int nLength )
+{
+ Assert( !m_Memory.IsReadOnly() );
+
+ m_nActualLength = nLength;
+ if ( nLength > m_Memory.NumAllocated() )
+ {
+ int nOverFlow = nLength - m_Memory.NumAllocated();
+ m_Memory.Grow( nOverFlow );
+
+ // If the reallocation failed, clamp length
+ if ( nLength > m_Memory.NumAllocated() )
+ {
+ m_nActualLength = m_Memory.NumAllocated();
+ }
+ }
+
+#ifdef _DEBUG
+ if ( m_Memory.NumAllocated() > m_nActualLength )
+ {
+ memset( ( ( char * )m_Memory.Base() ) + m_nActualLength, 0xEB, m_Memory.NumAllocated() - m_nActualLength );
+ }
+#endif
+}
+
+
+void CUtlBinaryBlock::Set( const void *pValue, int nLen )
+{
+ Assert( !m_Memory.IsReadOnly() );
+
+ if ( !pValue )
+ {
+ nLen = 0;
+ }
+
+ SetLength( nLen );
+
+ if ( m_nActualLength )
+ {
+ if ( ( ( const char * )m_Memory.Base() ) >= ( ( const char * )pValue ) + nLen ||
+ ( ( const char * )m_Memory.Base() ) + m_nActualLength <= ( ( const char * )pValue ) )
+ {
+ memcpy( m_Memory.Base(), pValue, m_nActualLength );
+ }
+ else
+ {
+ memmove( m_Memory.Base(), pValue, m_nActualLength );
+ }
+ }
+}
+
+
+CUtlBinaryBlock &CUtlBinaryBlock::operator=( const CUtlBinaryBlock &src )
+{
+ Assert( !m_Memory.IsReadOnly() );
+ Set( src.Get(), src.Length() );
+ return *this;
+}
+
+
+bool CUtlBinaryBlock::operator==( const CUtlBinaryBlock &src ) const
+{
+ if ( src.Length() != Length() )
+ return false;
+
+ return !memcmp( src.Get(), Get(), Length() );
+}
+
+
+
+
diff --git a/mp/src/tier1/utlbufferutil.cpp b/mp/src/tier1/utlbufferutil.cpp
index b911206d..79949bf6 100644
--- a/mp/src/tier1/utlbufferutil.cpp
+++ b/mp/src/tier1/utlbufferutil.cpp
@@ -20,6 +20,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <limits.h>
+#include "tier1/utlbinaryblock.h"
#include "tier1/utlstring.h"
#include "tier1/strtools.h"
#include "tier1/characterset.h"
@@ -550,7 +551,7 @@ bool Unserialize( CUtlBuffer &buf, CUtlString &dest )
{
int nLen = buf.PeekDelimitedStringLength( s_pConv );
dest.SetLength( nLen - 1 ); // -1 because the length returned includes space for \0
- buf.GetDelimitedString( s_pConv, dest.Get(), nLen );
+ buf.GetDelimitedString( s_pConv, dest.GetForModify(), nLen );
return buf.IsValid();
}
diff --git a/mp/src/tier1/utlstring.cpp b/mp/src/tier1/utlstring.cpp
index 85c36a3b..570aab85 100644
--- a/mp/src/tier1/utlstring.cpp
+++ b/mp/src/tier1/utlstring.cpp
@@ -4,6 +4,9 @@
//
//=============================================================================
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
+
#include "tier1/utlstring.h"
#include "tier1/strtools.h"
#include <ctype.h>
@@ -11,312 +14,256 @@
// NOTE: This has to be the last file included!
#include "tier0/memdbgon.h"
-
//-----------------------------------------------------------------------------
-// Base class, containing simple memory management
+// Simple string class.
//-----------------------------------------------------------------------------
-CUtlBinaryBlock::CUtlBinaryBlock( int growSize, int initSize )
-{
- MEM_ALLOC_CREDIT();
- m_Memory.Init( growSize, initSize );
-
- m_nActualLength = 0;
-}
-CUtlBinaryBlock::CUtlBinaryBlock( void* pMemory, int nSizeInBytes, int nInitialLength ) : m_Memory( (unsigned char*)pMemory, nSizeInBytes )
-{
- m_nActualLength = nInitialLength;
-}
-
-CUtlBinaryBlock::CUtlBinaryBlock( const void* pMemory, int nSizeInBytes ) : m_Memory( (const unsigned char*)pMemory, nSizeInBytes )
-{
- m_nActualLength = nSizeInBytes;
-}
-
-CUtlBinaryBlock::CUtlBinaryBlock( const CUtlBinaryBlock& src )
-{
- Set( src.Get(), src.Length() );
-}
-
-void CUtlBinaryBlock::Get( void *pValue, int nLen ) const
+//-----------------------------------------------------------------------------
+// Either allocates or reallocates memory to the length
+//
+// Allocated space for length characters. It automatically adds space for the
+// nul and the cached length at the start of the memory block. Will adjust
+// m_pString and explicitly set the nul at the end before returning.
+void *CUtlString::AllocMemory( uint32 length )
{
- Assert( nLen > 0 );
- if ( m_nActualLength < nLen )
+ void *pMemoryBlock;
+ if ( m_pString )
{
- nLen = m_nActualLength;
+ pMemoryBlock = realloc( m_pString, length + 1 );
}
-
- if ( nLen > 0 )
+ else
{
- memcpy( pValue, m_Memory.Base(), nLen );
+ pMemoryBlock = malloc( length + 1 );
}
+ m_pString = (char*)pMemoryBlock;
+ m_pString[ length ] = 0;
+
+ return pMemoryBlock;
}
-void CUtlBinaryBlock::SetLength( int nLength )
+//-----------------------------------------------------------------------------
+void CUtlString::SetDirect( const char *pValue, int nChars )
{
- MEM_ALLOC_CREDIT();
- Assert( !m_Memory.IsReadOnly() );
-
- m_nActualLength = nLength;
- if ( nLength > m_Memory.NumAllocated() )
+ if ( pValue && nChars > 0 )
{
- int nOverFlow = nLength - m_Memory.NumAllocated();
- m_Memory.Grow( nOverFlow );
-
- // If the reallocation failed, clamp length
- if ( nLength > m_Memory.NumAllocated() )
+ if ( pValue == m_pString )
{
- m_nActualLength = m_Memory.NumAllocated();
+ AssertMsg( nChars == Q_strlen(m_pString), "CUtlString::SetDirect does not support resizing strings in place." );
+ return; // Do nothing. Realloc in AllocMemory might move pValue's location resulting in a bad memcpy.
}
- }
-#ifdef _DEBUG
- if ( m_Memory.NumAllocated() > m_nActualLength )
- {
- memset( ( ( char * )m_Memory.Base() ) + m_nActualLength, 0xEB, m_Memory.NumAllocated() - m_nActualLength );
+ Assert( nChars <= Min<int>( strnlen(pValue, nChars) + 1, nChars ) );
+ AllocMemory( nChars );
+ Q_memcpy( m_pString, pValue, nChars );
}
-#endif
-}
-
-
-void CUtlBinaryBlock::Set( const void *pValue, int nLen )
-{
- Assert( !m_Memory.IsReadOnly() );
-
- if ( !pValue )
+ else
{
- nLen = 0;
+ Purge();
}
- SetLength( nLen );
-
- if ( m_nActualLength )
- {
- if ( ( ( const char * )m_Memory.Base() ) >= ( ( const char * )pValue ) + nLen ||
- ( ( const char * )m_Memory.Base() ) + m_nActualLength <= ( ( const char * )pValue ) )
- {
- memcpy( m_Memory.Base(), pValue, m_nActualLength );
- }
- else
- {
- memmove( m_Memory.Base(), pValue, m_nActualLength );
- }
- }
-}
-
-
-CUtlBinaryBlock &CUtlBinaryBlock::operator=( const CUtlBinaryBlock &src )
-{
- Assert( !m_Memory.IsReadOnly() );
- Set( src.Get(), src.Length() );
- return *this;
}
-bool CUtlBinaryBlock::operator==( const CUtlBinaryBlock &src ) const
-{
- if ( src.Length() != Length() )
- return false;
-
- return !memcmp( src.Get(), Get(), Length() );
-}
-
-
-//-----------------------------------------------------------------------------
-// Simple string class.
-//-----------------------------------------------------------------------------
-CUtlString::CUtlString()
+void CUtlString::Set( const char *pValue )
{
+ int length = pValue ? V_strlen( pValue ) : 0;
+ SetDirect( pValue, length );
}
-CUtlString::CUtlString( const char *pString )
+// Sets the length (used to serialize into the buffer )
+void CUtlString::SetLength( int nLen )
{
- Set( pString );
+ if ( nLen > 0 )
+ {
+#ifdef _DEBUG
+ int prevLen = m_pString ? Length() : 0;
+#endif
+ AllocMemory( nLen );
+#ifdef _DEBUG
+ if ( nLen > prevLen )
+ {
+ V_memset( m_pString + prevLen, 0xEB, nLen - prevLen );
+ }
+#endif
+ }
+ else
+ {
+ Purge();
+ }
}
-CUtlString::CUtlString( const CUtlString& string )
+const char *CUtlString::Get( ) const
{
- Set( string.Get() );
+ if (!m_pString)
+ {
+ return "";
+ }
+ return m_pString;
}
-// Attaches the string to external memory. Useful for avoiding a copy
-CUtlString::CUtlString( void* pMemory, int nSizeInBytes, int nInitialLength ) : m_Storage( pMemory, nSizeInBytes, nInitialLength )
+char *CUtlString::GetForModify()
{
-}
+ if ( !m_pString )
+ {
+ // In general, we optimise away small mallocs for empty strings
+ // but if you ask for the non-const bytes, they must be writable
+ // so we can't return "" here, like we do for the const version - jd
+ void *pMemoryBlock = malloc( 1 );
+ m_pString = (char *)pMemoryBlock;
+ *m_pString = 0;
+ }
-CUtlString::CUtlString( const void* pMemory, int nSizeInBytes ) : m_Storage( pMemory, nSizeInBytes )
-{
+ return m_pString;
}
-
-//-----------------------------------------------------------------------------
-// Purpose: Set directly and don't look for a null terminator in pValue.
-//-----------------------------------------------------------------------------
-void CUtlString::SetDirect( const char *pValue, int nChars )
+char CUtlString::operator[]( int i ) const
{
- Assert( !m_Storage.IsReadOnly() );
- m_Storage.Set( pValue, nChars + 1 );
-
- // Make sure to null terminate the copied string
- *(((char *)m_Storage.Get()) + nChars) = NULL;
-}
+ if ( !m_pString )
+ return '\0';
+ if ( i >= Length() )
+ {
+ return '\0';
+ }
-void CUtlString::Set( const char *pValue )
-{
- Assert( !m_Storage.IsReadOnly() );
- int nLen = pValue ? Q_strlen(pValue) + 1 : 0;
- m_Storage.Set( pValue, nLen );
+ return m_pString[i];
}
-
-// Returns strlen
-int CUtlString::Length() const
+void CUtlString::Clear()
{
- return m_Storage.Length() ? m_Storage.Length() - 1 : 0;
+ Purge();
}
-// Sets the length (used to serialize into the buffer )
-void CUtlString::SetLength( int nLen )
+void CUtlString::Purge()
{
- Assert( !m_Storage.IsReadOnly() );
-
- // Add 1 to account for the NULL
- m_Storage.SetLength( nLen > 0 ? nLen + 1 : 0 );
+ free( m_pString );
+ m_pString = NULL;
}
-const char *CUtlString::Get( ) const
+bool CUtlString::IsEqual_CaseSensitive( const char *src ) const
{
- if ( m_Storage.Length() == 0 )
+ if ( !src )
{
- return "";
+ return (Length() == 0);
}
-
- return reinterpret_cast< const char* >( m_Storage.Get() );
-}
-
-// Converts to c-strings
-CUtlString::operator const char*() const
-{
- return Get();
+ return ( V_strcmp( Get(), src ) == 0 );
}
-char *CUtlString::Get()
+bool CUtlString::IsEqual_CaseInsensitive( const char *src ) const
{
- Assert( !m_Storage.IsReadOnly() );
-
- if ( m_Storage.Length() == 0 )
+ if ( !src )
{
- // In general, we optimise away small mallocs for empty strings
- // but if you ask for the non-const bytes, they must be writable
- // so we can't return "" here, like we do for the const version - jd
- m_Storage.SetLength( 1 );
- m_Storage[ 0 ] = '\0';
+ return (Length() == 0);
}
-
- return reinterpret_cast< char* >( m_Storage.Get() );
-}
-
-void CUtlString::Purge()
-{
- m_Storage.Purge();
+ return ( V_stricmp( Get(), src ) == 0 );
}
void CUtlString::ToLower()
{
- for( int nLength = Length() - 1; nLength >= 0; nLength-- )
+ if ( !m_pString )
{
- m_Storage[ nLength ] = tolower( m_Storage[ nLength ] );
+ return;
}
-}
+ V_strlower( m_pString );
+}
void CUtlString::ToUpper()
{
- for( int nLength = Length() - 1; nLength >= 0; nLength-- )
+ if ( !m_pString )
{
- m_Storage[ nLength ] = toupper( m_Storage[ nLength ] );
+ return;
}
-}
+ V_strupr( m_pString );
+}
CUtlString &CUtlString::operator=( const CUtlString &src )
{
- Assert( !m_Storage.IsReadOnly() );
- m_Storage = src.m_Storage;
+ SetDirect( src.Get(), src.Length() );
return *this;
}
CUtlString &CUtlString::operator=( const char *src )
{
- Assert( !m_Storage.IsReadOnly() );
Set( src );
return *this;
}
bool CUtlString::operator==( const CUtlString &src ) const
{
- return m_Storage == src.m_Storage;
-}
+ if ( IsEmpty() )
+ {
+ if ( src.IsEmpty() )
+ {
+ return true;
+ }
-bool CUtlString::operator==( const char *src ) const
-{
- return ( strcmp( Get(), src ) == 0 );
+ return false;
+ }
+ else
+ {
+ if ( src.IsEmpty() )
+ {
+ return false;
+ }
+
+ return Q_strcmp( m_pString, src.m_pString ) == 0;
+ }
}
CUtlString &CUtlString::operator+=( const CUtlString &rhs )
{
- Assert( !m_Storage.IsReadOnly() );
-
const int lhsLength( Length() );
const int rhsLength( rhs.Length() );
+
+ if (!rhsLength)
+ {
+ return *this;
+ }
+
const int requestedLength( lhsLength + rhsLength );
- SetLength( requestedLength );
- const int allocatedLength( Length() );
- const int copyLength( allocatedLength - lhsLength < rhsLength ? allocatedLength - lhsLength : rhsLength );
- memcpy( Get() + lhsLength, rhs.Get(), copyLength );
- m_Storage[ allocatedLength ] = '\0';
+ AllocMemory( requestedLength );
+ Q_memcpy( m_pString + lhsLength, rhs.m_pString, rhsLength );
return *this;
}
CUtlString &CUtlString::operator+=( const char *rhs )
{
- Assert( !m_Storage.IsReadOnly() );
-
const int lhsLength( Length() );
- const int rhsLength( Q_strlen( rhs ) );
+ const int rhsLength( V_strlen( rhs ) );
const int requestedLength( lhsLength + rhsLength );
- SetLength( requestedLength );
- const int allocatedLength( Length() );
- const int copyLength( allocatedLength - lhsLength < rhsLength ? allocatedLength - lhsLength : rhsLength );
- memcpy( Get() + lhsLength, rhs, copyLength );
- m_Storage[ allocatedLength ] = '\0';
+ if (!requestedLength)
+ {
+ return *this;
+ }
+
+ AllocMemory( requestedLength );
+ Q_memcpy( m_pString + lhsLength, rhs, rhsLength );
return *this;
}
CUtlString &CUtlString::operator+=( char c )
{
- Assert( !m_Storage.IsReadOnly() );
+ const int lhsLength( Length() );
+
+ AllocMemory( lhsLength + 1 );
+ m_pString[ lhsLength ] = c;
- int nLength = Length();
- SetLength( nLength + 1 );
- m_Storage[ nLength ] = c;
- m_Storage[ nLength+1 ] = '\0';
return *this;
}
CUtlString &CUtlString::operator+=( int rhs )
{
- Assert( !m_Storage.IsReadOnly() );
Assert( sizeof( rhs ) == 4 );
char tmpBuf[ 12 ]; // Sufficient for a signed 32 bit integer [ -2147483648 to +2147483647 ]
- Q_snprintf( tmpBuf, sizeof( tmpBuf ), "%d", rhs );
+ V_snprintf( tmpBuf, sizeof( tmpBuf ), "%d", rhs );
tmpBuf[ sizeof( tmpBuf ) - 1 ] = '\0';
return operator+=( tmpBuf );
@@ -324,16 +271,14 @@ CUtlString &CUtlString::operator+=( int rhs )
CUtlString &CUtlString::operator+=( double rhs )
{
- Assert( !m_Storage.IsReadOnly() );
-
char tmpBuf[ 256 ]; // How big can doubles be??? Dunno.
- Q_snprintf( tmpBuf, sizeof( tmpBuf ), "%lg", rhs );
+ V_snprintf( tmpBuf, sizeof( tmpBuf ), "%lg", rhs );
tmpBuf[ sizeof( tmpBuf ) - 1 ] = '\0';
return operator+=( tmpBuf );
}
-bool CUtlString::MatchesPattern( const CUtlString &Pattern, int nFlags )
+bool CUtlString::MatchesPattern( const CUtlString &Pattern, int nFlags ) const
{
const char *pszSource = String();
const char *pszPattern = Pattern.String();
@@ -413,31 +358,27 @@ bool CUtlString::MatchesPattern( const CUtlString &Pattern, int nFlags )
int CUtlString::Format( const char *pFormat, ... )
{
- Assert( !m_Storage.IsReadOnly() );
-
- char tmpBuf[ 4096 ]; //< Nice big 4k buffer, as much memory as my first computer had, a Radio Shack Color Computer
-
va_list marker;
va_start( marker, pFormat );
-#ifdef _WIN32
- int len = _vsnprintf( tmpBuf, sizeof( tmpBuf ) - 1, pFormat, marker );
-#elif POSIX
- int len = vsnprintf( tmpBuf, sizeof( tmpBuf ) - 1, pFormat, marker );
-#else
-#error "define vsnprintf type."
-#endif
+ int len = FormatV( pFormat, marker );
va_end( marker );
- // Len > maxLen represents an overflow on POSIX, < 0 is an overflow on windows
- if( len < 0 || len >= sizeof( tmpBuf ) - 1 )
- {
- len = sizeof( tmpBuf ) - 1;
- tmpBuf[sizeof( tmpBuf ) - 1] = 0;
- }
+ return len;
+}
- Set( tmpBuf );
+//--------------------------------------------------------------------------------------------------
+// This can be called from functions that take varargs.
+//--------------------------------------------------------------------------------------------------
+int CUtlString::FormatV( const char *pFormat, va_list marker )
+{
+ char tmpBuf[ 4096 ]; //< Nice big 4k buffer, as much memory as my first computer had, a Radio Shack Color Computer
+
+ //va_start( marker, pFormat );
+ int len = V_vsprintf_safe( tmpBuf, pFormat, marker );
+ //va_end( marker );
+ Set( tmpBuf );
return len;
}
@@ -450,88 +391,322 @@ void CUtlString::StripTrailingSlash()
return;
int nLastChar = Length() - 1;
- char c = m_Storage[ nLastChar ];
+ char c = m_pString[ nLastChar ];
if ( c == '\\' || c == '/' )
{
- m_Storage[ nLastChar ] = 0;
- m_Storage.SetLength( m_Storage.Length() - 1 );
+ SetLength( nLastChar );
+ }
+}
+
+void CUtlString::FixSlashes( char cSeparator/*=CORRECT_PATH_SEPARATOR*/ )
+{
+ if ( m_pString )
+ {
+ V_FixSlashes( m_pString, cSeparator );
+ }
+}
+
+//-----------------------------------------------------------------------------
+// Trim functions
+//-----------------------------------------------------------------------------
+void CUtlString::TrimLeft( char cTarget )
+{
+ int nIndex = 0;
+
+ if ( IsEmpty() )
+ {
+ return;
+ }
+
+ while( m_pString[nIndex] == cTarget )
+ {
+ ++nIndex;
+ }
+
+ // We have some whitespace to remove
+ if ( nIndex > 0 )
+ {
+ memcpy( m_pString, &m_pString[nIndex], Length() - nIndex );
+ SetLength( Length() - nIndex );
+ }
+}
+
+
+void CUtlString::TrimLeft( const char *szTargets )
+{
+ int i;
+
+ if ( IsEmpty() )
+ {
+ return;
+ }
+
+ for( i = 0; m_pString[i] != 0; i++ )
+ {
+ bool bWhitespace = false;
+
+ for( int j = 0; szTargets[j] != 0; j++ )
+ {
+ if ( m_pString[i] == szTargets[j] )
+ {
+ bWhitespace = true;
+ break;
+ }
+ }
+
+ if ( !bWhitespace )
+ {
+ break;
+ }
+ }
+
+ // We have some whitespace to remove
+ if ( i > 0 )
+ {
+ memcpy( m_pString, &m_pString[i], Length() - i );
+ SetLength( Length() - i );
+ }
+}
+
+
+void CUtlString::TrimRight( char cTarget )
+{
+ const int nLastCharIndex = Length() - 1;
+ int nIndex = nLastCharIndex;
+
+ while ( nIndex >= 0 && m_pString[nIndex] == cTarget )
+ {
+ --nIndex;
+ }
+
+ // We have some whitespace to remove
+ if ( nIndex < nLastCharIndex )
+ {
+ m_pString[nIndex + 1] = 0;
+ SetLength( nIndex + 2 );
+ }
+}
+
+
+void CUtlString::TrimRight( const char *szTargets )
+{
+ const int nLastCharIndex = Length() - 1;
+ int i;
+
+ for( i = nLastCharIndex; i > 0; i-- )
+ {
+ bool bWhitespace = false;
+
+ for( int j = 0; szTargets[j] != 0; j++ )
+ {
+ if ( m_pString[i] == szTargets[j] )
+ {
+ bWhitespace = true;
+ break;
+ }
+ }
+
+ if ( !bWhitespace )
+ {
+ break;
+ }
+ }
+
+ // We have some whitespace to remove
+ if ( i < nLastCharIndex )
+ {
+ m_pString[i + 1] = 0;
+ SetLength( i + 2 );
}
}
-CUtlString CUtlString::Slice( int32 nStart, int32 nEnd )
+
+void CUtlString::Trim( char cTarget )
+{
+ TrimLeft( cTarget );
+ TrimRight( cTarget );
+}
+
+
+void CUtlString::Trim( const char *szTargets )
{
+ TrimLeft( szTargets );
+ TrimRight( szTargets );
+}
+
+
+CUtlString CUtlString::Slice( int32 nStart, int32 nEnd ) const
+{
+ int length = Length();
+ if ( length == 0 )
+ {
+ return CUtlString();
+ }
+
if ( nStart < 0 )
- nStart = Length() - (-nStart % Length());
- else if ( nStart >= Length() )
- nStart = Length();
+ nStart = length - (-nStart % length);
+ else if ( nStart >= length )
+ nStart = length;
- if ( nEnd == 0x7FFFFFFF )
- nEnd = Length();
+ if ( nEnd == INT32_MAX )
+ nEnd = length;
else if ( nEnd < 0 )
- nEnd = Length() - (-nEnd % Length());
- else if ( nEnd >= Length() )
- nEnd = Length();
+ nEnd = length - (-nEnd % length);
+ else if ( nEnd >= length )
+ nEnd = length;
if ( nStart >= nEnd )
- return CUtlString( "" );
+ return CUtlString();
const char *pIn = String();
CUtlString ret;
- ret.m_Storage.SetLength( nEnd - nStart + 1 );
- char *pOut = (char*)ret.m_Storage.Get();
-
- memcpy( ret.m_Storage.Get(), &pIn[nStart], nEnd - nStart );
- pOut[nEnd - nStart] = 0;
-
+ ret.SetDirect( pIn + nStart, nEnd - nStart );
return ret;
}
// Grab a substring starting from the left or the right side.
-CUtlString CUtlString::Left( int32 nChars )
+CUtlString CUtlString::Left( int32 nChars ) const
{
return Slice( 0, nChars );
}
-CUtlString CUtlString::Right( int32 nChars )
+CUtlString CUtlString::Right( int32 nChars ) const
{
return Slice( -nChars );
}
-CUtlString CUtlString::Replace( char cFrom, char cTo )
+CUtlString CUtlString::Replace( char cFrom, char cTo ) const
{
+ if (!m_pString)
+ {
+ return CUtlString();
+ }
+
CUtlString ret = *this;
int len = ret.Length();
for ( int i=0; i < len; i++ )
{
- if ( ret.m_Storage[i] == cFrom )
- ret.m_Storage[i] = cTo;
+ if ( ret.m_pString[i] == cFrom )
+ ret.m_pString[i] = cTo;
}
return ret;
}
-CUtlString CUtlString::AbsPath( const char *pStartingDir )
+CUtlString CUtlString::Replace( const char *pszFrom, const char *pszTo ) const
+{
+ Assert( pszTo ); // Can be 0 length, but not null
+ Assert( pszFrom && *pszFrom ); // Must be valid and have one character.
+
+
+ const char *pos = V_strstr( String(), pszFrom );
+ if ( !pos )
+ {
+ return *this;
+ }
+
+ const char *pFirstFound = pos;
+
+ // count number of search string
+ int nSearchCount = 0;
+ int nSearchLength = V_strlen( pszFrom );
+ while ( pos )
+ {
+ nSearchCount++;
+ int nSrcOffset = ( pos - String() ) + nSearchLength;
+ pos = V_strstr( String() + nSrcOffset, pszFrom );
+ }
+
+ // allocate the new string
+ int nReplaceLength = V_strlen( pszTo );
+ int nAllocOffset = nSearchCount * ( nReplaceLength - nSearchLength );
+ size_t srcLength = Length();
+ CUtlString strDest;
+ size_t destLength = srcLength + nAllocOffset;
+ strDest.SetLength( destLength );
+
+ // find and replace the search string
+ pos = pFirstFound;
+ int nDestOffset = 0;
+ int nSrcOffset = 0;
+ while ( pos )
+ {
+ // Found an instance
+ int nCurrentSearchOffset = pos - String();
+ int nCopyLength = nCurrentSearchOffset - nSrcOffset;
+ V_strncpy( strDest.GetForModify() + nDestOffset, String() + nSrcOffset, nCopyLength + 1 );
+ nDestOffset += nCopyLength;
+ V_strncpy( strDest.GetForModify() + nDestOffset, pszTo, nReplaceLength + 1 );
+ nDestOffset += nReplaceLength;
+
+ nSrcOffset = nCurrentSearchOffset + nSearchLength;
+ pos = V_strstr( String() + nSrcOffset, pszFrom );
+ }
+
+ // making sure that the left over string from the source is the same size as the left over dest buffer
+ Assert( destLength - nDestOffset == srcLength - nSrcOffset );
+ if ( destLength - nDestOffset > 0 )
+ {
+ V_strncpy( strDest.GetForModify() + nDestOffset, String() + nSrcOffset, destLength - nDestOffset + 1 );
+ }
+
+ return strDest;
+}
+
+CUtlString CUtlString::AbsPath( const char *pStartingDir ) const
{
char szNew[MAX_PATH];
V_MakeAbsolutePath( szNew, sizeof( szNew ), this->String(), pStartingDir );
return CUtlString( szNew );
}
-CUtlString CUtlString::UnqualifiedFilename()
+CUtlString CUtlString::UnqualifiedFilename() const
{
const char *pFilename = V_UnqualifiedFileName( this->String() );
return CUtlString( pFilename );
}
-CUtlString CUtlString::DirName()
+CUtlString CUtlString::DirName() const
{
CUtlString ret( this->String() );
- V_StripLastDir( (char*)ret.m_Storage.Get(), ret.m_Storage.Length() );
- V_StripTrailingSlash( (char*)ret.m_Storage.Get() );
+ V_StripLastDir( (char*)ret.Get(), ret.Length() + 1 );
+ V_StripTrailingSlash( (char*)ret.Get() );
return ret;
}
+CUtlString CUtlString::StripExtension() const
+{
+ char szTemp[MAX_PATH];
+ V_StripExtension( String(), szTemp, sizeof( szTemp ) );
+ return CUtlString( szTemp );
+}
+
+CUtlString CUtlString::StripFilename() const
+{
+ const char *pFilename = V_UnqualifiedFileName( Get() ); // NOTE: returns 'Get()' on failure, never NULL
+ int nCharsToCopy = pFilename - Get();
+ CUtlString result;
+ result.SetDirect( Get(), nCharsToCopy );
+ result.StripTrailingSlash();
+ return result;
+}
+
+CUtlString CUtlString::GetBaseFilename() const
+{
+ char szTemp[MAX_PATH];
+ V_FileBase( String(), szTemp, sizeof( szTemp ) );
+ return CUtlString( szTemp );
+}
+
+CUtlString CUtlString::GetExtension() const
+{
+ char szTemp[MAX_PATH];
+ V_ExtractFileExtension( String(), szTemp, sizeof( szTemp ) );
+ return CUtlString( szTemp );
+}
+
+
CUtlString CUtlString::PathJoin( const char *pStr1, const char *pStr2 )
{
char szPath[MAX_PATH];
@@ -539,10 +714,54 @@ CUtlString CUtlString::PathJoin( const char *pStr1, const char *pStr2 )
return CUtlString( szPath );
}
+CUtlString CUtlString::operator+( const char *pOther ) const
+{
+ CUtlString s = *this;
+ s += pOther;
+ return s;
+}
+
+CUtlString CUtlString::operator+( const CUtlString &other ) const
+{
+ CUtlString s = *this;
+ s += other;
+ return s;
+}
+
+CUtlString CUtlString::operator+( int rhs ) const
+{
+ CUtlString ret = *this;
+ ret += rhs;
+ return ret;
+}
+
//-----------------------------------------------------------------------------
// Purpose: concatenate the provided string to our current content
//-----------------------------------------------------------------------------
void CUtlString::Append( const char *pchAddition )
{
- *this += pchAddition;
+ (*this) += pchAddition;
+}
+
+void CUtlString::Append( const char *pchAddition, int nChars )
+{
+ nChars = Min<int>( nChars, V_strlen( pchAddition ) );
+
+ const int lhsLength( Length() );
+ const int rhsLength( nChars );
+ const int requestedLength( lhsLength + rhsLength );
+
+ AllocMemory( requestedLength );
+ const int allocatedLength( requestedLength );
+ const int copyLength( allocatedLength - lhsLength < rhsLength ? allocatedLength - lhsLength : rhsLength );
+ memcpy( GetForModify() + lhsLength, pchAddition, copyLength );
+ m_pString[ allocatedLength ] = '\0';
+}
+
+// Shared static empty string.
+const CUtlString &CUtlString::GetEmptyString()
+{
+ static const CUtlString s_emptyString;
+
+ return s_emptyString;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-05 11:51:51 +0000