Fix four LP64 defects and add Oracle 19 client discovery#34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AconiteX merged 5 commits into from
Jul 26, 2026
Merged

Fix four LP64 defects and add Oracle 19 client discovery #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55c8f22
Use fixed-width counts in the NetworkId and Unicode packed maps
swgsais Jul 25, 2026
ec3419d
Store call stack addresses at pointer width
swgsais Jul 25, 2026
4fac50d
Back QueryPerformanceCounter with a monotonic clock
swgsais Jul 25, 2026
750f7d8
Stop dereferencing a 32-bit frame offset in the SIGSEGV handler
swgsais Jul 25, 2026
a7c1459
Support Oracle 19 x64 Instant Client discovery
swgsais Jul 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmake/linux/FindOracle.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,11 @@ if(DEFINED ENV{ORACLE_HOME})
${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

set(ORACLE_OCI_NAMES clntsh libclntsh oci)
set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz21 nnz21 ociw32)
set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz19 nnz19 libnnz21 nnz21 ociw32)
set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)

set(ORACLE_LIB_DIR
${ORACLE_HOME}
${ORACLE_HOME}/lib
${ORACLE_HOME}/sdk/lib # Oracle SDK
${ORACLE_HOME}/sdk/lib/msvc
Expand DownExpand Up@@ -76,4 +77,4 @@ endif(DEFINED ENV{ORACLE_HOME})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
26 changes: 18 additions & 8 deletions engine/server/library/serverScript/src/shared/JavaLibrary.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -781,16 +781,26 @@ void JavaLibrary::fatalHandler(int signum)
{
// try to see if our call stack came from C or Java
void *frameAddress = __builtin_frame_address(0);
// the address that generated the segfault is stored at an offset of 0x44 from
// the frame address
// @todo: find documentation on the offset to verify it is stable
void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));

// pass the crash address to addr2line to get the file name where the crash occurred
// These are zero initialized because the strstr() checks below read them
// whenever a lookup fails.
static const int BUFLEN = 2048;
char lib1[BUFLEN], lib2[BUFLEN];
char file1[BUFLEN], file2[BUFLEN];
int line1, line2;
bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
char lib1[BUFLEN] = { '\0' }, lib2[BUFLEN] = { '\0' };
char file1[BUFLEN] = { '\0' }, file2[BUFLEN] = { '\0' };
int line1 = 0, line2 = 0;
bool result1 = false;

// The faulting address used to be read from a fixed 0x44 byte offset into
// this frame. That constant describes the 32-bit x86 frame layout only; on
// x86-64 it is both misaligned and meaningless, and dereferencing it from
// inside a SIGSEGV handler risks a recursive fault that loses the crash
// report entirely. The __builtin_return_address() probe below is portable
// and already covers this case.
#if defined(__i386__)
void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));
result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
#endif

// do a second test based on the return address
// it turns out that in some java crashes we don't even have 2 return
Expand Down
23 changes: 21 additions & 2 deletions engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -682,11 +682,30 @@ bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int

// ----------------------------------------------------------------------

void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
//-- backtrace() writes sizeOfCallStack void* entries. Handing it the
// caller's buffer directly only works when sizeof(void*) happens to
// equal the element size; under LP64 it wrote 8 bytes per entry into a
// 4-byte-per-entry array and overran the buffer by 2x. Capture into a
// native pointer array and widen instead, which is correct for both
// ILP32 and LP64.
enum { cs_maximumFrameCount = 256 };

@AconiteXAconiteXJul 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is functioning as a magic number, so could instead be at top of file, even though it is scoped and only relevant to the single function so it's 50/50 (I also don't love use of an untyped enum here since the compiler then has to make an inference and god knows what it may do in the future); alternatively, e.g., at top of file:

namespace
{
constexprint cs_maximumFrameCount = 256;
}


if (sizeOfCallStack <= 0)
return;

@AconiteXAconiteXJul 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source generally (but admittedly inconsistently) uses allman style bracing and doesn't tend to use indentation block syntax/off-side rule, so code like this would properly be (but again doesn't technically matter and would surely start a not so fun debate)

if (sizeOfCallStack <= 0)
{
return;
}


for (int i = 0; i < sizeOfCallStack; ++i)
callStack[i] = 0;
IGNORE_RETURN(backtrace(reinterpret_cast<void **>(callStack), sizeOfCallStack));

if (sizeOfCallStack > static_cast<int>(cs_maximumFrameCount))
sizeOfCallStack = static_cast<int>(cs_maximumFrameCount);

void *frames[cs_maximumFrameCount];
int const frameCount = backtrace(frames, sizeOfCallStack);

for (int i = 0; i < frameCount; ++i)
callStack[i] = reinterpret_cast<uint64>(frames[i]);
}

// ======================================================================
Expand Down
5 changes: 4 additions & 1 deletion engine/shared/library/sharedDebug/src/linux/DebugHelp.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,10 @@ class DebugHelp
static void install();
static void remove();

static void getCallStack(uint32 *callStack, int sizeOfCallStack);
//-- Entries are instruction addresses, so the buffer must be pointer-width
// capable. uint64 matches lookupAddress() below and is wide enough on
// both ILP32 and LP64.
static void getCallStack(uint64 *callStack, int sizeOfCallStack);
static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);
};

Expand Down
8 changes: 4 additions & 4 deletions engine/shared/library/sharedDebug/src/shared/CallStack.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ void CallStack::debugPrint() const
for (size_t i = 2; i < CALLSTACK_DEPTH; ++i)
{
if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
DEBUG_REPORT_PRINT(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
DEBUG_REPORT_PRINT(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
else
DEBUG_REPORT_PRINT(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
DEBUG_REPORT_PRINT(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
}
}

Expand All@@ -76,9 +76,9 @@ void CallStack::debugLog() const
for (size_t i = 2; i < CALLSTACK_DEPTH && m_callStack[i]!=0; ++i)
{
if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
DEBUG_REPORT_LOG(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
DEBUG_REPORT_LOG(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
else
DEBUG_REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
DEBUG_REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
}
}

Expand Down
3 changes: 2 additions & 1 deletion engine/shared/library/sharedDebug/src/shared/CallStack.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ class CallStack

private:

uint32 m_callStack[S_callStack];
//-- Instruction addresses; must be pointer-width capable (see DebugHelp::getCallStack).
uint64 m_callStack[S_callStack];
};

// ======================================================================
Expand Down
16 changes: 8 additions & 8 deletions engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ namespace CallStackCollectorNamespace
~Node();

CrcString const & getName() const;
void addCallStack(uint32 * callStack);
void addCallStack(uint64 * callStack);

void debugReport() const;

Expand All@@ -63,7 +63,7 @@ namespace CallStackCollectorNamespace

public:

uint32 * m_callStack;
uint64 * m_callStack;
int m_calls;
};

Expand DownExpand Up@@ -125,10 +125,10 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const

// ----------------------------------------------------------------------

void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
void CallStackCollectorNamespace::Node::addCallStack(uint64 * const callStack)
{
//-- Compute crc of memory
uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
uint32 const crc = Crc::calculate(callStack, (sizeof(*callStack) * CALLSTACK_DEPTH));

//-- Find callstack in list
CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
Expand All@@ -140,8 +140,8 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
else
{
//-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
memcpy(newCallStack, callStack, sizeof(*newCallStack));
uint64 * const newCallStack = new uint64[CALLSTACK_DEPTH];
memcpy(newCallStack, callStack, sizeof(*newCallStack) * CALLSTACK_DEPTH);

CallStackEntry callStackEntry;
callStackEntry.m_callStack = newCallStack;
Expand DownExpand Up@@ -180,7 +180,7 @@ void CallStackCollectorNamespace::Node::debugReport() const
if (DebugHelp::lookupAddress(callStackEntry->m_callStack[j], libName, fileName, sizeof(fileName), line))
REPORT_LOG(true, (" %s(%d) : caller %d\n", fileName, line, j - 1));
else
REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(callStackEntry->m_callStack[j]), j - 1));
REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStackEntry->m_callStack[j]), j - 1));
}
}
}
Expand DownExpand Up@@ -218,7 +218,7 @@ void CallStackCollector::sample(char const * const name)
}

//-- Sample the callstack
uint32 callStack[CALLSTACK_DEPTH];
uint64 callStack[CALLSTACK_DEPTH];
DebugHelp::getCallStack(&callStack[0], CALLSTACK_DEPTH);

//-- Add to the node
Expand Down
10 changes: 5 additions & 5 deletions engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -481,7 +481,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name)

// ----------------------------------------------------------------------
#pragma warning (disable: 4740 4748)
void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
{
for (int i = 0; i < sizeOfCallStack; ++i)
Expand DownExpand Up@@ -525,7 +525,7 @@ void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
if (stackWalk64(IMAGE_FILE_MACHINE_I386, process, process, &stackFrame, &context, NULL, functionTableAccess, getModuleBase, NULL))
{
const DWORD64 Offset = stackFrame.AddrPC.Offset;
*callStack = DWORD(Offset);
*callStack = static_cast<uint64>(Offset);
}
}
}
Expand All@@ -537,7 +537,7 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
// look up the call stack information
int const callStackOffset = 2;
int const callStackSize = callStackOffset + maxStackDepth;
uint32 * callStack = static_cast<uint32 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint32)));
uint64 * callStack = static_cast<uint64 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint64)));
getCallStack(callStack, callStackOffset + maxStackDepth);

// look up the caller's file and line
Expand All@@ -553,15 +553,15 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
if (lookupAddress(callStack[i], lib, file, sizeof(file), line))
REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
else
REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
REPORT_LOG(true, ("\tunknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset));
}
}
}
}

// ----------------------------------------------------------------------

bool DebugHelp::lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line)
bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line)
{
UNREF(libName);

Expand Down
4 changes: 2 additions & 2 deletions engine/shared/library/sharedDebug/src/win32/DebugHelp.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ class DebugHelp

static bool loadSymbolsForDll(const char *name);

static void getCallStack(uint32 *callStack, int sizeOfCallStack);
static void getCallStack(uint64 *callStack, int sizeOfCallStack);
static void reportCallStack(int const maxStackDepth = 4);
static bool lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line);
static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);

static bool writeMiniDump(char const *miniDumpFileName=0, PEXCEPTION_POINTERS exceptionPointers=0);
};
Expand Down
21 changes: 17 additions & 4 deletions engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,10 +27,23 @@ char* _itoa(int value, char* stringOut, int radix)

bool QueryPerformanceCounter(__int64* time)
{
struct timeval tv;
gettimeofday(&tv, nullptr);
*time = static_cast<LARGE_INTEGER>(tv.tv_sec);
*time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
// Must be monotonic. gettimeofday() reports CLOCK_REALTIME, which NTP can
// slew or step backwards; callers subtract successive samples to derive
// frame time, so a backwards step produced negative elapsed times (see
// AlterScheduler "no forward time movement"). CLOCK_MONOTONIC never goes
// backwards. Units stay microseconds to match QueryPerformanceFrequency().
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
{
struct timeval tv;
gettimeofday(&tv, nullptr);
*time = static_cast<LARGE_INTEGER>(tv.tv_sec);
*time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
return TRUE;
}

*time = static_cast<LARGE_INTEGER>(ts.tv_sec);
*time = (*time * 1000000) + static_cast<LARGE_INTEGER>(ts.tv_nsec / 1000);

return TRUE;
}
Expand Down
10 changes: 5 additions & 5 deletions engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,8 @@ namespace Archive
char temp[200];
AutoDeltaMap<NetworkId, int>::Command c;

Archive::put(target, countCharacter(buffer,':'));
Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

int tempPos = 0;
for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -64,8 +64,8 @@ namespace Archive
char temp[200];

AutoDeltaMap<NetworkId, int>::Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

Archive::get(source, commandCount);
Archive::get(source, baselineCommandCount);
Expand All@@ -76,7 +76,7 @@ namespace Archive
}
else
{
for (size_t i = 0; i < commandCount; ++i)
for (int32_t i = 0; i < commandCount; ++i)
{
Archive::get(source, c.cmd);
Archive::get(source, c.key);
Expand Down
6 changes: 3 additions & 3 deletions engine/shared/library/sharedFoundation/src/shared/Fatal.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const

// look up the call stack information
const int callStackSize = callStackOffset + stackDepth;
uint32 callStack[callStackOffset + maxStackDepth];
uint64 callStack[callStackOffset + maxStackDepth];

// allow complete disable of the call stack lookup
if (stackDepth < 0)
Expand All@@ -82,7 +82,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
else
snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
snprintf(buffer, bufferLength, "(0x%016llX) : %s %08x: \n", static_cast<unsigned long long>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
}
else
{
Expand DownExpand Up@@ -126,7 +126,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
snprintf(buffer, bufferLength, " %s(%d) : caller %d\n", file, line, i-callStackOffset);
else
snprintf(buffer, bufferLength, " (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
snprintf(buffer, bufferLength, " (0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset);

const int length = strlen(buffer);
buffer += length;
Expand Down
10 changes: 5 additions & 5 deletions engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
char value[200];
Command c;

Archive::put(target, countCharacter(buffer,':'));
Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

int tempPos = 0;
for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -52,8 +52,8 @@ namespace Archive
char temp[200];

Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

Archive::get(source, commandCount);
Archive::get(source, baselineCommandCount);
Expand All@@ -64,7 +64,7 @@ namespace Archive
}
else
{
for (size_t i = 0; i < commandCount; ++i)
for (int32_t i = 0; i < commandCount; ++i)
{
Archive::get(source, c.cmd);
Archive::get(source, c.key);
Expand Down
10 changes: 5 additions & 5 deletions external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
char temp[200];
Command c;

Archive::put(target, countCharacter(buffer,':'));
Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

int tempPos = 0;
for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -55,8 +55,8 @@ namespace Archive
char temp[200];

Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

Archive::get(source, commandCount);
Archive::get(source, baselineCommandCount);
Expand All@@ -67,7 +67,7 @@ namespace Archive
}
else
{
for (size_t i = 0; i < commandCount; ++i)
for (int32_t i = 0; i < commandCount; ++i)
{
Archive::get(source, c.cmd);
assert(c.cmd == Command::ADD); // only add is valid in unpack
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix four LP64 defects and add Oracle 19 client discovery#34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AconiteX
merged 5 commits into

from

Jul 26, 2026
 Merged


Fix four LP64 defects and add Oracle 19 client discovery
#34
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
55c8f22

Use fixed-width counts in the NetworkId and Unicode packed maps


swgsais Jul 25, 2026
ec3419d

Store call stack addresses at pointer width


swgsais Jul 25, 2026
4fac50d

Back QueryPerformanceCounter with a monotonic clock


swgsais Jul 25, 2026
750f7d8

Stop dereferencing a 32-bit frame offset in the SIGSEGV handler


swgsais Jul 25, 2026
a7c1459

Support Oracle 19 x64 Instant Client discovery


swgsais Jul 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
cmake/linux/FindOracle.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,11 @@ if(DEFINED ENV{ORACLE_HOME})
 ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

 set(ORACLE_OCI_NAMES clntsh libclntsh oci)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz21 nnz21 ociw32)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz19 nnz19 libnnz21 nnz21 ociw32)
 set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)

 set(ORACLE_LIB_DIR 
 ${ORACLE_HOME}
 ${ORACLE_HOME}/lib
 ${ORACLE_HOME}/sdk/lib # Oracle SDK
 ${ORACLE_HOME}/sdk/lib/msvc
Expand DownExpand Up@@ -76,4 +77,4 @@ endif(DEFINED ENV{ORACLE_HOME})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)

26 changes: 18 additions & 8 deletions
engine/server/library/serverScript/src/shared/JavaLibrary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -781,16 +781,26 @@ void JavaLibrary::fatalHandler(int signum)
	{
 // try to see if our call stack came from C or Java
 void *frameAddress = __builtin_frame_address(0);
 // the address that generated the segfault is stored at an offset of 0x44 from
 // the frame address
 // @todo: find documentation on the offset to verify it is stable
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));

 // pass the crash address to addr2line to get the file name where the crash occurred
 // These are zero initialized because the strstr() checks below read them
 // whenever a lookup fails.
 static const int BUFLEN = 2048;
 char lib1[BUFLEN], lib2[BUFLEN];
 char file1[BUFLEN], file2[BUFLEN];
 int line1, line2;
 bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
 char lib1[BUFLEN] = { '\0' }, lib2[BUFLEN] = { '\0' };
 char file1[BUFLEN] = { '\0' }, file2[BUFLEN] = { '\0' };
 int line1 = 0, line2 = 0;
 bool result1 = false;

 // The faulting address used to be read from a fixed 0x44 byte offset into
 // this frame. That constant describes the 32-bit x86 frame layout only; on
 // x86-64 it is both misaligned and meaningless, and dereferencing it from
 // inside a SIGSEGV handler risks a recursive fault that loses the crash
 // report entirely. The __builtin_return_address() probe below is portable
 // and already covers this case.
#if defined(__i386__)
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));
 result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
#endif

 // do a second test based on the return address
 // it turns out that in some java crashes we don't even have 2 return
Expand Down

23 changes: 21 additions & 2 deletions
engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,11 +682,30 @@ bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int

// ----------------------------------------------------------------------

void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	//-- backtrace() writes sizeOfCallStack void* entries. Handing it the
	// caller's buffer directly only works when sizeof(void*) happens to
	// equal the element size; under LP64 it wrote 8 bytes per entry into a
	// 4-byte-per-entry array and overran the buffer by 2x. Capture into a
	// native pointer array and widen instead, which is correct for both
	// ILP32 and LP64.
	enum { cs_maximumFrameCount = 256 };
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is functioning as a magic number, so could instead be at top of file, even though it is scoped and only relevant to the single function so it's 50/50 (I also don't love use of an untyped enum here since the compiler then has to make an inference and god knows what it may do in the future); alternatively, e.g., at top of file:
namespace
{
constexprint cs_maximumFrameCount = 256;
}

	if (sizeOfCallStack <= 0)
 return;
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source generally (but admittedly inconsistently) uses allman style bracing and doesn't tend to use indentation block syntax/off-side rule, so code like this would properly be (but again doesn't technically matter and would surely start a not so fun debate)
if (sizeOfCallStack <= 0)
{
return;
}

	for (int i = 0; i < sizeOfCallStack; ++i)
 callStack[i] = 0;
	IGNORE_RETURN(backtrace(reinterpret_cast<void **>(callStack), sizeOfCallStack));

	if (sizeOfCallStack > static_cast<int>(cs_maximumFrameCount))
 sizeOfCallStack = static_cast<int>(cs_maximumFrameCount);

	void *frames[cs_maximumFrameCount];
	int const frameCount = backtrace(frames, sizeOfCallStack);

	for (int i = 0; i < frameCount; ++i)
 callStack[i] = reinterpret_cast<uint64>(frames[i]);
}

// ======================================================================
Expand Down

5 changes: 4 additions & 1 deletion
engine/shared/library/sharedDebug/src/linux/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,10 @@ class DebugHelp
	static void install();
	static void remove();

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	//-- Entries are instruction addresses, so the buffer must be pointer-width
	// capable. uint64 matches lookupAddress() below and is wide enough on
	// both ILP32 and LP64.
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);
};

Expand Down

8 changes: 4 additions & 4 deletions
engine/shared/library/sharedDebug/src/shared/CallStack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ void CallStack::debugPrint() const
	for (size_t i = 2; i < CALLSTACK_DEPTH; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_PRINT(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_PRINT(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_PRINT(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_PRINT(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand All@@ -76,9 +76,9 @@ void CallStack::debugLog() const
	for (size_t i = 2; i < CALLSTACK_DEPTH && m_callStack[i]!=0; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_LOG(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_LOG(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand Down

3 changes: 2 additions & 1 deletion
engine/shared/library/sharedDebug/src/shared/CallStack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ class CallStack

private:

	uint32 m_callStack[S_callStack];
	//-- Instruction addresses; must be pointer-width capable (see DebugHelp::getCallStack).
	uint64 m_callStack[S_callStack];
};

// ======================================================================
Expand Down

16 changes: 8 additions & 8 deletions
engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ namespace CallStackCollectorNamespace
 ~Node();

 CrcString const & getName() const;
 void addCallStack(uint32 * callStack);
 void addCallStack(uint64 * callStack);

 void debugReport() const;

Expand All@@ -63,7 +63,7 @@ namespace CallStackCollectorNamespace

 public:

uint32 * m_callStack;
uint64 * m_callStack;
 int m_calls;
 };

Expand DownExpand Up@@ -125,10 +125,10 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const

// ----------------------------------------------------------------------

void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
void CallStackCollectorNamespace::Node::addCallStack(uint64 * const callStack)
{
	//-- Compute crc of memory
	uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
	uint32 const crc = Crc::calculate(callStack, (sizeof(*callStack) * CALLSTACK_DEPTH));

	//-- Find callstack in list
	CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
Expand All@@ -140,8 +140,8 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
	else
	{
 //-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack));
uint64 * const newCallStack = new uint64[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack) * CALLSTACK_DEPTH);

 CallStackEntry callStackEntry;
 callStackEntry.m_callStack = newCallStack;
Expand DownExpand Up@@ -180,7 +180,7 @@ void CallStackCollectorNamespace::Node::debugReport() const
 if (DebugHelp::lookupAddress(callStackEntry->m_callStack[j], libName, fileName, sizeof(fileName), line))
 REPORT_LOG(true, (" %s(%d) : caller %d\n", fileName, line, j - 1));
 else
 REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(callStackEntry->m_callStack[j]), j - 1));
 REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStackEntry->m_callStack[j]), j - 1));
 }
	}
}
Expand DownExpand Up@@ -218,7 +218,7 @@ void CallStackCollector::sample(char const * const name)
	}

	//-- Sample the callstack
uint32 callStack[CALLSTACK_DEPTH];
uint64 callStack[CALLSTACK_DEPTH];
	DebugHelp::getCallStack(&callStack[0], CALLSTACK_DEPTH);

	//-- Add to the node
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -481,7 +481,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name)

// ----------------------------------------------------------------------
#pragma warning (disable: 4740 4748)
void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	{
 for (int i = 0; i < sizeOfCallStack; ++i)
Expand DownExpand Up@@ -525,7 +525,7 @@ void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
 if (stackWalk64(IMAGE_FILE_MACHINE_I386, process, process, &stackFrame, &context, NULL, functionTableAccess, getModuleBase, NULL))
 {
 const DWORD64 Offset = stackFrame.AddrPC.Offset;
 *callStack = DWORD(Offset);
 *callStack = static_cast<uint64>(Offset);
 }
	}
}
Expand All@@ -537,7 +537,7 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
	// look up the call stack information
	int const callStackOffset = 2;
	int const callStackSize = callStackOffset + maxStackDepth;
uint32 * callStack = static_cast<uint32 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint32)));
uint64 * callStack = static_cast<uint64 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint64)));
	getCallStack(callStack, callStackOffset + maxStackDepth);

	// look up the caller's file and line
Expand All@@ -553,15 +553,15 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
 if (lookupAddress(callStack[i], lib, file, sizeof(file), line))
 REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
 else
 REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
 REPORT_LOG(true, ("\tunknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset));
 }
 }
	}
}

// ----------------------------------------------------------------------

bool DebugHelp::lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line)
bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line)
{
	UNREF(libName);

Expand Down

4 changes: 2 additions & 2 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ class DebugHelp

	static bool loadSymbolsForDll(const char *name);

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static void reportCallStack(int const maxStackDepth = 4);
	static bool lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);

	static bool writeMiniDump(char const *miniDumpFileName=0, PEXCEPTION_POINTERS exceptionPointers=0);
};
Expand Down

21 changes: 17 additions & 4 deletions
engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,10 +27,23 @@ char* _itoa(int value, char* stringOut, int radix)

bool QueryPerformanceCounter(__int64* time)
{
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 // Must be monotonic. gettimeofday() reports CLOCK_REALTIME, which NTP can
 // slew or step backwards; callers subtract successive samples to derive
 // frame time, so a backwards step produced negative elapsed times (see
 // AlterScheduler "no forward time movement"). CLOCK_MONOTONIC never goes
 // backwards. Units stay microseconds to match QueryPerformanceFrequency().
 struct timespec ts;
 if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
 {
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 return TRUE;
 }

 *time = static_cast<LARGE_INTEGER>(ts.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(ts.tv_nsec / 1000);

 return TRUE;
}
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,8 @@ namespace Archive
 char temp[200];
 AutoDeltaMap<NetworkId, int>::Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -64,8 +64,8 @@ namespace Archive
 char temp[200];

 AutoDeltaMap<NetworkId, int>::Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -76,7 +76,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

6 changes: 3 additions & 3 deletions
engine/shared/library/sharedFoundation/src/shared/Fatal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const

	// look up the call stack information
	const int callStackSize = callStackOffset + stackDepth;
uint32 callStack[callStackOffset + maxStackDepth];
uint64 callStack[callStackOffset + maxStackDepth];

	// allow complete disable of the call stack lookup
	if (stackDepth < 0)
Expand All@@ -82,7 +82,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
 else
 snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
 snprintf(buffer, bufferLength, "(0x%016llX) : %s %08x: \n", static_cast<unsigned long long>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
	}
	else
	{
Expand DownExpand Up@@ -126,7 +126,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, " %s(%d) : caller %d\n", file, line, i-callStackOffset);
 else
 snprintf(buffer, bufferLength, " (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
 snprintf(buffer, bufferLength, " (0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset);

 const int length = strlen(buffer);
 buffer += length;
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char value[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -52,8 +52,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -64,7 +64,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

10 changes: 5 additions & 5 deletions
external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char temp[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -55,8 +55,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -67,7 +67,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 assert(c.cmd == Command::ADD); // only add is valid in unpack
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix four LP64 defects and add Oracle 19 client discovery#34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AconiteX
merged 5 commits into

from

Jul 26, 2026
 Merged


Fix four LP64 defects and add Oracle 19 client discovery
#34
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
55c8f22

Use fixed-width counts in the NetworkId and Unicode packed maps


swgsais Jul 25, 2026
ec3419d

Store call stack addresses at pointer width


swgsais Jul 25, 2026
4fac50d

Back QueryPerformanceCounter with a monotonic clock


swgsais Jul 25, 2026
750f7d8

Stop dereferencing a 32-bit frame offset in the SIGSEGV handler


swgsais Jul 25, 2026
a7c1459

Support Oracle 19 x64 Instant Client discovery


swgsais Jul 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
cmake/linux/FindOracle.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,11 @@ if(DEFINED ENV{ORACLE_HOME})
 ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

 set(ORACLE_OCI_NAMES clntsh libclntsh oci)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz21 nnz21 ociw32)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz19 nnz19 libnnz21 nnz21 ociw32)
 set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)

 set(ORACLE_LIB_DIR 
 ${ORACLE_HOME}
 ${ORACLE_HOME}/lib
 ${ORACLE_HOME}/sdk/lib # Oracle SDK
 ${ORACLE_HOME}/sdk/lib/msvc
Expand DownExpand Up@@ -76,4 +77,4 @@ endif(DEFINED ENV{ORACLE_HOME})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)

26 changes: 18 additions & 8 deletions
engine/server/library/serverScript/src/shared/JavaLibrary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -781,16 +781,26 @@ void JavaLibrary::fatalHandler(int signum)
	{
 // try to see if our call stack came from C or Java
 void *frameAddress = __builtin_frame_address(0);
 // the address that generated the segfault is stored at an offset of 0x44 from
 // the frame address
 // @todo: find documentation on the offset to verify it is stable
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));

 // pass the crash address to addr2line to get the file name where the crash occurred
 // These are zero initialized because the strstr() checks below read them
 // whenever a lookup fails.
 static const int BUFLEN = 2048;
 char lib1[BUFLEN], lib2[BUFLEN];
 char file1[BUFLEN], file2[BUFLEN];
 int line1, line2;
 bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
 char lib1[BUFLEN] = { '\0' }, lib2[BUFLEN] = { '\0' };
 char file1[BUFLEN] = { '\0' }, file2[BUFLEN] = { '\0' };
 int line1 = 0, line2 = 0;
 bool result1 = false;

 // The faulting address used to be read from a fixed 0x44 byte offset into
 // this frame. That constant describes the 32-bit x86 frame layout only; on
 // x86-64 it is both misaligned and meaningless, and dereferencing it from
 // inside a SIGSEGV handler risks a recursive fault that loses the crash
 // report entirely. The __builtin_return_address() probe below is portable
 // and already covers this case.
#if defined(__i386__)
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));
 result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
#endif

 // do a second test based on the return address
 // it turns out that in some java crashes we don't even have 2 return
Expand Down

23 changes: 21 additions & 2 deletions
engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,11 +682,30 @@ bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int

// ----------------------------------------------------------------------

void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	//-- backtrace() writes sizeOfCallStack void* entries. Handing it the
	// caller's buffer directly only works when sizeof(void*) happens to
	// equal the element size; under LP64 it wrote 8 bytes per entry into a
	// 4-byte-per-entry array and overran the buffer by 2x. Capture into a
	// native pointer array and widen instead, which is correct for both
	// ILP32 and LP64.
	enum { cs_maximumFrameCount = 256 };
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is functioning as a magic number, so could instead be at top of file, even though it is scoped and only relevant to the single function so it's 50/50 (I also don't love use of an untyped enum here since the compiler then has to make an inference and god knows what it may do in the future); alternatively, e.g., at top of file:
namespace
{
constexprint cs_maximumFrameCount = 256;
}

	if (sizeOfCallStack <= 0)
 return;
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source generally (but admittedly inconsistently) uses allman style bracing and doesn't tend to use indentation block syntax/off-side rule, so code like this would properly be (but again doesn't technically matter and would surely start a not so fun debate)
if (sizeOfCallStack <= 0)
{
return;
}

	for (int i = 0; i < sizeOfCallStack; ++i)
 callStack[i] = 0;
	IGNORE_RETURN(backtrace(reinterpret_cast<void **>(callStack), sizeOfCallStack));

	if (sizeOfCallStack > static_cast<int>(cs_maximumFrameCount))
 sizeOfCallStack = static_cast<int>(cs_maximumFrameCount);

	void *frames[cs_maximumFrameCount];
	int const frameCount = backtrace(frames, sizeOfCallStack);

	for (int i = 0; i < frameCount; ++i)
 callStack[i] = reinterpret_cast<uint64>(frames[i]);
}

// ======================================================================
Expand Down

5 changes: 4 additions & 1 deletion
engine/shared/library/sharedDebug/src/linux/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,10 @@ class DebugHelp
	static void install();
	static void remove();

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	//-- Entries are instruction addresses, so the buffer must be pointer-width
	// capable. uint64 matches lookupAddress() below and is wide enough on
	// both ILP32 and LP64.
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);
};

Expand Down

8 changes: 4 additions & 4 deletions
engine/shared/library/sharedDebug/src/shared/CallStack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ void CallStack::debugPrint() const
	for (size_t i = 2; i < CALLSTACK_DEPTH; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_PRINT(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_PRINT(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_PRINT(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_PRINT(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand All@@ -76,9 +76,9 @@ void CallStack::debugLog() const
	for (size_t i = 2; i < CALLSTACK_DEPTH && m_callStack[i]!=0; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_LOG(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_LOG(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand Down

3 changes: 2 additions & 1 deletion
engine/shared/library/sharedDebug/src/shared/CallStack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ class CallStack

private:

	uint32 m_callStack[S_callStack];
	//-- Instruction addresses; must be pointer-width capable (see DebugHelp::getCallStack).
	uint64 m_callStack[S_callStack];
};

// ======================================================================
Expand Down

16 changes: 8 additions & 8 deletions
engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ namespace CallStackCollectorNamespace
 ~Node();

 CrcString const & getName() const;
 void addCallStack(uint32 * callStack);
 void addCallStack(uint64 * callStack);

 void debugReport() const;

Expand All@@ -63,7 +63,7 @@ namespace CallStackCollectorNamespace

 public:

uint32 * m_callStack;
uint64 * m_callStack;
 int m_calls;
 };

Expand DownExpand Up@@ -125,10 +125,10 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const

// ----------------------------------------------------------------------

void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
void CallStackCollectorNamespace::Node::addCallStack(uint64 * const callStack)
{
	//-- Compute crc of memory
	uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
	uint32 const crc = Crc::calculate(callStack, (sizeof(*callStack) * CALLSTACK_DEPTH));

	//-- Find callstack in list
	CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
Expand All@@ -140,8 +140,8 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
	else
	{
 //-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack));
uint64 * const newCallStack = new uint64[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack) * CALLSTACK_DEPTH);

 CallStackEntry callStackEntry;
 callStackEntry.m_callStack = newCallStack;
Expand DownExpand Up@@ -180,7 +180,7 @@ void CallStackCollectorNamespace::Node::debugReport() const
 if (DebugHelp::lookupAddress(callStackEntry->m_callStack[j], libName, fileName, sizeof(fileName), line))
 REPORT_LOG(true, (" %s(%d) : caller %d\n", fileName, line, j - 1));
 else
 REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(callStackEntry->m_callStack[j]), j - 1));
 REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStackEntry->m_callStack[j]), j - 1));
 }
	}
}
Expand DownExpand Up@@ -218,7 +218,7 @@ void CallStackCollector::sample(char const * const name)
	}

	//-- Sample the callstack
uint32 callStack[CALLSTACK_DEPTH];
uint64 callStack[CALLSTACK_DEPTH];
	DebugHelp::getCallStack(&callStack[0], CALLSTACK_DEPTH);

	//-- Add to the node
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -481,7 +481,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name)

// ----------------------------------------------------------------------
#pragma warning (disable: 4740 4748)
void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	{
 for (int i = 0; i < sizeOfCallStack; ++i)
Expand DownExpand Up@@ -525,7 +525,7 @@ void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
 if (stackWalk64(IMAGE_FILE_MACHINE_I386, process, process, &stackFrame, &context, NULL, functionTableAccess, getModuleBase, NULL))
 {
 const DWORD64 Offset = stackFrame.AddrPC.Offset;
 *callStack = DWORD(Offset);
 *callStack = static_cast<uint64>(Offset);
 }
	}
}
Expand All@@ -537,7 +537,7 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
	// look up the call stack information
	int const callStackOffset = 2;
	int const callStackSize = callStackOffset + maxStackDepth;
uint32 * callStack = static_cast<uint32 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint32)));
uint64 * callStack = static_cast<uint64 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint64)));
	getCallStack(callStack, callStackOffset + maxStackDepth);

	// look up the caller's file and line
Expand All@@ -553,15 +553,15 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
 if (lookupAddress(callStack[i], lib, file, sizeof(file), line))
 REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
 else
 REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
 REPORT_LOG(true, ("\tunknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset));
 }
 }
	}
}

// ----------------------------------------------------------------------

bool DebugHelp::lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line)
bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line)
{
	UNREF(libName);

Expand Down

4 changes: 2 additions & 2 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ class DebugHelp

	static bool loadSymbolsForDll(const char *name);

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static void reportCallStack(int const maxStackDepth = 4);
	static bool lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);

	static bool writeMiniDump(char const *miniDumpFileName=0, PEXCEPTION_POINTERS exceptionPointers=0);
};
Expand Down

21 changes: 17 additions & 4 deletions
engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,10 +27,23 @@ char* _itoa(int value, char* stringOut, int radix)

bool QueryPerformanceCounter(__int64* time)
{
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 // Must be monotonic. gettimeofday() reports CLOCK_REALTIME, which NTP can
 // slew or step backwards; callers subtract successive samples to derive
 // frame time, so a backwards step produced negative elapsed times (see
 // AlterScheduler "no forward time movement"). CLOCK_MONOTONIC never goes
 // backwards. Units stay microseconds to match QueryPerformanceFrequency().
 struct timespec ts;
 if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
 {
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 return TRUE;
 }

 *time = static_cast<LARGE_INTEGER>(ts.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(ts.tv_nsec / 1000);

 return TRUE;
}
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,8 @@ namespace Archive
 char temp[200];
 AutoDeltaMap<NetworkId, int>::Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -64,8 +64,8 @@ namespace Archive
 char temp[200];

 AutoDeltaMap<NetworkId, int>::Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -76,7 +76,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

6 changes: 3 additions & 3 deletions
engine/shared/library/sharedFoundation/src/shared/Fatal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const

	// look up the call stack information
	const int callStackSize = callStackOffset + stackDepth;
uint32 callStack[callStackOffset + maxStackDepth];
uint64 callStack[callStackOffset + maxStackDepth];

	// allow complete disable of the call stack lookup
	if (stackDepth < 0)
Expand All@@ -82,7 +82,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
 else
 snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
 snprintf(buffer, bufferLength, "(0x%016llX) : %s %08x: \n", static_cast<unsigned long long>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
	}
	else
	{
Expand DownExpand Up@@ -126,7 +126,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, " %s(%d) : caller %d\n", file, line, i-callStackOffset);
 else
 snprintf(buffer, bufferLength, " (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
 snprintf(buffer, bufferLength, " (0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset);

 const int length = strlen(buffer);
 buffer += length;
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char value[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -52,8 +52,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -64,7 +64,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

10 changes: 5 additions & 5 deletions
external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char temp[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -55,8 +55,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -67,7 +67,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 assert(c.cmd == Command::ADD); // only add is valid in unpack
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix four LP64 defects and add Oracle 19 client discovery#34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AconiteX
merged 5 commits into

from

Jul 26, 2026
 Merged


Fix four LP64 defects and add Oracle 19 client discovery
#34
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
55c8f22

Use fixed-width counts in the NetworkId and Unicode packed maps


swgsais Jul 25, 2026
ec3419d

Store call stack addresses at pointer width


swgsais Jul 25, 2026
4fac50d

Back QueryPerformanceCounter with a monotonic clock


swgsais Jul 25, 2026
750f7d8

Stop dereferencing a 32-bit frame offset in the SIGSEGV handler


swgsais Jul 25, 2026
a7c1459

Support Oracle 19 x64 Instant Client discovery


swgsais Jul 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
cmake/linux/FindOracle.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,11 @@ if(DEFINED ENV{ORACLE_HOME})
 ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

 set(ORACLE_OCI_NAMES clntsh libclntsh oci)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz21 nnz21 ociw32)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz19 nnz19 libnnz21 nnz21 ociw32)
 set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)

 set(ORACLE_LIB_DIR 
 ${ORACLE_HOME}
 ${ORACLE_HOME}/lib
 ${ORACLE_HOME}/sdk/lib # Oracle SDK
 ${ORACLE_HOME}/sdk/lib/msvc
Expand DownExpand Up@@ -76,4 +77,4 @@ endif(DEFINED ENV{ORACLE_HOME})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)

26 changes: 18 additions & 8 deletions
engine/server/library/serverScript/src/shared/JavaLibrary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -781,16 +781,26 @@ void JavaLibrary::fatalHandler(int signum)
	{
 // try to see if our call stack came from C or Java
 void *frameAddress = __builtin_frame_address(0);
 // the address that generated the segfault is stored at an offset of 0x44 from
 // the frame address
 // @todo: find documentation on the offset to verify it is stable
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));

 // pass the crash address to addr2line to get the file name where the crash occurred
 // These are zero initialized because the strstr() checks below read them
 // whenever a lookup fails.
 static const int BUFLEN = 2048;
 char lib1[BUFLEN], lib2[BUFLEN];
 char file1[BUFLEN], file2[BUFLEN];
 int line1, line2;
 bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
 char lib1[BUFLEN] = { '\0' }, lib2[BUFLEN] = { '\0' };
 char file1[BUFLEN] = { '\0' }, file2[BUFLEN] = { '\0' };
 int line1 = 0, line2 = 0;
 bool result1 = false;

 // The faulting address used to be read from a fixed 0x44 byte offset into
 // this frame. That constant describes the 32-bit x86 frame layout only; on
 // x86-64 it is both misaligned and meaningless, and dereferencing it from
 // inside a SIGSEGV handler risks a recursive fault that loses the crash
 // report entirely. The __builtin_return_address() probe below is portable
 // and already covers this case.
#if defined(__i386__)
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));
 result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
#endif

 // do a second test based on the return address
 // it turns out that in some java crashes we don't even have 2 return
Expand Down

23 changes: 21 additions & 2 deletions
engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,11 +682,30 @@ bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int

// ----------------------------------------------------------------------

void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	//-- backtrace() writes sizeOfCallStack void* entries. Handing it the
	// caller's buffer directly only works when sizeof(void*) happens to
	// equal the element size; under LP64 it wrote 8 bytes per entry into a
	// 4-byte-per-entry array and overran the buffer by 2x. Capture into a
	// native pointer array and widen instead, which is correct for both
	// ILP32 and LP64.
	enum { cs_maximumFrameCount = 256 };
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is functioning as a magic number, so could instead be at top of file, even though it is scoped and only relevant to the single function so it's 50/50 (I also don't love use of an untyped enum here since the compiler then has to make an inference and god knows what it may do in the future); alternatively, e.g., at top of file:
namespace
{
constexprint cs_maximumFrameCount = 256;
}

	if (sizeOfCallStack <= 0)
 return;
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source generally (but admittedly inconsistently) uses allman style bracing and doesn't tend to use indentation block syntax/off-side rule, so code like this would properly be (but again doesn't technically matter and would surely start a not so fun debate)
if (sizeOfCallStack <= 0)
{
return;
}

	for (int i = 0; i < sizeOfCallStack; ++i)
 callStack[i] = 0;
	IGNORE_RETURN(backtrace(reinterpret_cast<void **>(callStack), sizeOfCallStack));

	if (sizeOfCallStack > static_cast<int>(cs_maximumFrameCount))
 sizeOfCallStack = static_cast<int>(cs_maximumFrameCount);

	void *frames[cs_maximumFrameCount];
	int const frameCount = backtrace(frames, sizeOfCallStack);

	for (int i = 0; i < frameCount; ++i)
 callStack[i] = reinterpret_cast<uint64>(frames[i]);
}

// ======================================================================
Expand Down

5 changes: 4 additions & 1 deletion
engine/shared/library/sharedDebug/src/linux/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,10 @@ class DebugHelp
	static void install();
	static void remove();

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	//-- Entries are instruction addresses, so the buffer must be pointer-width
	// capable. uint64 matches lookupAddress() below and is wide enough on
	// both ILP32 and LP64.
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);
};

Expand Down

8 changes: 4 additions & 4 deletions
engine/shared/library/sharedDebug/src/shared/CallStack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ void CallStack::debugPrint() const
	for (size_t i = 2; i < CALLSTACK_DEPTH; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_PRINT(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_PRINT(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_PRINT(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_PRINT(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand All@@ -76,9 +76,9 @@ void CallStack::debugLog() const
	for (size_t i = 2; i < CALLSTACK_DEPTH && m_callStack[i]!=0; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_LOG(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_LOG(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand Down

3 changes: 2 additions & 1 deletion
engine/shared/library/sharedDebug/src/shared/CallStack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ class CallStack

private:

	uint32 m_callStack[S_callStack];
	//-- Instruction addresses; must be pointer-width capable (see DebugHelp::getCallStack).
	uint64 m_callStack[S_callStack];
};

// ======================================================================
Expand Down

16 changes: 8 additions & 8 deletions
engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ namespace CallStackCollectorNamespace
 ~Node();

 CrcString const & getName() const;
 void addCallStack(uint32 * callStack);
 void addCallStack(uint64 * callStack);

 void debugReport() const;

Expand All@@ -63,7 +63,7 @@ namespace CallStackCollectorNamespace

 public:

uint32 * m_callStack;
uint64 * m_callStack;
 int m_calls;
 };

Expand DownExpand Up@@ -125,10 +125,10 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const

// ----------------------------------------------------------------------

void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
void CallStackCollectorNamespace::Node::addCallStack(uint64 * const callStack)
{
	//-- Compute crc of memory
	uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
	uint32 const crc = Crc::calculate(callStack, (sizeof(*callStack) * CALLSTACK_DEPTH));

	//-- Find callstack in list
	CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
Expand All@@ -140,8 +140,8 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
	else
	{
 //-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack));
uint64 * const newCallStack = new uint64[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack) * CALLSTACK_DEPTH);

 CallStackEntry callStackEntry;
 callStackEntry.m_callStack = newCallStack;
Expand DownExpand Up@@ -180,7 +180,7 @@ void CallStackCollectorNamespace::Node::debugReport() const
 if (DebugHelp::lookupAddress(callStackEntry->m_callStack[j], libName, fileName, sizeof(fileName), line))
 REPORT_LOG(true, (" %s(%d) : caller %d\n", fileName, line, j - 1));
 else
 REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(callStackEntry->m_callStack[j]), j - 1));
 REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStackEntry->m_callStack[j]), j - 1));
 }
	}
}
Expand DownExpand Up@@ -218,7 +218,7 @@ void CallStackCollector::sample(char const * const name)
	}

	//-- Sample the callstack
uint32 callStack[CALLSTACK_DEPTH];
uint64 callStack[CALLSTACK_DEPTH];
	DebugHelp::getCallStack(&callStack[0], CALLSTACK_DEPTH);

	//-- Add to the node
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -481,7 +481,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name)

// ----------------------------------------------------------------------
#pragma warning (disable: 4740 4748)
void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	{
 for (int i = 0; i < sizeOfCallStack; ++i)
Expand DownExpand Up@@ -525,7 +525,7 @@ void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
 if (stackWalk64(IMAGE_FILE_MACHINE_I386, process, process, &stackFrame, &context, NULL, functionTableAccess, getModuleBase, NULL))
 {
 const DWORD64 Offset = stackFrame.AddrPC.Offset;
 *callStack = DWORD(Offset);
 *callStack = static_cast<uint64>(Offset);
 }
	}
}
Expand All@@ -537,7 +537,7 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
	// look up the call stack information
	int const callStackOffset = 2;
	int const callStackSize = callStackOffset + maxStackDepth;
uint32 * callStack = static_cast<uint32 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint32)));
uint64 * callStack = static_cast<uint64 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint64)));
	getCallStack(callStack, callStackOffset + maxStackDepth);

	// look up the caller's file and line
Expand All@@ -553,15 +553,15 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
 if (lookupAddress(callStack[i], lib, file, sizeof(file), line))
 REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
 else
 REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
 REPORT_LOG(true, ("\tunknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset));
 }
 }
	}
}

// ----------------------------------------------------------------------

bool DebugHelp::lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line)
bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line)
{
	UNREF(libName);

Expand Down

4 changes: 2 additions & 2 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ class DebugHelp

	static bool loadSymbolsForDll(const char *name);

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static void reportCallStack(int const maxStackDepth = 4);
	static bool lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);

	static bool writeMiniDump(char const *miniDumpFileName=0, PEXCEPTION_POINTERS exceptionPointers=0);
};
Expand Down

21 changes: 17 additions & 4 deletions
engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,10 +27,23 @@ char* _itoa(int value, char* stringOut, int radix)

bool QueryPerformanceCounter(__int64* time)
{
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 // Must be monotonic. gettimeofday() reports CLOCK_REALTIME, which NTP can
 // slew or step backwards; callers subtract successive samples to derive
 // frame time, so a backwards step produced negative elapsed times (see
 // AlterScheduler "no forward time movement"). CLOCK_MONOTONIC never goes
 // backwards. Units stay microseconds to match QueryPerformanceFrequency().
 struct timespec ts;
 if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
 {
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 return TRUE;
 }

 *time = static_cast<LARGE_INTEGER>(ts.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(ts.tv_nsec / 1000);

 return TRUE;
}
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,8 @@ namespace Archive
 char temp[200];
 AutoDeltaMap<NetworkId, int>::Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -64,8 +64,8 @@ namespace Archive
 char temp[200];

 AutoDeltaMap<NetworkId, int>::Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -76,7 +76,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

6 changes: 3 additions & 3 deletions
engine/shared/library/sharedFoundation/src/shared/Fatal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const

	// look up the call stack information
	const int callStackSize = callStackOffset + stackDepth;
uint32 callStack[callStackOffset + maxStackDepth];
uint64 callStack[callStackOffset + maxStackDepth];

	// allow complete disable of the call stack lookup
	if (stackDepth < 0)
Expand All@@ -82,7 +82,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
 else
 snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
 snprintf(buffer, bufferLength, "(0x%016llX) : %s %08x: \n", static_cast<unsigned long long>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
	}
	else
	{
Expand DownExpand Up@@ -126,7 +126,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, " %s(%d) : caller %d\n", file, line, i-callStackOffset);
 else
 snprintf(buffer, bufferLength, " (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
 snprintf(buffer, bufferLength, " (0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset);

 const int length = strlen(buffer);
 buffer += length;
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char value[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -52,8 +52,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -64,7 +64,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

10 changes: 5 additions & 5 deletions
external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char temp[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -55,8 +55,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -67,7 +67,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 assert(c.cmd == Command::ADD); // only add is valid in unpack
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix four LP64 defects and add Oracle 19 client discovery#34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AconiteX
merged 5 commits into

from

Jul 26, 2026
 Merged


Fix four LP64 defects and add Oracle 19 client discovery
#34
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
55c8f22

Use fixed-width counts in the NetworkId and Unicode packed maps


swgsais Jul 25, 2026
ec3419d

Store call stack addresses at pointer width


swgsais Jul 25, 2026
4fac50d

Back QueryPerformanceCounter with a monotonic clock


swgsais Jul 25, 2026
750f7d8

Stop dereferencing a 32-bit frame offset in the SIGSEGV handler


swgsais Jul 25, 2026
a7c1459

Support Oracle 19 x64 Instant Client discovery


swgsais Jul 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
cmake/linux/FindOracle.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,11 @@ if(DEFINED ENV{ORACLE_HOME})
 ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

 set(ORACLE_OCI_NAMES clntsh libclntsh oci)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz21 nnz21 ociw32)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz19 nnz19 libnnz21 nnz21 ociw32)
 set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)

 set(ORACLE_LIB_DIR 
 ${ORACLE_HOME}
 ${ORACLE_HOME}/lib
 ${ORACLE_HOME}/sdk/lib # Oracle SDK
 ${ORACLE_HOME}/sdk/lib/msvc
Expand DownExpand Up@@ -76,4 +77,4 @@ endif(DEFINED ENV{ORACLE_HOME})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)

26 changes: 18 additions & 8 deletions
engine/server/library/serverScript/src/shared/JavaLibrary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -781,16 +781,26 @@ void JavaLibrary::fatalHandler(int signum)
	{
 // try to see if our call stack came from C or Java
 void *frameAddress = __builtin_frame_address(0);
 // the address that generated the segfault is stored at an offset of 0x44 from
 // the frame address
 // @todo: find documentation on the offset to verify it is stable
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));

 // pass the crash address to addr2line to get the file name where the crash occurred
 // These are zero initialized because the strstr() checks below read them
 // whenever a lookup fails.
 static const int BUFLEN = 2048;
 char lib1[BUFLEN], lib2[BUFLEN];
 char file1[BUFLEN], file2[BUFLEN];
 int line1, line2;
 bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
 char lib1[BUFLEN] = { '\0' }, lib2[BUFLEN] = { '\0' };
 char file1[BUFLEN] = { '\0' }, file2[BUFLEN] = { '\0' };
 int line1 = 0, line2 = 0;
 bool result1 = false;

 // The faulting address used to be read from a fixed 0x44 byte offset into
 // this frame. That constant describes the 32-bit x86 frame layout only; on
 // x86-64 it is both misaligned and meaningless, and dereferencing it from
 // inside a SIGSEGV handler risks a recursive fault that loses the crash
 // report entirely. The __builtin_return_address() probe below is portable
 // and already covers this case.
#if defined(__i386__)
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));
 result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
#endif

 // do a second test based on the return address
 // it turns out that in some java crashes we don't even have 2 return
Expand Down

23 changes: 21 additions & 2 deletions
engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,11 +682,30 @@ bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int

// ----------------------------------------------------------------------

void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	//-- backtrace() writes sizeOfCallStack void* entries. Handing it the
	// caller's buffer directly only works when sizeof(void*) happens to
	// equal the element size; under LP64 it wrote 8 bytes per entry into a
	// 4-byte-per-entry array and overran the buffer by 2x. Capture into a
	// native pointer array and widen instead, which is correct for both
	// ILP32 and LP64.
	enum { cs_maximumFrameCount = 256 };
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is functioning as a magic number, so could instead be at top of file, even though it is scoped and only relevant to the single function so it's 50/50 (I also don't love use of an untyped enum here since the compiler then has to make an inference and god knows what it may do in the future); alternatively, e.g., at top of file:
namespace
{
constexprint cs_maximumFrameCount = 256;
}

	if (sizeOfCallStack <= 0)
 return;
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source generally (but admittedly inconsistently) uses allman style bracing and doesn't tend to use indentation block syntax/off-side rule, so code like this would properly be (but again doesn't technically matter and would surely start a not so fun debate)
if (sizeOfCallStack <= 0)
{
return;
}

	for (int i = 0; i < sizeOfCallStack; ++i)
 callStack[i] = 0;
	IGNORE_RETURN(backtrace(reinterpret_cast<void **>(callStack), sizeOfCallStack));

	if (sizeOfCallStack > static_cast<int>(cs_maximumFrameCount))
 sizeOfCallStack = static_cast<int>(cs_maximumFrameCount);

	void *frames[cs_maximumFrameCount];
	int const frameCount = backtrace(frames, sizeOfCallStack);

	for (int i = 0; i < frameCount; ++i)
 callStack[i] = reinterpret_cast<uint64>(frames[i]);
}

// ======================================================================
Expand Down

5 changes: 4 additions & 1 deletion
engine/shared/library/sharedDebug/src/linux/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,10 @@ class DebugHelp
	static void install();
	static void remove();

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	//-- Entries are instruction addresses, so the buffer must be pointer-width
	// capable. uint64 matches lookupAddress() below and is wide enough on
	// both ILP32 and LP64.
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);
};

Expand Down

8 changes: 4 additions & 4 deletions
engine/shared/library/sharedDebug/src/shared/CallStack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ void CallStack::debugPrint() const
	for (size_t i = 2; i < CALLSTACK_DEPTH; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_PRINT(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_PRINT(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_PRINT(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_PRINT(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand All@@ -76,9 +76,9 @@ void CallStack::debugLog() const
	for (size_t i = 2; i < CALLSTACK_DEPTH && m_callStack[i]!=0; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_LOG(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_LOG(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand Down

3 changes: 2 additions & 1 deletion
engine/shared/library/sharedDebug/src/shared/CallStack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ class CallStack

private:

	uint32 m_callStack[S_callStack];
	//-- Instruction addresses; must be pointer-width capable (see DebugHelp::getCallStack).
	uint64 m_callStack[S_callStack];
};

// ======================================================================
Expand Down

16 changes: 8 additions & 8 deletions
engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ namespace CallStackCollectorNamespace
 ~Node();

 CrcString const & getName() const;
 void addCallStack(uint32 * callStack);
 void addCallStack(uint64 * callStack);

 void debugReport() const;

Expand All@@ -63,7 +63,7 @@ namespace CallStackCollectorNamespace

 public:

uint32 * m_callStack;
uint64 * m_callStack;
 int m_calls;
 };

Expand DownExpand Up@@ -125,10 +125,10 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const

// ----------------------------------------------------------------------

void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
void CallStackCollectorNamespace::Node::addCallStack(uint64 * const callStack)
{
	//-- Compute crc of memory
	uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
	uint32 const crc = Crc::calculate(callStack, (sizeof(*callStack) * CALLSTACK_DEPTH));

	//-- Find callstack in list
	CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
Expand All@@ -140,8 +140,8 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
	else
	{
 //-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack));
uint64 * const newCallStack = new uint64[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack) * CALLSTACK_DEPTH);

 CallStackEntry callStackEntry;
 callStackEntry.m_callStack = newCallStack;
Expand DownExpand Up@@ -180,7 +180,7 @@ void CallStackCollectorNamespace::Node::debugReport() const
 if (DebugHelp::lookupAddress(callStackEntry->m_callStack[j], libName, fileName, sizeof(fileName), line))
 REPORT_LOG(true, (" %s(%d) : caller %d\n", fileName, line, j - 1));
 else
 REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(callStackEntry->m_callStack[j]), j - 1));
 REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStackEntry->m_callStack[j]), j - 1));
 }
	}
}
Expand DownExpand Up@@ -218,7 +218,7 @@ void CallStackCollector::sample(char const * const name)
	}

	//-- Sample the callstack
uint32 callStack[CALLSTACK_DEPTH];
uint64 callStack[CALLSTACK_DEPTH];
	DebugHelp::getCallStack(&callStack[0], CALLSTACK_DEPTH);

	//-- Add to the node
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -481,7 +481,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name)

// ----------------------------------------------------------------------
#pragma warning (disable: 4740 4748)
void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	{
 for (int i = 0; i < sizeOfCallStack; ++i)
Expand DownExpand Up@@ -525,7 +525,7 @@ void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
 if (stackWalk64(IMAGE_FILE_MACHINE_I386, process, process, &stackFrame, &context, NULL, functionTableAccess, getModuleBase, NULL))
 {
 const DWORD64 Offset = stackFrame.AddrPC.Offset;
 *callStack = DWORD(Offset);
 *callStack = static_cast<uint64>(Offset);
 }
	}
}
Expand All@@ -537,7 +537,7 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
	// look up the call stack information
	int const callStackOffset = 2;
	int const callStackSize = callStackOffset + maxStackDepth;
uint32 * callStack = static_cast<uint32 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint32)));
uint64 * callStack = static_cast<uint64 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint64)));
	getCallStack(callStack, callStackOffset + maxStackDepth);

	// look up the caller's file and line
Expand All@@ -553,15 +553,15 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
 if (lookupAddress(callStack[i], lib, file, sizeof(file), line))
 REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
 else
 REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
 REPORT_LOG(true, ("\tunknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset));
 }
 }
	}
}

// ----------------------------------------------------------------------

bool DebugHelp::lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line)
bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line)
{
	UNREF(libName);

Expand Down

4 changes: 2 additions & 2 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ class DebugHelp

	static bool loadSymbolsForDll(const char *name);

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static void reportCallStack(int const maxStackDepth = 4);
	static bool lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);

	static bool writeMiniDump(char const *miniDumpFileName=0, PEXCEPTION_POINTERS exceptionPointers=0);
};
Expand Down

21 changes: 17 additions & 4 deletions
engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,10 +27,23 @@ char* _itoa(int value, char* stringOut, int radix)

bool QueryPerformanceCounter(__int64* time)
{
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 // Must be monotonic. gettimeofday() reports CLOCK_REALTIME, which NTP can
 // slew or step backwards; callers subtract successive samples to derive
 // frame time, so a backwards step produced negative elapsed times (see
 // AlterScheduler "no forward time movement"). CLOCK_MONOTONIC never goes
 // backwards. Units stay microseconds to match QueryPerformanceFrequency().
 struct timespec ts;
 if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
 {
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 return TRUE;
 }

 *time = static_cast<LARGE_INTEGER>(ts.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(ts.tv_nsec / 1000);

 return TRUE;
}
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,8 @@ namespace Archive
 char temp[200];
 AutoDeltaMap<NetworkId, int>::Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -64,8 +64,8 @@ namespace Archive
 char temp[200];

 AutoDeltaMap<NetworkId, int>::Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -76,7 +76,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

6 changes: 3 additions & 3 deletions
engine/shared/library/sharedFoundation/src/shared/Fatal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const

	// look up the call stack information
	const int callStackSize = callStackOffset + stackDepth;
uint32 callStack[callStackOffset + maxStackDepth];
uint64 callStack[callStackOffset + maxStackDepth];

	// allow complete disable of the call stack lookup
	if (stackDepth < 0)
Expand All@@ -82,7 +82,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
 else
 snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
 snprintf(buffer, bufferLength, "(0x%016llX) : %s %08x: \n", static_cast<unsigned long long>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
	}
	else
	{
Expand DownExpand Up@@ -126,7 +126,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, " %s(%d) : caller %d\n", file, line, i-callStackOffset);
 else
 snprintf(buffer, bufferLength, " (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
 snprintf(buffer, bufferLength, " (0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset);

 const int length = strlen(buffer);
 buffer += length;
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char value[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -52,8 +52,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -64,7 +64,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

10 changes: 5 additions & 5 deletions
external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char temp[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -55,8 +55,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -67,7 +67,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 assert(c.cmd == Command::ADD); // only add is valid in unpack
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix four LP64 defects and add Oracle 19 client discovery#34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AconiteX
merged 5 commits into

from

Jul 26, 2026
 Merged


Fix four LP64 defects and add Oracle 19 client discovery
#34
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
55c8f22

Use fixed-width counts in the NetworkId and Unicode packed maps


swgsais Jul 25, 2026
ec3419d

Store call stack addresses at pointer width


swgsais Jul 25, 2026
4fac50d

Back QueryPerformanceCounter with a monotonic clock


swgsais Jul 25, 2026
750f7d8

Stop dereferencing a 32-bit frame offset in the SIGSEGV handler


swgsais Jul 25, 2026
a7c1459

Support Oracle 19 x64 Instant Client discovery


swgsais Jul 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
cmake/linux/FindOracle.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,11 @@ if(DEFINED ENV{ORACLE_HOME})
 ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

 set(ORACLE_OCI_NAMES clntsh libclntsh oci)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz21 nnz21 ociw32)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz19 nnz19 libnnz21 nnz21 ociw32)
 set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)

 set(ORACLE_LIB_DIR 
 ${ORACLE_HOME}
 ${ORACLE_HOME}/lib
 ${ORACLE_HOME}/sdk/lib # Oracle SDK
 ${ORACLE_HOME}/sdk/lib/msvc
Expand DownExpand Up@@ -76,4 +77,4 @@ endif(DEFINED ENV{ORACLE_HOME})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)

26 changes: 18 additions & 8 deletions
engine/server/library/serverScript/src/shared/JavaLibrary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -781,16 +781,26 @@ void JavaLibrary::fatalHandler(int signum)
	{
 // try to see if our call stack came from C or Java
 void *frameAddress = __builtin_frame_address(0);
 // the address that generated the segfault is stored at an offset of 0x44 from
 // the frame address
 // @todo: find documentation on the offset to verify it is stable
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));

 // pass the crash address to addr2line to get the file name where the crash occurred
 // These are zero initialized because the strstr() checks below read them
 // whenever a lookup fails.
 static const int BUFLEN = 2048;
 char lib1[BUFLEN], lib2[BUFLEN];
 char file1[BUFLEN], file2[BUFLEN];
 int line1, line2;
 bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
 char lib1[BUFLEN] = { '\0' }, lib2[BUFLEN] = { '\0' };
 char file1[BUFLEN] = { '\0' }, file2[BUFLEN] = { '\0' };
 int line1 = 0, line2 = 0;
 bool result1 = false;

 // The faulting address used to be read from a fixed 0x44 byte offset into
 // this frame. That constant describes the 32-bit x86 frame layout only; on
 // x86-64 it is both misaligned and meaningless, and dereferencing it from
 // inside a SIGSEGV handler risks a recursive fault that loses the crash
 // report entirely. The __builtin_return_address() probe below is portable
 // and already covers this case.
#if defined(__i386__)
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));
 result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
#endif

 // do a second test based on the return address
 // it turns out that in some java crashes we don't even have 2 return
Expand Down

23 changes: 21 additions & 2 deletions
engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,11 +682,30 @@ bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int

// ----------------------------------------------------------------------

void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	//-- backtrace() writes sizeOfCallStack void* entries. Handing it the
	// caller's buffer directly only works when sizeof(void*) happens to
	// equal the element size; under LP64 it wrote 8 bytes per entry into a
	// 4-byte-per-entry array and overran the buffer by 2x. Capture into a
	// native pointer array and widen instead, which is correct for both
	// ILP32 and LP64.
	enum { cs_maximumFrameCount = 256 };
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is functioning as a magic number, so could instead be at top of file, even though it is scoped and only relevant to the single function so it's 50/50 (I also don't love use of an untyped enum here since the compiler then has to make an inference and god knows what it may do in the future); alternatively, e.g., at top of file:
namespace
{
constexprint cs_maximumFrameCount = 256;
}

	if (sizeOfCallStack <= 0)
 return;
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source generally (but admittedly inconsistently) uses allman style bracing and doesn't tend to use indentation block syntax/off-side rule, so code like this would properly be (but again doesn't technically matter and would surely start a not so fun debate)
if (sizeOfCallStack <= 0)
{
return;
}

	for (int i = 0; i < sizeOfCallStack; ++i)
 callStack[i] = 0;
	IGNORE_RETURN(backtrace(reinterpret_cast<void **>(callStack), sizeOfCallStack));

	if (sizeOfCallStack > static_cast<int>(cs_maximumFrameCount))
 sizeOfCallStack = static_cast<int>(cs_maximumFrameCount);

	void *frames[cs_maximumFrameCount];
	int const frameCount = backtrace(frames, sizeOfCallStack);

	for (int i = 0; i < frameCount; ++i)
 callStack[i] = reinterpret_cast<uint64>(frames[i]);
}

// ======================================================================
Expand Down

5 changes: 4 additions & 1 deletion
engine/shared/library/sharedDebug/src/linux/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,10 @@ class DebugHelp
	static void install();
	static void remove();

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	//-- Entries are instruction addresses, so the buffer must be pointer-width
	// capable. uint64 matches lookupAddress() below and is wide enough on
	// both ILP32 and LP64.
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);
};

Expand Down

8 changes: 4 additions & 4 deletions
engine/shared/library/sharedDebug/src/shared/CallStack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ void CallStack::debugPrint() const
	for (size_t i = 2; i < CALLSTACK_DEPTH; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_PRINT(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_PRINT(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_PRINT(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_PRINT(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand All@@ -76,9 +76,9 @@ void CallStack::debugLog() const
	for (size_t i = 2; i < CALLSTACK_DEPTH && m_callStack[i]!=0; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_LOG(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_LOG(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand Down

3 changes: 2 additions & 1 deletion
engine/shared/library/sharedDebug/src/shared/CallStack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ class CallStack

private:

	uint32 m_callStack[S_callStack];
	//-- Instruction addresses; must be pointer-width capable (see DebugHelp::getCallStack).
	uint64 m_callStack[S_callStack];
};

// ======================================================================
Expand Down

16 changes: 8 additions & 8 deletions
engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ namespace CallStackCollectorNamespace
 ~Node();

 CrcString const & getName() const;
 void addCallStack(uint32 * callStack);
 void addCallStack(uint64 * callStack);

 void debugReport() const;

Expand All@@ -63,7 +63,7 @@ namespace CallStackCollectorNamespace

 public:

uint32 * m_callStack;
uint64 * m_callStack;
 int m_calls;
 };

Expand DownExpand Up@@ -125,10 +125,10 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const

// ----------------------------------------------------------------------

void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
void CallStackCollectorNamespace::Node::addCallStack(uint64 * const callStack)
{
	//-- Compute crc of memory
	uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
	uint32 const crc = Crc::calculate(callStack, (sizeof(*callStack) * CALLSTACK_DEPTH));

	//-- Find callstack in list
	CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
Expand All@@ -140,8 +140,8 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
	else
	{
 //-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack));
uint64 * const newCallStack = new uint64[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack) * CALLSTACK_DEPTH);

 CallStackEntry callStackEntry;
 callStackEntry.m_callStack = newCallStack;
Expand DownExpand Up@@ -180,7 +180,7 @@ void CallStackCollectorNamespace::Node::debugReport() const
 if (DebugHelp::lookupAddress(callStackEntry->m_callStack[j], libName, fileName, sizeof(fileName), line))
 REPORT_LOG(true, (" %s(%d) : caller %d\n", fileName, line, j - 1));
 else
 REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(callStackEntry->m_callStack[j]), j - 1));
 REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStackEntry->m_callStack[j]), j - 1));
 }
	}
}
Expand DownExpand Up@@ -218,7 +218,7 @@ void CallStackCollector::sample(char const * const name)
	}

	//-- Sample the callstack
uint32 callStack[CALLSTACK_DEPTH];
uint64 callStack[CALLSTACK_DEPTH];
	DebugHelp::getCallStack(&callStack[0], CALLSTACK_DEPTH);

	//-- Add to the node
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -481,7 +481,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name)

// ----------------------------------------------------------------------
#pragma warning (disable: 4740 4748)
void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	{
 for (int i = 0; i < sizeOfCallStack; ++i)
Expand DownExpand Up@@ -525,7 +525,7 @@ void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
 if (stackWalk64(IMAGE_FILE_MACHINE_I386, process, process, &stackFrame, &context, NULL, functionTableAccess, getModuleBase, NULL))
 {
 const DWORD64 Offset = stackFrame.AddrPC.Offset;
 *callStack = DWORD(Offset);
 *callStack = static_cast<uint64>(Offset);
 }
	}
}
Expand All@@ -537,7 +537,7 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
	// look up the call stack information
	int const callStackOffset = 2;
	int const callStackSize = callStackOffset + maxStackDepth;
uint32 * callStack = static_cast<uint32 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint32)));
uint64 * callStack = static_cast<uint64 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint64)));
	getCallStack(callStack, callStackOffset + maxStackDepth);

	// look up the caller's file and line
Expand All@@ -553,15 +553,15 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
 if (lookupAddress(callStack[i], lib, file, sizeof(file), line))
 REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
 else
 REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
 REPORT_LOG(true, ("\tunknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset));
 }
 }
	}
}

// ----------------------------------------------------------------------

bool DebugHelp::lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line)
bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line)
{
	UNREF(libName);

Expand Down

4 changes: 2 additions & 2 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ class DebugHelp

	static bool loadSymbolsForDll(const char *name);

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static void reportCallStack(int const maxStackDepth = 4);
	static bool lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);

	static bool writeMiniDump(char const *miniDumpFileName=0, PEXCEPTION_POINTERS exceptionPointers=0);
};
Expand Down

21 changes: 17 additions & 4 deletions
engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,10 +27,23 @@ char* _itoa(int value, char* stringOut, int radix)

bool QueryPerformanceCounter(__int64* time)
{
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 // Must be monotonic. gettimeofday() reports CLOCK_REALTIME, which NTP can
 // slew or step backwards; callers subtract successive samples to derive
 // frame time, so a backwards step produced negative elapsed times (see
 // AlterScheduler "no forward time movement"). CLOCK_MONOTONIC never goes
 // backwards. Units stay microseconds to match QueryPerformanceFrequency().
 struct timespec ts;
 if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
 {
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 return TRUE;
 }

 *time = static_cast<LARGE_INTEGER>(ts.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(ts.tv_nsec / 1000);

 return TRUE;
}
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,8 @@ namespace Archive
 char temp[200];
 AutoDeltaMap<NetworkId, int>::Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -64,8 +64,8 @@ namespace Archive
 char temp[200];

 AutoDeltaMap<NetworkId, int>::Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -76,7 +76,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

6 changes: 3 additions & 3 deletions
engine/shared/library/sharedFoundation/src/shared/Fatal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const

	// look up the call stack information
	const int callStackSize = callStackOffset + stackDepth;
uint32 callStack[callStackOffset + maxStackDepth];
uint64 callStack[callStackOffset + maxStackDepth];

	// allow complete disable of the call stack lookup
	if (stackDepth < 0)
Expand All@@ -82,7 +82,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
 else
 snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
 snprintf(buffer, bufferLength, "(0x%016llX) : %s %08x: \n", static_cast<unsigned long long>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
	}
	else
	{
Expand DownExpand Up@@ -126,7 +126,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, " %s(%d) : caller %d\n", file, line, i-callStackOffset);
 else
 snprintf(buffer, bufferLength, " (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
 snprintf(buffer, bufferLength, " (0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset);

 const int length = strlen(buffer);
 buffer += length;
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char value[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -52,8 +52,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -64,7 +64,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

10 changes: 5 additions & 5 deletions
external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char temp[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -55,8 +55,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -67,7 +67,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 assert(c.cmd == Command::ADD); // only add is valid in unpack
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix four LP64 defects and add Oracle 19 client discovery#34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AconiteX
merged 5 commits into

from

Jul 26, 2026
 Merged


Fix four LP64 defects and add Oracle 19 client discovery
#34
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
55c8f22

Use fixed-width counts in the NetworkId and Unicode packed maps


swgsais Jul 25, 2026
ec3419d

Store call stack addresses at pointer width


swgsais Jul 25, 2026
4fac50d

Back QueryPerformanceCounter with a monotonic clock


swgsais Jul 25, 2026
750f7d8

Stop dereferencing a 32-bit frame offset in the SIGSEGV handler


swgsais Jul 25, 2026
a7c1459

Support Oracle 19 x64 Instant Client discovery


swgsais Jul 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
cmake/linux/FindOracle.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,11 @@ if(DEFINED ENV{ORACLE_HOME})
 ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

 set(ORACLE_OCI_NAMES clntsh libclntsh oci)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz21 nnz21 ociw32)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz19 nnz19 libnnz21 nnz21 ociw32)
 set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)

 set(ORACLE_LIB_DIR 
 ${ORACLE_HOME}
 ${ORACLE_HOME}/lib
 ${ORACLE_HOME}/sdk/lib # Oracle SDK
 ${ORACLE_HOME}/sdk/lib/msvc
Expand DownExpand Up@@ -76,4 +77,4 @@ endif(DEFINED ENV{ORACLE_HOME})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)

26 changes: 18 additions & 8 deletions
engine/server/library/serverScript/src/shared/JavaLibrary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -781,16 +781,26 @@ void JavaLibrary::fatalHandler(int signum)
	{
 // try to see if our call stack came from C or Java
 void *frameAddress = __builtin_frame_address(0);
 // the address that generated the segfault is stored at an offset of 0x44 from
 // the frame address
 // @todo: find documentation on the offset to verify it is stable
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));

 // pass the crash address to addr2line to get the file name where the crash occurred
 // These are zero initialized because the strstr() checks below read them
 // whenever a lookup fails.
 static const int BUFLEN = 2048;
 char lib1[BUFLEN], lib2[BUFLEN];
 char file1[BUFLEN], file2[BUFLEN];
 int line1, line2;
 bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
 char lib1[BUFLEN] = { '\0' }, lib2[BUFLEN] = { '\0' };
 char file1[BUFLEN] = { '\0' }, file2[BUFLEN] = { '\0' };
 int line1 = 0, line2 = 0;
 bool result1 = false;

 // The faulting address used to be read from a fixed 0x44 byte offset into
 // this frame. That constant describes the 32-bit x86 frame layout only; on
 // x86-64 it is both misaligned and meaningless, and dereferencing it from
 // inside a SIGSEGV handler risks a recursive fault that loses the crash
 // report entirely. The __builtin_return_address() probe below is portable
 // and already covers this case.
#if defined(__i386__)
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));
 result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
#endif

 // do a second test based on the return address
 // it turns out that in some java crashes we don't even have 2 return
Expand Down

23 changes: 21 additions & 2 deletions
engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,11 +682,30 @@ bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int

// ----------------------------------------------------------------------

void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	//-- backtrace() writes sizeOfCallStack void* entries. Handing it the
	// caller's buffer directly only works when sizeof(void*) happens to
	// equal the element size; under LP64 it wrote 8 bytes per entry into a
	// 4-byte-per-entry array and overran the buffer by 2x. Capture into a
	// native pointer array and widen instead, which is correct for both
	// ILP32 and LP64.
	enum { cs_maximumFrameCount = 256 };
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is functioning as a magic number, so could instead be at top of file, even though it is scoped and only relevant to the single function so it's 50/50 (I also don't love use of an untyped enum here since the compiler then has to make an inference and god knows what it may do in the future); alternatively, e.g., at top of file:
namespace
{
constexprint cs_maximumFrameCount = 256;
}

	if (sizeOfCallStack <= 0)
 return;
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source generally (but admittedly inconsistently) uses allman style bracing and doesn't tend to use indentation block syntax/off-side rule, so code like this would properly be (but again doesn't technically matter and would surely start a not so fun debate)
if (sizeOfCallStack <= 0)
{
return;
}

	for (int i = 0; i < sizeOfCallStack; ++i)
 callStack[i] = 0;
	IGNORE_RETURN(backtrace(reinterpret_cast<void **>(callStack), sizeOfCallStack));

	if (sizeOfCallStack > static_cast<int>(cs_maximumFrameCount))
 sizeOfCallStack = static_cast<int>(cs_maximumFrameCount);

	void *frames[cs_maximumFrameCount];
	int const frameCount = backtrace(frames, sizeOfCallStack);

	for (int i = 0; i < frameCount; ++i)
 callStack[i] = reinterpret_cast<uint64>(frames[i]);
}

// ======================================================================
Expand Down

5 changes: 4 additions & 1 deletion
engine/shared/library/sharedDebug/src/linux/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,10 @@ class DebugHelp
	static void install();
	static void remove();

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	//-- Entries are instruction addresses, so the buffer must be pointer-width
	// capable. uint64 matches lookupAddress() below and is wide enough on
	// both ILP32 and LP64.
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);
};

Expand Down

8 changes: 4 additions & 4 deletions
engine/shared/library/sharedDebug/src/shared/CallStack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ void CallStack::debugPrint() const
	for (size_t i = 2; i < CALLSTACK_DEPTH; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_PRINT(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_PRINT(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_PRINT(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_PRINT(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand All@@ -76,9 +76,9 @@ void CallStack::debugLog() const
	for (size_t i = 2; i < CALLSTACK_DEPTH && m_callStack[i]!=0; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_LOG(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_LOG(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand Down

3 changes: 2 additions & 1 deletion
engine/shared/library/sharedDebug/src/shared/CallStack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ class CallStack

private:

	uint32 m_callStack[S_callStack];
	//-- Instruction addresses; must be pointer-width capable (see DebugHelp::getCallStack).
	uint64 m_callStack[S_callStack];
};

// ======================================================================
Expand Down

16 changes: 8 additions & 8 deletions
engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ namespace CallStackCollectorNamespace
 ~Node();

 CrcString const & getName() const;
 void addCallStack(uint32 * callStack);
 void addCallStack(uint64 * callStack);

 void debugReport() const;

Expand All@@ -63,7 +63,7 @@ namespace CallStackCollectorNamespace

 public:

uint32 * m_callStack;
uint64 * m_callStack;
 int m_calls;
 };

Expand DownExpand Up@@ -125,10 +125,10 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const

// ----------------------------------------------------------------------

void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
void CallStackCollectorNamespace::Node::addCallStack(uint64 * const callStack)
{
	//-- Compute crc of memory
	uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
	uint32 const crc = Crc::calculate(callStack, (sizeof(*callStack) * CALLSTACK_DEPTH));

	//-- Find callstack in list
	CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
Expand All@@ -140,8 +140,8 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
	else
	{
 //-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack));
uint64 * const newCallStack = new uint64[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack) * CALLSTACK_DEPTH);

 CallStackEntry callStackEntry;
 callStackEntry.m_callStack = newCallStack;
Expand DownExpand Up@@ -180,7 +180,7 @@ void CallStackCollectorNamespace::Node::debugReport() const
 if (DebugHelp::lookupAddress(callStackEntry->m_callStack[j], libName, fileName, sizeof(fileName), line))
 REPORT_LOG(true, (" %s(%d) : caller %d\n", fileName, line, j - 1));
 else
 REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(callStackEntry->m_callStack[j]), j - 1));
 REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStackEntry->m_callStack[j]), j - 1));
 }
	}
}
Expand DownExpand Up@@ -218,7 +218,7 @@ void CallStackCollector::sample(char const * const name)
	}

	//-- Sample the callstack
uint32 callStack[CALLSTACK_DEPTH];
uint64 callStack[CALLSTACK_DEPTH];
	DebugHelp::getCallStack(&callStack[0], CALLSTACK_DEPTH);

	//-- Add to the node
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -481,7 +481,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name)

// ----------------------------------------------------------------------
#pragma warning (disable: 4740 4748)
void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	{
 for (int i = 0; i < sizeOfCallStack; ++i)
Expand DownExpand Up@@ -525,7 +525,7 @@ void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
 if (stackWalk64(IMAGE_FILE_MACHINE_I386, process, process, &stackFrame, &context, NULL, functionTableAccess, getModuleBase, NULL))
 {
 const DWORD64 Offset = stackFrame.AddrPC.Offset;
 *callStack = DWORD(Offset);
 *callStack = static_cast<uint64>(Offset);
 }
	}
}
Expand All@@ -537,7 +537,7 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
	// look up the call stack information
	int const callStackOffset = 2;
	int const callStackSize = callStackOffset + maxStackDepth;
uint32 * callStack = static_cast<uint32 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint32)));
uint64 * callStack = static_cast<uint64 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint64)));
	getCallStack(callStack, callStackOffset + maxStackDepth);

	// look up the caller's file and line
Expand All@@ -553,15 +553,15 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
 if (lookupAddress(callStack[i], lib, file, sizeof(file), line))
 REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
 else
 REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
 REPORT_LOG(true, ("\tunknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset));
 }
 }
	}
}

// ----------------------------------------------------------------------

bool DebugHelp::lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line)
bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line)
{
	UNREF(libName);

Expand Down

4 changes: 2 additions & 2 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ class DebugHelp

	static bool loadSymbolsForDll(const char *name);

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static void reportCallStack(int const maxStackDepth = 4);
	static bool lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);

	static bool writeMiniDump(char const *miniDumpFileName=0, PEXCEPTION_POINTERS exceptionPointers=0);
};
Expand Down

21 changes: 17 additions & 4 deletions
engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,10 +27,23 @@ char* _itoa(int value, char* stringOut, int radix)

bool QueryPerformanceCounter(__int64* time)
{
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 // Must be monotonic. gettimeofday() reports CLOCK_REALTIME, which NTP can
 // slew or step backwards; callers subtract successive samples to derive
 // frame time, so a backwards step produced negative elapsed times (see
 // AlterScheduler "no forward time movement"). CLOCK_MONOTONIC never goes
 // backwards. Units stay microseconds to match QueryPerformanceFrequency().
 struct timespec ts;
 if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
 {
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 return TRUE;
 }

 *time = static_cast<LARGE_INTEGER>(ts.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(ts.tv_nsec / 1000);

 return TRUE;
}
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,8 @@ namespace Archive
 char temp[200];
 AutoDeltaMap<NetworkId, int>::Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -64,8 +64,8 @@ namespace Archive
 char temp[200];

 AutoDeltaMap<NetworkId, int>::Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -76,7 +76,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

6 changes: 3 additions & 3 deletions
engine/shared/library/sharedFoundation/src/shared/Fatal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const

	// look up the call stack information
	const int callStackSize = callStackOffset + stackDepth;
uint32 callStack[callStackOffset + maxStackDepth];
uint64 callStack[callStackOffset + maxStackDepth];

	// allow complete disable of the call stack lookup
	if (stackDepth < 0)
Expand All@@ -82,7 +82,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
 else
 snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
 snprintf(buffer, bufferLength, "(0x%016llX) : %s %08x: \n", static_cast<unsigned long long>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
	}
	else
	{
Expand DownExpand Up@@ -126,7 +126,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, " %s(%d) : caller %d\n", file, line, i-callStackOffset);
 else
 snprintf(buffer, bufferLength, " (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
 snprintf(buffer, bufferLength, " (0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset);

 const int length = strlen(buffer);
 buffer += length;
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char value[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -52,8 +52,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -64,7 +64,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

10 changes: 5 additions & 5 deletions
external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char temp[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -55,8 +55,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -67,7 +67,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 assert(c.cmd == Command::ADD); // only add is valid in unpack
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix four LP64 defects and add Oracle 19 client discovery#34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AconiteX
merged 5 commits into

from

Jul 26, 2026
 Merged


Fix four LP64 defects and add Oracle 19 client discovery
#34
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
55c8f22

Use fixed-width counts in the NetworkId and Unicode packed maps


swgsais Jul 25, 2026
ec3419d

Store call stack addresses at pointer width


swgsais Jul 25, 2026
4fac50d

Back QueryPerformanceCounter with a monotonic clock


swgsais Jul 25, 2026
750f7d8

Stop dereferencing a 32-bit frame offset in the SIGSEGV handler


swgsais Jul 25, 2026
a7c1459

Support Oracle 19 x64 Instant Client discovery


swgsais Jul 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
cmake/linux/FindOracle.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,11 @@ if(DEFINED ENV{ORACLE_HOME})
 ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows

 set(ORACLE_OCI_NAMES clntsh libclntsh oci)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz21 nnz21 ociw32)
 set(ORACLE_NNZ_NAMES libnnz18 nnz18 libnnz19 nnz19 libnnz21 nnz21 ociw32)
 set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)

 set(ORACLE_LIB_DIR 
 ${ORACLE_HOME}
 ${ORACLE_HOME}/lib
 ${ORACLE_HOME}/sdk/lib # Oracle SDK
 ${ORACLE_HOME}/sdk/lib/msvc
Expand DownExpand Up@@ -76,4 +77,4 @@ endif(DEFINED ENV{ORACLE_HOME})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)

26 changes: 18 additions & 8 deletions
engine/server/library/serverScript/src/shared/JavaLibrary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -781,16 +781,26 @@ void JavaLibrary::fatalHandler(int signum)
	{
 // try to see if our call stack came from C or Java
 void *frameAddress = __builtin_frame_address(0);
 // the address that generated the segfault is stored at an offset of 0x44 from
 // the frame address
 // @todo: find documentation on the offset to verify it is stable
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));

 // pass the crash address to addr2line to get the file name where the crash occurred
 // These are zero initialized because the strstr() checks below read them
 // whenever a lookup fails.
 static const int BUFLEN = 2048;
 char lib1[BUFLEN], lib2[BUFLEN];
 char file1[BUFLEN], file2[BUFLEN];
 int line1, line2;
 bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
 char lib1[BUFLEN] = { '\0' }, lib2[BUFLEN] = { '\0' };
 char file1[BUFLEN] = { '\0' }, file2[BUFLEN] = { '\0' };
 int line1 = 0, line2 = 0;
 bool result1 = false;

 // The faulting address used to be read from a fixed 0x44 byte offset into
 // this frame. That constant describes the 32-bit x86 frame layout only; on
 // x86-64 it is both misaligned and meaningless, and dereferencing it from
 // inside a SIGSEGV handler risks a recursive fault that loses the crash
 // report entirely. The __builtin_return_address() probe below is portable
 // and already covers this case.
#if defined(__i386__)
 void *crashAddress1 = *((void**)((static_cast<char *>(frameAddress)) + 0x44));
 result1 = DebugHelp::lookupAddress(reinterpret_cast<uint64>(crashAddress1), lib1, file1, BUFLEN, line1);
#endif

 // do a second test based on the return address
 // it turns out that in some java crashes we don't even have 2 return
Expand Down

23 changes: 21 additions & 2 deletions
engine/shared/library/sharedDebug/src/linux/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,11 +682,30 @@ bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int

// ----------------------------------------------------------------------

void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	//-- backtrace() writes sizeOfCallStack void* entries. Handing it the
	// caller's buffer directly only works when sizeof(void*) happens to
	// equal the element size; under LP64 it wrote 8 bytes per entry into a
	// 4-byte-per-entry array and overran the buffer by 2x. Capture into a
	// native pointer array and widen instead, which is correct for both
	// ILP32 and LP64.
	enum { cs_maximumFrameCount = 256 };
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is functioning as a magic number, so could instead be at top of file, even though it is scoped and only relevant to the single function so it's 50/50 (I also don't love use of an untyped enum here since the compiler then has to make an inference and god knows what it may do in the future); alternatively, e.g., at top of file:
namespace
{
constexprint cs_maximumFrameCount = 256;
}

	if (sizeOfCallStack <= 0)
 return;
@AconiteXAconiteXJul 26, 2026

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source generally (but admittedly inconsistently) uses allman style bracing and doesn't tend to use indentation block syntax/off-side rule, so code like this would properly be (but again doesn't technically matter and would surely start a not so fun debate)
if (sizeOfCallStack <= 0)
{
return;
}

	for (int i = 0; i < sizeOfCallStack; ++i)
 callStack[i] = 0;
	IGNORE_RETURN(backtrace(reinterpret_cast<void **>(callStack), sizeOfCallStack));

	if (sizeOfCallStack > static_cast<int>(cs_maximumFrameCount))
 sizeOfCallStack = static_cast<int>(cs_maximumFrameCount);

	void *frames[cs_maximumFrameCount];
	int const frameCount = backtrace(frames, sizeOfCallStack);

	for (int i = 0; i < frameCount; ++i)
 callStack[i] = reinterpret_cast<uint64>(frames[i]);
}

// ======================================================================
Expand Down

5 changes: 4 additions & 1 deletion
engine/shared/library/sharedDebug/src/linux/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,10 @@ class DebugHelp
	static void install();
	static void remove();

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	//-- Entries are instruction addresses, so the buffer must be pointer-width
	// capable. uint64 matches lookupAddress() below and is wide enough on
	// both ILP32 and LP64.
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);
};

Expand Down

8 changes: 4 additions & 4 deletions
engine/shared/library/sharedDebug/src/shared/CallStack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ void CallStack::debugPrint() const
	for (size_t i = 2; i < CALLSTACK_DEPTH; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_PRINT(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_PRINT(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_PRINT(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_PRINT(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand All@@ -76,9 +76,9 @@ void CallStack::debugLog() const
	for (size_t i = 2; i < CALLSTACK_DEPTH && m_callStack[i]!=0; ++i)
	{
 if (DebugHelp::lookupAddress(m_callStack[i], libName, fileName, sizeof(fileName), line))
 DEBUG_REPORT_LOG(true, (" (0x%08X) %s(%d) : caller %d\n", static_cast<int>(m_callStack[i]), fileName, line, i - 1));
 DEBUG_REPORT_LOG(true, (" (0x%016llX) %s(%d) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), fileName, line, i - 1));
 else
 DEBUG_REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(m_callStack[i]), i - 1));
 DEBUG_REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(m_callStack[i]), i - 1));
	}
}

Expand Down

3 changes: 2 additions & 1 deletion
engine/shared/library/sharedDebug/src/shared/CallStack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,8 @@ class CallStack

private:

	uint32 m_callStack[S_callStack];
	//-- Instruction addresses; must be pointer-width capable (see DebugHelp::getCallStack).
	uint64 m_callStack[S_callStack];
};

// ======================================================================
Expand Down

16 changes: 8 additions & 8 deletions
engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ namespace CallStackCollectorNamespace
 ~Node();

 CrcString const & getName() const;
 void addCallStack(uint32 * callStack);
 void addCallStack(uint64 * callStack);

 void debugReport() const;

Expand All@@ -63,7 +63,7 @@ namespace CallStackCollectorNamespace

 public:

uint32 * m_callStack;
uint64 * m_callStack;
 int m_calls;
 };

Expand DownExpand Up@@ -125,10 +125,10 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const

// ----------------------------------------------------------------------

void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
void CallStackCollectorNamespace::Node::addCallStack(uint64 * const callStack)
{
	//-- Compute crc of memory
	uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
	uint32 const crc = Crc::calculate(callStack, (sizeof(*callStack) * CALLSTACK_DEPTH));

	//-- Find callstack in list
	CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
Expand All@@ -140,8 +140,8 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
	else
	{
 //-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack));
uint64 * const newCallStack = new uint64[CALLSTACK_DEPTH];
 memcpy(newCallStack, callStack, sizeof(*newCallStack) * CALLSTACK_DEPTH);

 CallStackEntry callStackEntry;
 callStackEntry.m_callStack = newCallStack;
Expand DownExpand Up@@ -180,7 +180,7 @@ void CallStackCollectorNamespace::Node::debugReport() const
 if (DebugHelp::lookupAddress(callStackEntry->m_callStack[j], libName, fileName, sizeof(fileName), line))
 REPORT_LOG(true, (" %s(%d) : caller %d\n", fileName, line, j - 1));
 else
 REPORT_LOG(true, (" unknown(0x%08X) : caller %d\n", static_cast<int>(callStackEntry->m_callStack[j]), j - 1));
 REPORT_LOG(true, (" unknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStackEntry->m_callStack[j]), j - 1));
 }
	}
}
Expand DownExpand Up@@ -218,7 +218,7 @@ void CallStackCollector::sample(char const * const name)
	}

	//-- Sample the callstack
uint32 callStack[CALLSTACK_DEPTH];
uint64 callStack[CALLSTACK_DEPTH];
	DebugHelp::getCallStack(&callStack[0], CALLSTACK_DEPTH);

	//-- Add to the node
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -481,7 +481,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name)

// ----------------------------------------------------------------------
#pragma warning (disable: 4740 4748)
void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
void DebugHelp::getCallStack(uint64 *callStack, int sizeOfCallStack)
{
	{
 for (int i = 0; i < sizeOfCallStack; ++i)
Expand DownExpand Up@@ -525,7 +525,7 @@ void DebugHelp::getCallStack(uint32 *callStack, int sizeOfCallStack)
 if (stackWalk64(IMAGE_FILE_MACHINE_I386, process, process, &stackFrame, &context, NULL, functionTableAccess, getModuleBase, NULL))
 {
 const DWORD64 Offset = stackFrame.AddrPC.Offset;
 *callStack = DWORD(Offset);
 *callStack = static_cast<uint64>(Offset);
 }
	}
}
Expand All@@ -537,7 +537,7 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
	// look up the call stack information
	int const callStackOffset = 2;
	int const callStackSize = callStackOffset + maxStackDepth;
uint32 * callStack = static_cast<uint32 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint32)));
uint64 * callStack = static_cast<uint64 *>(_alloca((callStackOffset + maxStackDepth) * sizeof(uint64)));
	getCallStack(callStack, callStackOffset + maxStackDepth);

	// look up the caller's file and line
Expand All@@ -553,15 +553,15 @@ void DebugHelp::reportCallStack(int const maxStackDepth)
 if (lookupAddress(callStack[i], lib, file, sizeof(file), line))
 REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
 else
 REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
 REPORT_LOG(true, ("\tunknown(0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset));
 }
 }
	}
}

// ----------------------------------------------------------------------

bool DebugHelp::lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line)
bool DebugHelp::lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line)
{
	UNREF(libName);

Expand Down

4 changes: 2 additions & 2 deletions
engine/shared/library/sharedDebug/src/win32/DebugHelp.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ class DebugHelp

	static bool loadSymbolsForDll(const char *name);

	static void getCallStack(uint32 *callStack, int sizeOfCallStack);
	static void getCallStack(uint64 *callStack, int sizeOfCallStack);
	static void reportCallStack(int const maxStackDepth = 4);
	static bool lookupAddress(uint32 address, char *libName, char *fileName, int fileNameLength, int &line);
	static bool lookupAddress(uint64 address, char *libName, char *fileName, int fileNameLength, int &line);

	static bool writeMiniDump(char const *miniDumpFileName=0, PEXCEPTION_POINTERS exceptionPointers=0);
};
Expand Down

21 changes: 17 additions & 4 deletions
engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,10 +27,23 @@ char* _itoa(int value, char* stringOut, int radix)

bool QueryPerformanceCounter(__int64* time)
{
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 // Must be monotonic. gettimeofday() reports CLOCK_REALTIME, which NTP can
 // slew or step backwards; callers subtract successive samples to derive
 // frame time, so a backwards step produced negative elapsed times (see
 // AlterScheduler "no forward time movement"). CLOCK_MONOTONIC never goes
 // backwards. Units stay microseconds to match QueryPerformanceFrequency().
 struct timespec ts;
 if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
 {
 struct timeval tv;
 gettimeofday(&tv, nullptr);
 *time = static_cast<LARGE_INTEGER>(tv.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(tv.tv_usec);
 return TRUE;
 }

 *time = static_cast<LARGE_INTEGER>(ts.tv_sec);
 *time = (*time * 1000000) + static_cast<LARGE_INTEGER>(ts.tv_nsec / 1000);

 return TRUE;
}
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedFoundation/src/shared/AutoDeltaNetworkIdPackedMap.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,8 @@ namespace Archive
 char temp[200];
 AutoDeltaMap<NetworkId, int>::Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -64,8 +64,8 @@ namespace Archive
 char temp[200];

 AutoDeltaMap<NetworkId, int>::Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -76,7 +76,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

6 changes: 3 additions & 3 deletions
engine/shared/library/sharedFoundation/src/shared/Fatal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const

	// look up the call stack information
	const int callStackSize = callStackOffset + stackDepth;
uint32 callStack[callStackOffset + maxStackDepth];
uint64 callStack[callStackOffset + maxStackDepth];

	// allow complete disable of the call stack lookup
	if (stackDepth < 0)
Expand All@@ -82,7 +82,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[callStackOffset], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, "%s(%d) : %s %08x: \n", file, line, type, static_cast<int>(Crc::calculate(format)));
 else
 snprintf(buffer, bufferLength, "(0x%08X) : %s %08x: \n", static_cast<int>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
 snprintf(buffer, bufferLength, "(0x%016llX) : %s %08x: \n", static_cast<unsigned long long>(callStack[callStackOffset]), type, static_cast<int>(Crc::calculate(format)));
	}
	else
	{
Expand DownExpand Up@@ -126,7 +126,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const
 if (ConfigSharedFoundation::getLookUpCallStackNames() && DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
 snprintf(buffer, bufferLength, " %s(%d) : caller %d\n", file, line, i-callStackOffset);
 else
 snprintf(buffer, bufferLength, " (0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset);
 snprintf(buffer, bufferLength, " (0x%016llX) : caller %d\n", static_cast<unsigned long long>(callStack[i]), i-callStackOffset);

 const int length = strlen(buffer);
 buffer += length;
Expand Down

10 changes: 5 additions & 5 deletions
engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char value[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -52,8 +52,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -64,7 +64,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 Archive::get(source, c.key);
Expand Down

10 changes: 5 additions & 5 deletions
external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,8 @@ namespace Archive
 char temp[200];
 Command c;

 Archive::put(target, countCharacter(buffer,':'));
 Archive::put(target, static_cast<size_t>(0)); // baselineCommandCount
 Archive::put(target, static_cast<int32_t>(countCharacter(buffer,':')));
 Archive::put(target, static_cast<int32_t>(0)); // baselineCommandCount

 int tempPos = 0;
 for (std::string::const_iterator i=buffer.begin(); i!=buffer.end(); ++i)
Expand DownExpand Up@@ -55,8 +55,8 @@ namespace Archive
 char temp[200];

 Command c;
size_t commandCount;
size_t baselineCommandCount;
int32_t commandCount;
int32_t baselineCommandCount;

 Archive::get(source, commandCount);
 Archive::get(source, baselineCommandCount);
Expand All@@ -67,7 +67,7 @@ namespace Archive
 }
 else
 {
 for (size_t i = 0; i < commandCount; ++i)
 for (int32_t i = 0; i < commandCount; ++i)
 {
 Archive::get(source, c.cmd);
 assert(c.cmd == Command::ADD); // only add is valid in unpack
Expand Down