doylet/DN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc fixes from solidpp

Browse Source
This commit is contained in:
doylet 2025-11-10 21:16:48 +11:00
parent d4dcead4f2
commit 70e4a3fa1d
7 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Source/Base/dn_base_assert.h
View File

@ -13,34 +13,44 @@
} while (0) } while (0)
#define DN_HardAssert(expr) DN_HardAssertF(expr, "") #define DN_HardAssert(expr) DN_HardAssertF(expr, "")
// NOTE: Our default assert requires stack traces which has a bit of a chicken-and-egg problem if
// we're trying to detect some code related to the DN startup sequence. If we try to assert before
// the OS layer is initialised stack-traces will try to use temporary memory which requires TLS to
// be setup which belongs to the OS.
//
// This causes recursion errors as they call into each other. We use RawAsserts for these kind of
// checks.
#if defined(DN_NO_ASSERT) #if defined(DN_NO_ASSERT)
#define DN_RawAssert(...)
#define DN_Assert(...) #define DN_Assert(...)
#define DN_AssertOnce(...) #define DN_AssertOnce(...)
#define DN_AssertF(...) #define DN_AssertF(...)
#define DN_AssertFOnce(...) #define DN_AssertFOnce(...)
#else #else
#define DN_AssertF(expr, fmt, ...) \ #define DN_RawAssert(expr) do { if (!(expr)) DN_DebugBreak; } while (0)
do { \
if (!(expr)) { \ #define DN_AssertF(expr, fmt, ...) \
do { \
if (!(expr)) { \
DN_Str8 stack_trace_ = DN_StackTraceWalkStr8FromHeap(128 /*limit*/, 2 /*skip*/); \ DN_Str8 stack_trace_ = DN_StackTraceWalkStr8FromHeap(128 /*limit*/, 2 /*skip*/); \
DN_LOG_ErrorF("Assertion [" #expr "], stack trace was:\n\n%.*s\n\n" fmt, \ DN_LOG_ErrorF("Assertion [" #expr "], stack trace was:\n\n%.*s\n\n" fmt, \
DN_Str8PrintFmt(stack_trace_), \ DN_Str8PrintFmt(stack_trace_), \
##__VA_ARGS__); \ ##__VA_ARGS__); \
DN_DebugBreak; \ DN_DebugBreak; \
} \ } \
} while (0) } while (0)
#define DN_AssertFOnce(expr, fmt, ...) \ #define DN_AssertFOnce(expr, fmt, ...) \
do { \ do { \
static bool once = true; \ static bool once = true; \
if (!(expr) && once) { \ if (!(expr) && once) { \
once = false; \ once = false; \
DN_Str8 stack_trace_ = DN_StackTraceWalkStr8FromHeap(128 /*limit*/, 2 /*skip*/); \ DN_Str8 stack_trace_ = DN_StackTraceWalkStr8FromHeap(128 /*limit*/, 2 /*skip*/); \
DN_LOG_ErrorF("Assertion [" #expr "], stack trace was:\n\n%.*s\n\n" fmt, \ DN_LOG_ErrorF("Assertion [" #expr "], stack trace was:\n\n%.*s\n\n" fmt, \
DN_Str8PrintFmt(stack_trace_), \ DN_Str8PrintFmt(stack_trace_), \
##__VA_ARGS__); \ ##__VA_ARGS__); \
DN_DebugBreak; \ DN_DebugBreak; \
} \ } \
} while (0) } while (0)
#define DN_Assert(expr) DN_AssertF((expr), "") #define DN_Assert(expr) DN_AssertF((expr), "")

30
Source/Base/dn_base_compiler.h
View File

@ -1,7 +1,7 @@
#if !defined(DN_BASE_COMPILER_H) #if !defined(DN_BASE_COMPILER_H)
#define DN_BASE_COMPILER_H #define DN_BASE_COMPILER_H
// NOTE: Compiler identification /////////////////////////////////////////////////////////////////// // NOTE: Compiler identification
// Warning! Order is important here, clang-cl on Windows defines _MSC_VER // Warning! Order is important here, clang-cl on Windows defines _MSC_VER
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if defined(__clang__) #if defined(__clang__)
@ -16,7 +16,7 @@
#define DN_COMPILER_GCC #define DN_COMPILER_GCC
#endif #endif
// NOTE: __has_feature ///////////////////////////////////////////////////////////////////////////// // NOTE: __has_feature
// MSVC for example does not support the feature detection macro for instance so we compile it out // MSVC for example does not support the feature detection macro for instance so we compile it out
#if defined(__has_feature) #if defined(__has_feature)
#define DN_HAS_FEATURE(expr) __has_feature(expr) #define DN_HAS_FEATURE(expr) __has_feature(expr)
@ -24,7 +24,7 @@
#define DN_HAS_FEATURE(expr) 0 #define DN_HAS_FEATURE(expr) 0
#endif #endif
// NOTE: __has_builtin ///////////////////////////////////////////////////////////////////////////// // NOTE: __has_builtin
// MSVC for example does not support the feature detection macro for instance so we compile it out // MSVC for example does not support the feature detection macro for instance so we compile it out
#if defined(__has_builtin) #if defined(__has_builtin)
#define DN_HAS_BUILTIN(expr) __has_builtin(expr) #define DN_HAS_BUILTIN(expr) __has_builtin(expr)
@ -32,7 +32,7 @@
#define DN_HAS_BUILTIN(expr) 0 #define DN_HAS_BUILTIN(expr) 0
#endif #endif
// NOTE: Warning suppression macros //////////////////////////////////////////////////////////////// // NOTE: Warning suppression macros
#if defined(DN_COMPILER_MSVC) #if defined(DN_COMPILER_MSVC)
#define DN_MSVC_WARNING_PUSH __pragma(warning(push)) #define DN_MSVC_WARNING_PUSH __pragma(warning(push))
#define DN_MSVC_WARNING_DISABLE(...) __pragma(warning(disable :##__VA_ARGS__)) #define DN_MSVC_WARNING_DISABLE(...) __pragma(warning(disable :##__VA_ARGS__))
@ -55,14 +55,14 @@
#define DN_GCC_WARNING_POP #define DN_GCC_WARNING_POP
#endif #endif
// NOTE: Host OS identification //////////////////////////////////////////////////////////////////// // NOTE: Host OS identification
#if defined(_WIN32) #if defined(_WIN32)
#define DN_OS_WIN32 #define DN_OS_WIN32
#elif defined(__gnu_linux__) || defined(__linux__) #elif defined(__gnu_linux__) || defined(__linux__)
#define DN_OS_UNIX #define DN_OS_UNIX
#endif #endif
// NOTE: Platform identification /////////////////////////////////////////////////////////////////// // NOTE: Platform identification
#if !defined(DN_PLATFORM_EMSCRIPTEN) && \ #if !defined(DN_PLATFORM_EMSCRIPTEN) && \
!defined(DN_PLATFORM_POSIX) && \ !defined(DN_PLATFORM_POSIX) && \
!defined(DN_PLATFORM_WIN32) !defined(DN_PLATFORM_WIN32)
@ -77,7 +77,7 @@
#endif #endif
#endif #endif
// NOTE: Windows crap ////////////////////////////////////////////////////////////////////////////// // NOTE: Windows crap
#if defined(DN_COMPILER_MSVC) || defined(DN_COMPILER_CLANG_CL) #if defined(DN_COMPILER_MSVC) || defined(DN_COMPILER_CLANG_CL)
#if defined(_CRT_SECURE_NO_WARNINGS) #if defined(_CRT_SECURE_NO_WARNINGS)
#define DN_CRT_SECURE_NO_WARNINGS_PREVIOUSLY_DEFINED #define DN_CRT_SECURE_NO_WARNINGS_PREVIOUSLY_DEFINED
@ -86,21 +86,21 @@
#endif #endif
#endif #endif
// NOTE: Force Inline ////////////////////////////////////////////////////////////////////////////// // NOTE: Force Inline
#if defined(DN_COMPILER_MSVC) || defined(DN_COMPILER_CLANG_CL) #if defined(DN_COMPILER_MSVC) || defined(DN_COMPILER_CLANG_CL)
#define DN_FORCE_INLINE __forceinline #define DN_FORCE_INLINE __forceinline
#else #else
#define DN_FORCE_INLINE inline __attribute__((always_inline)) #define DN_FORCE_INLINE inline __attribute__((always_inline))
#endif #endif
// NOTE: Function/Variable Annotations ///////////////////////////////////////////////////////////// // NOTE: Function/Variable Annotations
#if defined(DN_STATIC_API) #if defined(DN_STATIC_API)
#define DN_API static #define DN_API static
#else #else
#define DN_API #define DN_API
#endif #endif
// NOTE: C/CPP Literals //////////////////////////////////////////////////////////////////////////// // NOTE: C/CPP Literals
// Declare struct literals that work in both C and C++ because the syntax is different between // Declare struct literals that work in both C and C++ because the syntax is different between
// languages. // languages.
#if 0 #if 0
@ -114,14 +114,14 @@
#define DN_Literal(T) (T) #define DN_Literal(T) (T)
#endif #endif
// NOTE: Thread Locals ///////////////////////////////////////////////////////////////////////////// // NOTE: Thread Locals
#if defined(__cplusplus) #if defined(__cplusplus)
#define DN_THREAD_LOCAL thread_local #define DN_THREAD_LOCAL thread_local
#else #else
#define DN_THREAD_LOCAL _Thread_local #define DN_THREAD_LOCAL _Thread_local
#endif #endif
// NOTE: C variadic argument annotations /////////////////////////////////////////////////////////// // NOTE: C variadic argument annotations
// TODO: Other compilers // TODO: Other compilers
#if defined(DN_COMPILER_MSVC) #if defined(DN_COMPILER_MSVC)
#define DN_FMT_ATTRIB _Printf_format_string_ #define DN_FMT_ATTRIB _Printf_format_string_
@ -129,17 +129,17 @@
#define DN_FMT_ATTRIB #define DN_FMT_ATTRIB
#endif #endif
// NOTE: Type Cast ///////////////////////////////////////////////////////////////////////////////// // NOTE: Type Cast
#define DN_Cast(val) (val) #define DN_Cast(val) (val)
// NOTE: Zero initialisation macro ///////////////////////////////////////////////////////////////// // NOTE: Zero initialisation macro
#if defined(__cplusplus) #if defined(__cplusplus)
#define DN_ZeroInit {} #define DN_ZeroInit {}
#else #else
#define DN_ZeroInit {0} #define DN_ZeroInit {0}
#endif #endif
// NOTE: Address sanitizer ///////////////////////////////////////////////////////////////////////// // NOTE: Address sanitizer
#if !defined(DN_ASAN_POISON) #if !defined(DN_ASAN_POISON)
#define DN_ASAN_POISON 0 #define DN_ASAN_POISON 0
#endif #endif

17
Source/Extra/dn_net.cpp
View File

@ -3,6 +3,23 @@
#include "../dn_base_inc.h" #include "../dn_base_inc.h"
#include "../dn_os_inc.h" #include "../dn_os_inc.h"
DN_Str8 DN_NET_Str8FromResponseState(DN_NETResponseState state)
{
DN_Str8 result = {};
switch (state) {
case DN_NETResponseState_Nil: result = DN_Str8Lit("Nil"); break;
case DN_NETResponseState_Error: result = DN_Str8Lit("Error"); break;
case DN_NETResponseState_HTTP: result = DN_Str8Lit("HTTP"); break;
case DN_NETResponseState_WSOpen: result = DN_Str8Lit("WS Open"); break;
case DN_NETResponseState_WSText: result = DN_Str8Lit("WS Text"); break;
case DN_NETResponseState_WSBinary: result = DN_Str8Lit("WS Binary"); break;
case DN_NETResponseState_WSClose: result = DN_Str8Lit("WS Close"); break;
case DN_NETResponseState_WSPing: result = DN_Str8Lit("WS Ping"); break;
case DN_NETResponseState_WSPong: result = DN_Str8Lit("WS Pong"); break;
}
return result;
}
DN_NETRequest *DN_NET_RequestFromHandle(DN_NETRequestHandle handle) DN_NETRequest *DN_NET_RequestFromHandle(DN_NETRequestHandle handle)
{ {
DN_NETRequest *ptr = DN_Cast(DN_NETRequest *) handle.handle; DN_NETRequest *ptr = DN_Cast(DN_NETRequest *) handle.handle;

11
Source/Extra/dn_net.h
View File

@ -114,12 +114,13 @@ struct DN_NETInterface
DN_NETWaitForAnyResponseFunc* wait_for_any_response; DN_NETWaitForAnyResponseFunc* wait_for_any_response;
}; };
DN_NETRequest * DN_NET_RequestFromHandle (DN_NETRequestHandle handle); DN_Str8 DN_NET_Str8FromResponseState(DN_NETResponseState state);
DN_NETRequestHandle DN_NET_HandleFromRequest (DN_NETRequest *request); DN_NETRequest * DN_NET_RequestFromHandle (DN_NETRequestHandle handle);
DN_NETRequestHandle DN_NET_HandleFromRequest (DN_NETRequest *request);
// NOTE: Internal functions for different networking implementations to use // NOTE: Internal functions for different networking implementations to use
void DN_NET_BaseInit_ (DN_NETCore *net, char *base, DN_U64 base_size); void DN_NET_BaseInit_ (DN_NETCore *net, char *base, DN_U64 base_size);
DN_NETRequestHandle DN_NET_SetupRequest_ (DN_NETRequest *request, DN_Str8 url, DN_Str8 method, DN_NETDoHTTPArgs const *args, DN_NETRequestType type); DN_NETRequestHandle DN_NET_SetupRequest_ (DN_NETRequest *request, DN_Str8 url, DN_Str8 method, DN_NETDoHTTPArgs const *args, DN_NETRequestType type);
void DN_NET_EndFinishedRequest_ (DN_NETRequest *request); void DN_NET_EndFinishedRequest_ (DN_NETRequest *request);
#endif // DN_NET_H #endif // DN_NET_H

1
Source/OS/dn_os_w32.cpp
View File

@ -110,6 +110,7 @@ DN_API int DN_OS_MemProtect(void *ptr, DN_USize size, DN_U32 page_flags)
DN_API void *DN_OS_MemAlloc(DN_USize size, DN_ZMem z_mem) DN_API void *DN_OS_MemAlloc(DN_USize size, DN_ZMem z_mem)
{ {
DN_RawAssert(g_dn_->init_flags & DN_InitFlags_OS && "DN must be initialised with the OS flag");
DN_U32 flags = z_mem == DN_ZMem_Yes ? HEAP_ZERO_MEMORY : 0; DN_U32 flags = z_mem == DN_ZMem_Yes ? HEAP_ZERO_MEMORY : 0;
DN_Assert(size <= DN_Cast(DWORD)(-1)); DN_Assert(size <= DN_Cast(DWORD)(-1));
void *result = HeapAlloc(GetProcessHeap(), flags, DN_Cast(DWORD) size); void *result = HeapAlloc(GetProcessHeap(), flags, DN_Cast(DWORD) size);

3
Source/dn_inc.cpp
View File

@ -93,7 +93,8 @@ static void DN_InitOS_(DN_OSCore *os, DN_InitArgs *args)
DN_API void DN_Init(DN_Core *dn, DN_InitFlags flags, DN_InitArgs *args) DN_API void DN_Init(DN_Core *dn, DN_InitFlags flags, DN_InitArgs *args)
{ {
g_dn_ = dn; g_dn_ = dn;
dn->init_flags = flags;
if (flags & DN_InitFlags_OS) { if (flags & DN_InitFlags_OS) {
#if defined(DN_OS_H) && defined(DN_OS_CPP) #if defined(DN_OS_H) && defined(DN_OS_CPP)

19
Source/dn_inc.h
View File

@ -1,15 +1,6 @@
#if !defined(DN_INC_H) #if !defined(DN_INC_H)
#define DN_INC_H #define DN_INC_H
struct DN_Core
{
DN_USize mem_allocs_frame;
DN_LeakTracker leak;
#if defined(DN_OS_H)
DN_OSCore os;
#endif
};
struct DN_InitArgs struct DN_InitArgs
{ {
DN_U64 os_tls_reserve; DN_U64 os_tls_reserve;
@ -29,6 +20,16 @@ enum DN_InitFlags_
DN_InitFlags_LogAllFeatures = DN_InitFlags_LogLibFeatures | DN_InitFlags_LogCPUFeatures, DN_InitFlags_LogAllFeatures = DN_InitFlags_LogLibFeatures | DN_InitFlags_LogCPUFeatures,
}; };
struct DN_Core
{
DN_InitFlags init_flags;
DN_USize mem_allocs_frame;
DN_LeakTracker leak;
#if defined(DN_OS_H)
DN_OSCore os;
#endif
};
extern DN_Core *g_dn_; extern DN_Core *g_dn_;
DN_API void DN_Init(DN_Core *dn, DN_InitFlags flags, DN_InitArgs *args); DN_API void DN_Init(DN_Core *dn, DN_InitFlags flags, DN_InitArgs *args);