ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-06-12 23:51:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

progress on sanity_tests.c, adding back md_str8_styllize

Browse Source 
Eventually a heavy reduction of base & OS should be provided via libgen or done here to reduce the overall surface area of the library for the user.
Base and os were dragged from raddbg and the original metadesk didn't need as many definitions.
This commit is contained in:
Edward R. Gonzalez
2025-02-13 09:50:54 -05:00
parent 28d0c85771
commit 3e064f6443
15 changed files with 390 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/base/arena.h
+2 -2
View File
@@ -106,11 +106,11 @@ void temp_arena_end(MD_TempArena temp);
//- rjf: push helper macros
#ifndef md_push_array_
#ifndef md_push_array
#define md_push_array__no_zero_aligned(a, T, c, align) (T *)md_arena_push((a), sizeof(T) * (c), (align))
#define md_push_array__aligned(a, T, c, align) (T *)md_memory_zero(md_push_array__no_zero_aligned(a, T, c, align), sizeof(T) * (c))
#define md_push_array__no_zero(a, T, c) md_push_array__no_zero_aligned(a, T, c, md_max(8, md_align_of(T)))
#define md_push_array_(a, T, c) md_push_array__aligned (a, T, c, md_max(8, md_align_of(T)))
#define md_push_array(a, T, c) md_push_array__aligned (a, T, c, md_max(8, md_align_of(T)))
#endif
// Inlines
source/base/command_line.h
+1 -1
View File
@@ -85,7 +85,7 @@ md_force_inline MD_CmdLine md_cmd_line_from_string_list__arena(MD_Arena* are
inline MD_CmdLineOpt* md_cmd_line_opt_from_string(MD_CmdLine *cmd_line, MD_String8 name) { return md_cmd_line_opt_from_slot(md_cmd_line_slot_from_string(cmd_line, name), name); }
inline MD_B32 md_cmd_line_has_flag (MD_CmdLine *cmd_line, MD_String8 name) { MD_CmdLineOpt *var = md_cmd_line_opt_from_string(cmd_line, name); return(var != 0); }
inline MD_B32 md_cmd_line_has_argument (MD_CmdLine *cmd_line, MD_String8 name) { MD_CmdLineOpt *var = md_cmd_line_opt_from_string(cmd_line, name); return(var != 0 && var->value_strings.md_node_count > 0); }
inline MD_B32 md_cmd_line_has_argument (MD_CmdLine *cmd_line, MD_String8 name) { MD_CmdLineOpt *var = md_cmd_line_opt_from_string(cmd_line, name); return(var != 0 && var->value_strings.node_count > 0); }
inline MD_String8List
md_cmd_line_strings(MD_CmdLine *cmd_line, MD_String8 name) {
source/base/logger.c
+1 -1
View File
@@ -56,7 +56,7 @@ void
md_log_scope_begin(void) {
if (md_log_active != 0) {
MD_U64 pos = md_arena_pos(md_log_active->arena);
MD_LogScope* scope = md_push_array_(md_log_active->arena, MD_LogScope, 1);
MD_LogScope* scope = md_push_array(md_log_active->arena, MD_LogScope, 1);
scope->pos = pos;
md_sll_stack_push(md_log_active->top_scope, scope);
}
source/base/logger.h
+1 -1
View File
@@ -58,7 +58,7 @@ md_log_alloc(MD_AllocatorInfo ainfo, MD_U64 md_arena_block_size) {
md_arena_block_size = MD_LOG_DEFAULT_ARENA_BLOCK_SIZE;
}
MD_Arena* arena = md_arena_alloc(.backing = ainfo, .block_size = md_arena_block_size);
MD_Log* log = md_push_array_(arena, MD_Log, 1);
MD_Log* log = md_push_array(arena, MD_Log, 1);
log->arena = arena;
return log;
}
source/base/memory.h
+3 -3
View File
@@ -37,7 +37,7 @@
#endif
#ifndef md_thousand
#define thousand(n) ((n) * 1000)
#define md_thousand(n) ((n) * 1000)
#endif
#ifndef md_million
#define md_million(n) ((n) * 1000000)
@@ -801,9 +801,9 @@ md_sll__queue_pop_nz(void* nil, void** f, void* f_next, void** l)
#ifndef md_zero_struct
# if MD_LANG_CPP
# define md_zero_struct {}
# define md_zero_struct() {}
# else
# define md_zero_struct {0}
# define md_zero_struct() {0}
# endif
#endif
source/base/strings.c
+2 -2
View File
@@ -672,7 +672,7 @@ md_str8_path_list_resolve_dots_in_place(MD_String8List* path, MD_PathStyle style
eliminate_stack_top:
{
path->md_node_count -= 1;
path->node_count -= 1;
path->total_size -= stack->node->string.size;
md_sll_stack_pop(stack);
@@ -1377,7 +1377,7 @@ md_fuzzy_match_find__ainfo(MD_AllocatorInfo ainfo, MD_String8 needle, MD_String8
}
if (find_pos < haystack.size) {
MD_Rng1U64 range = md_r1u64(find_pos, find_pos+needle_n->string.size);
MD_FuzzyMatchRangeNode* n = md_push_array_(scratch.arena, MD_FuzzyMatchRangeNode, 1);
MD_FuzzyMatchRangeNode* n = md_push_array(scratch.arena, MD_FuzzyMatchRangeNode, 1);
n->range = range;
md_sll_queue_push(result.first, result.last, n);
result.count += 1;
source/base/strings.h
+7 -7
View File
@@ -616,7 +616,7 @@ void md_str8_list_concat_in_place (MD_String8List* list, MD
inline MD_String8Node*
md_str8_list_push_node(MD_String8List* list, MD_String8Node* node) {
md_sll_queue_push(list->first, list->last, node);
list->md_node_count += 1;
list->node_count += 1;
list->total_size += node->string.size;
return(node);
}
@@ -624,7 +624,7 @@ md_str8_list_push_node(MD_String8List* list, MD_String8Node* node) {
inline MD_String8Node*
md_str8_list_push_node_set_string(MD_String8List* list, MD_String8Node* node, MD_String8 string) {
md_sll_queue_push(list->first, list->last, node);
list->md_node_count += 1;
list->node_count += 1;
list->total_size += string.size;
node->string = string;
return(node);
@@ -633,7 +633,7 @@ md_str8_list_push_node_set_string(MD_String8List* list, MD_String8Node* node, MD
inline MD_String8Node*
md_str8_list_push_node_front(MD_String8List* list, MD_String8Node* node) {
md_sll_queue_push_front(list->first, list->last, node);
list->md_node_count += 1;
list->node_count += 1;
list->total_size += node->string.size;
return(node);
}
@@ -641,7 +641,7 @@ md_str8_list_push_node_front(MD_String8List* list, MD_String8Node* node) {
inline MD_String8Node*
md_str8_list_push_node_front_set_string(MD_String8List* list, MD_String8Node* node, MD_String8 string) {
md_sll_queue_push_front(list->first, list->last, node);
list->md_node_count += 1;
list->node_count += 1;
list->total_size += string.size;
node->string = string;
return(node);
@@ -791,7 +791,7 @@ md_str8_list_from_flags__ainfo(MD_AllocatorInfo ainfo, MD_String8List* list, MD_
inline MD_String8Array
md_str8_array_from_list__ainfo(MD_AllocatorInfo ainfo, MD_String8List* list) {
MD_String8Array array;
array.count = list->md_node_count;
array.count = list->node_count;
array.v = md_alloc_array_no_zero(ainfo, MD_String8, array.count);
MD_U64 idx = 0;
for(MD_String8Node *n = list->first; n != 0; n = n->next, idx += 1) {
@@ -1124,7 +1124,7 @@ MD_API MD_FuzzyMatchRangeList md_fuzzy_match_range_list_copy__ainfo(MD_Allocator
#define md_fuzzy_match_range_list_copy(allocator, src) _Generic(allocator, MD_Arena*: md_fuzzy_match_range_list_copy__arena, MD_AllocatorInfo: md_fuzzy_match_range_list_copy__ainfo) md_generic_call(allocator, src)
md_force_inline MD_FuzzyMatchRangeList md_fuzzy_match_find__arena (MD_Arena *arena, MD_String8 needle, MD_String8 haystack) { return md_fuzzy_match_find__ainfo (md_arena_allocator(arena), needle, haystack); }
md_force_inline MD_FuzzyMatchRangeList md_fuzzy_match_range_list_copy__arena(MD_Arena* arena, MD_FuzzyMatchRangeList* src) s{ return md_fuzzy_match_range_list_copy__ainfo(md_arena_allocator(arena), src); }
md_force_inline MD_FuzzyMatchRangeList md_fuzzy_match_range_list_copy__arena(MD_Arena* arena, MD_FuzzyMatchRangeList* src) { return md_fuzzy_match_range_list_copy__ainfo(md_arena_allocator(arena), src); }
////////////////////////////////
//~ NOTE(allen): Serialization Helpers
@@ -1221,7 +1221,7 @@ md_str8_serial_begin__ainfo(MD_AllocatorInfo ainfo, MD_String8List* srl) {
MD_String8Node* node = md_alloc_array(ainfo, MD_String8Node, 1);
node->string.str = md_alloc_array_no_zero(ainfo, MD_U8, 0);
srl->first = srl->last = node;
srl->md_node_count = 1;
srl->node_count = 1;
srl->total_size = 0;
}
source/mdesk/mdesk.c
+123 -1
View File
@@ -6,6 +6,128 @@
// Copyright (c) 2024 Epic Games Tools
// Licensed under the MIT license (https://opensource.org/license/mit/)
MD_String8
md_str8_stylize(MD_Arena* arena, MD_String8 string, MD_IdentifierStyle word_style, MD_String8 separator)
{
MD_String8 result = md_zero_struct();
MD_String8List words = md_zero_struct();
MD_B32 break_on_uppercase = 0;
{
break_on_uppercase = 1;
for (MD_U64 i = 0; i < string.size; i += 1)
{
if ( ! md_char_is_alpha(string.str[i]) && ! md_char_is_digit(string.str[i])) {
break_on_uppercase = 0;
break;
}
}
}
MD_B32 making_word = 0;
MD_String8 word = md_zero_struct();
for (MD_U64 i = 0; i < string.size;)
{
if (making_word)
{
if ( (break_on_uppercase && md_char_is_upper(string.str[i])) || string.str[i] == '_' || md_char_is_space(string.str[i]) || i == string.size - 1)
{
if (i == string.size - 1) {
word.size += 1;
}
making_word = 0;
md_str8_list_push(arena, &words, word);
}
else
{
word.size += 1;
i += 1;
}
}
else
{
if(md_char_is_alpha(string.str[i]))
{
making_word = 1;
word.str = string.str + i;
word.size = 1;
}
i += 1;
}
}
result.size = words.total_size;
if (words.node_count > 1) {
result.size += separator.size*(words.node_count-1);
}
result.str = md_push_array(arena, MD_U8*, result.size);
{
MD_U64 write_pos = 0;
for(MD_String8Node *node = words.first; node; node = node->next)
{
// NOTE(rjf): Write word string to result.
{
MD_MemoryCopy(result.str + write_pos, node->string.str, node->string.size);
// NOTE(rjf): Transform string based on word style.
switch(word_style)
{
case MD_IdentifierStyle_UpperCamelCase:
{
result.str[write_pos] = MD_CharToUpper(result.str[write_pos]);
for(MD_u64 i = write_pos+1; i < write_pos + node->string.size; i += 1)
{
result.str[i] = MD_CharToLower(result.str[i]);
}
}break;
case MD_IdentifierStyle_LowerCamelCase:
{
MD_b32 is_first = (node == words.first);
result.str[write_pos] = (is_first ?
MD_CharToLower(result.str[write_pos]) :
MD_CharToUpper(result.str[write_pos]));
for(MD_u64 i = write_pos+1; i < write_pos + node->string.size; i += 1)
{
result.str[i] = MD_CharToLower(result.str[i]);
}
}break;
case MD_IdentifierStyle_UpperCase:
{
for(MD_u64 i = write_pos; i < write_pos + node->string.size; i += 1)
{
result.str[i] = MD_CharToUpper(result.str[i]);
}
}break;
case MD_IdentifierStyle_LowerCase:
{
for(MD_u64 i = write_pos; i < write_pos + node->string.size; i += 1)
{
result.str[i] = MD_CharToLower(result.str[i]);
}
}break;
default: break;
}
write_pos += node->string.size;
}
if(node->next)
{
MD_MemoryCopy(result.str + write_pos, separator.str, separator.size);
write_pos += separator.size;
}
}
}
return result;
}
////////////////////////////////
// MD_Context
@@ -648,7 +770,7 @@ void md_parse__work_push(MD_ParseWorkKind work_kind, MD_Node* work_parent, MD_Pa
{
MD_ParseWorkNode* work_node = work_free;
if (work_node == 0) {
work_node = md_push_array_(scratch->arena, MD_ParseWorkNode, 1);
work_node = md_push_array(scratch->arena, MD_ParseWorkNode, 1);
}
else {
md_sll_stack_pop(work_free);
source/mdesk/mdesk.h
+16 -4
View File
@@ -6,6 +6,18 @@
// Copyright (c) 2024 Epic Games Tools
// Licensed under the MIT license (https://opensource.org/license/mit/)
// String Identifier Style
typedef enum MD_IdentifierStyle MD_IdentifierStyle;
enum MD_IdentifierStyle
{
MD_IdentifierStyle_UpperCamelCase,
MD_IdentifierStyle_LowerCamelCase,
MD_IdentifierStyle_UpperCase,
MD_IdentifierStyle_LowerCase,
};
MD_API MD_String8 md_str8_stylize(MD_Arena* arena, MD_String8 string, MD_IdentifierStyle style, MD_String8 separator);
////////////////////////////////
//~ rjf: Messages
@@ -325,9 +337,9 @@ MD_API MD_TokenArray md_token_array_from_chunk_list__ainfo (MD_AllocatorInfo ai
#define md_token_chunk_list_push(allocator, list, cap, token) _Generic(allocator, MD_Arena*: md_token_chunk_list_push__arena, MD_AllocatorInfo: md_token_chunk_list_push__ainfo, default: md_assert_generic_sel_fail) md_generic_call(allocator, list, cap, token)
#define md_token_array_from_chunk_list(allocator, chunks) _Generic(allocator, MD_Arena*: md_token_array_from_chunk_list__arena, MD_AllocatorInfo: md_token_array_from_chunk_list__ainfo, default: md_assert_generic_sel_fail) md_generic_call(allocator, chunks)
md_force_inline MD_String8List md_string_list_from_token_flags__arena(MD_Arena* arena, MD_TokenFlags flags) { return md_string_list_from_token_flags__ainfo(md_arena_allocator(arena), flags); }
md_force_inline void md_token_chunk_list_push__arena (MD_Arena* arena, MD_TokenChunkList* list, MD_U64 cap, MD_Token token) { md_token_chunk_list_push__ainfo(md_arena_allocator(arena), list, cap, token); }
md_force_inline MD_TokenArray md_token_array_from_chunk_list__arena (MD_Arena* arena, MD_TokenChunkList* chunks) { return md_token_array_from_chunk_list__ainfo(md_arena_allocator(arena), chunks); }
md_force_inline MD_String8List md_string_list_from_token_flags__arena(MD_Arena* arena, MD_TokenFlags flags) { return md_string_list_from_token_flags__ainfo(md_arena_allocator(arena), flags); }
md_force_inline void md_token_chunk_list_push__arena (MD_Arena* arena, MD_TokenChunkList* list, MD_U64 cap, MD_Token token) { md_token_chunk_list_push__ainfo(md_arena_allocator(arena), list, cap, token); }
md_force_inline MD_TokenArray md_token_array_from_chunk_list__arena (MD_Arena* arena, MD_TokenChunkList* chunks) { return md_token_array_from_chunk_list__ainfo(md_arena_allocator(arena), chunks); }
inline MD_Token
md_token_make(MD_Rng1U64 range, MD_TokenFlags flags) {
@@ -593,7 +605,7 @@ MD_API MD_ParseResult md_parse_from_text__arena(MD_Arena* arena, MD_Strin
MD_API MD_ParseResult md_parse_from_text__ainfo(MD_AllocatorInfo ainfo, MD_String8 filename, MD_String8 text);
#define md_parse_from_text(allocator, filename, text) _Generic(allocator, MD_Arena*: md_parse_from_text__arena, MD_AllocatorInfo: md_parse_from_text__ainfo, default: md_assert_generic_sel_fail) md_generic_call(allocator, filename, text)
#define tree_from_string(allocator, string) (md_parse_from_text((allocator), md_str8_zero(), (string)).root)
#define md_tree_from_string(allocator, string) (md_parse_from_text((allocator), md_str8_zero(), (string)).root)
md_force_inline MD_ParseResult md_parse_from_text__arena(MD_Arena* arena, MD_String8 filename, MD_String8 text) { return md_parse_from_text__ainfo(md_arena_allocator(arena), filename, text); }
source/os/linux/os_linux.c
+37 -37
View File
@@ -50,7 +50,7 @@ md_os_lnx_thread_entry_point(void *ptr)
{
MD_OS_LNX_Entity* entity = (MD_OS_LNX_Entity *)ptr;
MD_OS_ThreadFunctionType* func = entity->thread.func;
void* thread_ptr = entity->thread.ptr;
void* thread_ptr = entity->thread.ptr;
MD_TCTX md_tctx_;
md_tctx_init_and_equip(&md_tctx_);
@@ -80,8 +80,8 @@ md_os_set_thread_name(MD_String8 name)
{
MD_TempArena scratch = md_scratch_begin(0, 0);
{
MD_String8 name_copy = md_push_str8_copy(scratch.arena, name);
pthread_t current_thread = pthread_self();
MD_String8 name_copy = md_push_str8_copy(scratch.arena, name);
pthread_t current_thread = pthread_self();
pthread_setname_np(current_thread, (char *)name_copy.str);
}
scratch_end(scratch);
@@ -102,14 +102,14 @@ md_os_file_open(MD_OS_AccessFlags flags, MD_String8 path)
{
MD_TempArena scratch = md_scratch_begin(0, 0);
{
MD_String8 path_copy = md_push_str8_copy(scratch.arena, path);
int lnx_flags = 0;
MD_String8 path_copy = md_push_str8_copy(scratch.arena, path);
int lnx_flags = 0;
if (flags & (MD_OS_AccessFlag_Read | MD_OS_AccessFlag_Write)) { lnx_flags = O_RDWR; }
else if (flags & MD_OS_AccessFlag_Write) { lnx_flags = O_WRONLY; }
else if (flags & MD_OS_AccessFlag_Read) { lnx_flags = O_RDONLY; }
if (flags & MD_OS_AccessFlag_Append) { lnx_flags |= O_APPEND; }
else if (flags & MD_OS_AccessFlag_Write) { lnx_flags = O_WRONLY; }
else if (flags & MD_OS_AccessFlag_Read) { lnx_flags = O_RDONLY; }
if (flags & MD_OS_AccessFlag_Append) { lnx_flags |= O_APPEND; }
int fd = open((char *)path_copy.str, lnx_flags);
int fd = open((char *)path_copy.str, lnx_flags);
MD_OS_Handle handle = {0};
if (fd != -1) {
handle.u64[0] = fd;
@@ -156,8 +156,8 @@ md_os_file_read(MD_OS_Handle file, MD_Rng1U64 rng, void* out_data)
MD_U64
md_os_file_write(MD_OS_Handle file, MD_Rng1U64 rng, void *data)
{
if(md_os_handle_match(file, md_os_handle_zero())) { return 0; }
if (md_os_handle_match(file, md_os_handle_zero())) { return 0; }
int fd = (int)file.u64[0];
if (rng.md_min != 0) {
lseek(fd, rng.md_min, SEEK_SET);
@@ -183,20 +183,20 @@ md_os_file_write(MD_OS_Handle file, MD_Rng1U64 rng, void *data)
MD_B32
md_os_file_set_times(MD_OS_Handle file, MD_DateTime date_time)
{
if(md_os_handle_match(file, md_os_handle_zero())) { return 0; }
if (md_os_handle_match(file, md_os_handle_zero())) { return 0; }
int fd = (int)file.u64[0];
timespec time = md_os_lnx_timespec_from_date_time(date_time);
timespec times[2] = {time, time};
int futimens_result = futimens(fd, times);
MD_B32 good = (futimens_result != -1);
MD_B32 good = (futimens_result != -1);
return good;
}
MD_FileProperties
md_os_properties_from_file(MD_OS_Handle file)
{
if(md_os_handle_match(file, md_os_handle_zero())) { return (MD_FileProperties){0}; }
if (md_os_handle_match(file, md_os_handle_zero())) { return (MD_FileProperties){0}; }
int fd = (int)file.u64[0];
struct stat fd_stat = {0};
@@ -216,7 +216,7 @@ md_os_id_from_file(MD_OS_Handle file)
struct stat fd_stat = {0};
int fstat_result = fstat(fd, &fd_stat);
MD_OS_FileID id = {0};
if(fstat_result != -1) {
if (fstat_result != -1) {
id.v[0] = fd_stat.st_dev;
id.v[1] = fd_stat.st_ino;
}
@@ -304,8 +304,8 @@ md_internal MD_FileProperties
md_os_properties_from_file_path(MD_String8 path)
{
MD_FileProperties props = {0};
MD_TempArena scratch = md_scratch_begin(0, 0);
MD_String8 path_copy = md_push_str8_copy(scratch.arena, path);
MD_TempArena scratch = md_scratch_begin(0, 0);
MD_String8 path_copy = md_push_str8_copy(scratch.arena, path);
struct stat f_stat = {0};
int stat_result = stat((char *)path_copy.str, &f_stat);
if (stat_result != -1) {
@@ -445,7 +445,7 @@ md_os_shared_memory_alloc(MD_U64 size, MD_String8 name)
{
MD_TempArena scratch = md_scratch_begin(0, 0);
MD_String8 name_copy = md_push_str8_copy(scratch.arena, name);
int id = shm_open((char *)name_copy.str, O_RDWR, 0);
int id = shm_open((char *)name_copy.str, O_RDWR, 0);
ftruncate(id, size);
scratch_end(scratch);
MD_OS_Handle result = {(MD_U64)id};
@@ -457,7 +457,7 @@ md_os_shared_memory_open(MD_String8 name)
{
MD_TempArena scratch = md_scratch_begin(0, 0);
MD_String8 name_copy = md_push_str8_copy(scratch.arena, name);
int id = shm_open((char *)name_copy.str, O_RDWR, 0);
int id = shm_open((char *)name_copy.str, O_RDWR, 0);
scratch_end(scratch);
MD_OS_Handle result = {(MD_U64)id};
return result;
@@ -491,7 +491,7 @@ MD_U64
md_os_now_microseconds(void) {
struct timespec t;
clock_gettime(CLOCK_MONOTONIC, &t);
MD_U64 result = t.tv_sec * md_million(1) + (t.tv_nsec / thousand(1));
MD_U64 result = t.tv_sec * md_million(1) + (t.tv_nsec / md_thousand(1));
return result;
}
@@ -544,7 +544,7 @@ md_os_local_time_from_universal(MD_DateTime* date_time)
void
md_os_sleep_milliseconds(MD_U32 msec) {
usleep(msec * thousand(1));
usleep(msec * md_thousand(1));
}
////////////////////////////////
@@ -598,7 +598,7 @@ md_os_thread_join(MD_OS_Handle handle, MD_U64 endt_us)
{
if (md_os_handle_match(handle, md_os_handle_zero())) { return 0; }
MD_OS_LNX_Entity* entity = (MD_OS_LNX_Entity*)handle.u64[0];
int join_result = pthread_join(entity->thread.handle, 0);
int join_result = pthread_join(entity->thread.handle, 0);
MD_B32 result = (join_result == 0);
md_os_lnx_entity_release(entity);
return result;
@@ -753,10 +753,10 @@ md_os_condition_variable_wait(MD_OS_Handle cv, MD_OS_Handle mutex, MD_U64 endt_u
struct timespec endt_timespec;
endt_timespec.tv_sec = endt_us / md_million(1);
endt_timespec.tv_nsec = thousand(1) * (endt_us - (endt_us / md_million(1)) * md_million(1));
endt_timespec.tv_nsec = md_thousand(1) * (endt_us - (endt_us / md_million(1)) * md_million(1));
int wait_result = pthread_cond_timedwait(&cv_entity->cv.cond_handle, &mutex_entity->mutex_handle, &endt_timespec);
MD_B32 result = (wait_result != ETIMEDOUT);
MD_B32 result = (wait_result != ETIMEDOUT);
return result;
}
@@ -767,15 +767,15 @@ md_os_condition_variable_wait_rw_r(MD_OS_Handle cv, MD_OS_Handle mutex_rw, MD_U6
// this together, but this would probably just be a lot better if we just
// implemented the primitives ourselves with e.g. futexes
//
if(md_os_handle_match(cv, md_os_handle_zero())) { return 0; }
if(md_os_handle_match(mutex_rw, md_os_handle_zero())) { return 0; }
if (md_os_handle_match(cv, md_os_handle_zero())) { return 0; }
if (md_os_handle_match(mutex_rw, md_os_handle_zero())) { return 0; }
MD_OS_LNX_Entity* cv_entity = (MD_OS_LNX_Entity*)cv.u64[0];
MD_OS_LNX_Entity* rw_mutex_entity = (MD_OS_LNX_Entity*)mutex_rw.u64[0];
struct timespec endt_timespec;
endt_timespec.tv_sec = endt_us / md_million(1);
endt_timespec.tv_nsec = thousand(1) * (endt_us - (endt_us / md_million(1)) * md_million(1));
endt_timespec.tv_nsec = md_thousand(1) * (endt_us - (endt_us / md_million(1)) * md_million(1));
MD_B32 result = 0;
for(;;)
@@ -814,7 +814,7 @@ md_os_condition_variable_wait_rw_w(MD_OS_Handle cv, MD_OS_Handle mutex_rw, MD_U6
struct timespec endt_timespec;
endt_timespec.tv_sec = endt_us / md_million(1);
endt_timespec.tv_nsec = thousand(1) * (endt_us - (endt_us / md_million(1)) * md_million(1));
endt_timespec.tv_nsec = md_thousand(1) * (endt_us - (endt_us / md_million(1)) * md_million(1));
MD_B32 result = 0;
for(;;)
@@ -896,8 +896,8 @@ md_os_semaphore_drop(MD_OS_Handle semaphore)
MD_OS_Handle
md_os_library_open(MD_String8 path) {
MD_TempArena scratch = md_scratch_begin(0, 0);
char* path_cstr = (char *)md_push_str8_copy(scratch.arena, path).str;
void* so = dlopen(path_cstr, RTLD_LAZY);
char* path_cstr = (char *)md_push_str8_copy(scratch.arena, path).str;
void* so = dlopen(path_cstr, RTLD_LAZY);
MD_OS_Handle lib = { (MD_U64)so };
scratch_end(scratch);
return lib;
@@ -906,8 +906,8 @@ md_os_library_open(MD_String8 path) {
MD_VoidProc*
md_os_library_load_proc(MD_OS_Handle lib, MD_String8 name) {
MD_TempArena scratch = md_scratch_begin(0, 0);
void* so = (void*)lib.u64;
char* name_cstr = (char*)md_push_str8_copy(scratch.arena, name).str;
void* so = (void*)lib.u64;
char* name_cstr = (char*)md_push_str8_copy(scratch.arena, name).str;
MD_VoidProc* proc = (MD_VoidProc*)dlsym(so, name_cstr);
scratch_end(scratch);
return proc;
@@ -927,7 +927,7 @@ md_os_safe_call(MD_OS_ThreadFunctionType* func, MD_OS_ThreadFunctionType* fail_h
{
// rjf: push handler to chain
MD_OS_LNX_SafeCallChain chain = {0};
SLLStackPush(md_os_lnx_safe_call_chain, &chain);
sll_stack_push(md_os_lnx_safe_call_chain, &chain);
chain.fail_handler = fail_handler;
chain.ptr = ptr;
@@ -1000,7 +1000,7 @@ main(int argc, char **argv)
md_tctx_init_and_equip(&md_tctx);
//- rjf: set up dynamically allocated state
md_os_lnx_state.arena = md_arena_alloc();
md_os_lnx_state.arena = md_arena_alloc();
md_os_lnx_state.entity_arena = md_arena_alloc();
pthread_mutex_init(&md_os_lnx_state.entity_mutex, 0);
@@ -1012,7 +1012,7 @@ main(int argc, char **argv)
// rjf: get machine name
MD_B32 got_final_result = 0;
MD_U8* buffer = 0;
int size = 0;
int size = 0;
for (MD_S64 cap = 4096, r = 0; r < 4; cap *= 2, r += 1)
{
scratch_end(scratch);
@@ -1030,7 +1030,7 @@ main(int argc, char **argv)
{
info->machine_name.size = size;
info->machine_name.str = md_push_array__no_zero(md_os_lnx_state.arena, MD_U8, info->machine_name.size + 1);
MemoryCopy(info->machine_name.str, buffer, info->machine_name.size);
memory_copy(info->machine_name.str, buffer, info->machine_name.size);
info->machine_name.str[info->machine_name.size] = 0;
}
@@ -1065,7 +1065,7 @@ main(int argc, char **argv)
{
MD_String8 full_name = md_str8(buffer, size);
MD_String8 name_chopped = md_str8_chop_last_slash(full_name);
info->binary_path = md_push_str8_copy(md_os_lnx_state.arena, name_chopped);
info->binary_path = md_push_str8_copy(md_os_lnx_state.arena, name_chopped);
}
}
source/os/linux/os_linux.h
+14 -14
View File
@@ -24,7 +24,7 @@ struct MD_OS_LNX_FileIter
{
DIR* dir;
struct dirent* dp;
MD_String8 path;
MD_String8 path;
};
md_assert(sizeof(Member(MD_OS_FileIter, memory)) >= sizeof(MD_OS_LNX_FileIter), md_os_lnx_file_iter_size_check);
@@ -85,7 +85,7 @@ struct MD_OS_LNX_State
MD_Arena* arena;
MD_OS_SystemInfo system_info;
MD_OS_ProcessInfo process_info;
pthread_mutex_t entity_mutex;
pthread_mutex_t entity_mutex;
MD_Arena* entity_arena;
MD_OS_LNX_Entity* entity_free;
};
@@ -95,17 +95,17 @@ struct MD_OS_LNX_State
//~ rjf: Helpers
MD_DateTime md_os_lnx_date_time_from_tm (tm in, MD_U32 msec);
tm md_os_lnx_tm_from_date_time (MD_DateTime dt);
timespec md_os_lnx_timespec_from_date_time (MD_DateTime dt);
tm md_os_lnx_tm_from_date_time (MD_DateTime dt);
timespec md_os_lnx_timespec_from_date_time (MD_DateTime dt);
MD_DenseTime md_os_lnx_dense_time_from_timespec (timespec in);
MD_FileProperties md_os_lnx_file_properties_from_stat(struct stat* s);
void md_os_lnx_safe_call_sig_handler (int x);
void md_os_lnx_safe_call_sig_handler (int x);
inline MD_DateTime
md_os_lnx_date_time_from_tm(tm in, MD_U32 msec) {
MD_DateTime dt = {0};
dt.sec = in.tm_sec;
dt.md_min = in.tm_min;
dt.min = in.tm_min;
dt.hour = in.tm_hour;
dt.day = in.tm_mday-1;
@@ -173,7 +173,7 @@ md_os_lnx_safe_call_sig_handler(int x) {
//~ rjf: Entities
MD_API MD_OS_LNX_Entity* md_os_lnx_entity_alloc (MD_OS_LNX_EntityKind kind);
MD_API void md_os_lnx_entity_release(MD_OS_LNX_Entity* entity);
MD_API void md_os_lnx_entity_release(MD_OS_LNX_Entity* entity);
////////////////////////////////
//~ rjf: Thread Entry Point
@@ -185,7 +185,7 @@ MD_API void* md_os_lnx_thread_entry_point(void* ptr);
inline MD_String8
md_os_get_current_path__ainfo(MD_AllocatorInfo ainfo) {
char* cwdir = getcwd(0, 0);
char* cwdir = getcwd(0, 0);
MD_String8 string = md_str8_copy(ainfo, md_str8_cstring(cwdir));
return string;
}
@@ -195,15 +195,15 @@ md_os_get_current_path__ainfo(MD_AllocatorInfo ainfo) {
//- rjf: basic
inline void* md_os_reserve ( MD_U64 size) { void* result = mmap(0, size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); return result; }
inline MD_B32 md_os_commit (void *ptr, MD_U64 size) { mprotect(ptr, size, PROT_READ | PROT_WRITE); return 1; }
inline void md_os_decommit(void *ptr, MD_U64 size) { madvise(ptr, size, MADV_DONTNEED); mprotect(ptr, size, PROT_NONE); }
inline void md_os_release (void *ptr, MD_U64 size) { munmap(ptr, size); }
inline void* md_os_reserve ( MD_U64 size) { void* result = mmap(0, size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); return result; }
inline MD_B32 md_os_commit (void *ptr, MD_U64 size) { mprotect(ptr, size, PROT_READ | PROT_WRITE); return 1; }
inline void md_os_decommit(void *ptr, MD_U64 size) { madvise(ptr, size, MADV_DONTNEED); mprotect(ptr, size, PROT_NONE); }
inline void md_os_release (void *ptr, MD_U64 size) { munmap(ptr, size); }
//- rjf: large pages
inline void* md_os_reserve_large( MD_U64 size) { void* result = mmap(0, size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0); return result; }
inline MD_B32 md_os_commit_large (void *ptr, MD_U64 size) { mprotect(ptr, size, PROT_READ | PROT_WRITE); return 1; }
inline void* md_os_reserve_large( MD_U64 size) { void* result = mmap(0, size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0); return result; }
inline MD_B32 md_os_commit_large (void *ptr, MD_U64 size) { mprotect(ptr, size, PROT_READ | PROT_WRITE); return 1; }
////////////////////////////////
//~ rjf: @md_os_hooks Thread Info (Implemented Per-OS)
source/os/win32/os_win32.c
+5 -2
View File
@@ -1,3 +1,6 @@
#ifdef INTELLISENSE_DIRECTIVES
# include "os_win32.h"
#endif
// Copyright (c) 2024 Epic Games Tools
// Licensed under the MIT license (https://opensource.org/license/mit/)
@@ -786,7 +789,7 @@ md_os_process_launch(MD_OS_ProcessLaunchParams* params)
MD_String8List all_opts = params->env;
if (params->inherit_env != 0)
{
if (all_opts.md_node_count != 0)
if (all_opts.node_count != 0)
{
md_memory_zero_struct(&all_opts);
for (MD_String8Node *n = params->env.first; n != 0; n = n->next) {
@@ -1486,7 +1489,7 @@ w32_entry_point_caller(int argc, WCHAR** wargv)
//- rjf: extract arguments
MD_Arena* args_arena = md_arena_alloc(.backing = md_varena_alloc(.reserve_size = MD_MB(1), .commit_size = MD_KB(32)));
char** argv = md_push_array_(args_arena, char*, argc);
char** argv = md_push_array(args_arena, char*, argc);
for (int i = 0; i < argc; i += 1)
{
MD_String16 arg16 = md_str16_cstring((MD_U16 *)wargv[i]);
source/os/win32/os_win32.h
+22 -22
View File
@@ -17,9 +17,9 @@ struct MD_OS_W32_FileIter
{
HANDLE handle;
WIN32_FIND_DATAW find_data;
MD_B32 is_volume_iter;
MD_String8Array drive_strings;
MD_U64 drive_strings_iter_idx;
MD_B32 is_volume_iter;
MD_String8Array drive_strings;
MD_U64 drive_strings_iter_idx;
};
md_static_assert(sizeof(md_member(MD_OS_FileIter, memory)) >= sizeof(MD_OS_W32_FileIter), file_iter_memory_size);
@@ -40,9 +40,9 @@ typedef struct MD_OS_W32_EntityThread MD_OS_W32_EntityThread;
struct MD_OS_W32_EntityThread
{
MD_OS_ThreadFunctionType* func;
void* ptr;
HANDLE handle;
DWORD tid;
void* ptr;
HANDLE handle;
DWORD tid;
};
typedef struct MD_OS_W32_Entity MD_OS_W32_Entity;
@@ -53,9 +53,9 @@ struct MD_OS_W32_Entity
union
{
MD_OS_W32_EntityThread thread;
CRITICAL_SECTION mutex;
SRWLOCK rw_mutex;
CONDITION_VARIABLE cv;
CRITICAL_SECTION mutex;
SRWLOCK rw_mutex;
CONDITION_VARIABLE cv;
};
};
@@ -73,9 +73,9 @@ struct MD_OS_W32_State
MD_U64 microsecond_resolution;
// rjf: entity storage
CRITICAL_SECTION entity_mutex;
MD_Arena* entity_arena;
MD_OS_W32_Entity* entity_free;
CRITICAL_SECTION entity_mutex;
MD_Arena* entity_arena;
MD_OS_W32_Entity* entity_free;
};
////////////////////////////////
@@ -87,10 +87,10 @@ MD_API extern MD_OS_W32_State md_os_w32_state;
////////////////////////////////
//~ rjf: Time Conversion Helpers
void md_os_w32_date_time_from_system_time(MD_DateTime* out, SYSTEMTIME* in);
void md_os_w32_system_time_from_date_time(SYSTEMTIME* out, MD_DateTime* in);
void md_os_w32_dense_time_from_file_time (MD_DenseTime* out, FILETIME* in);
MD_API MD_U32 md_os_w32_sleep_ms_from_endt_us(MD_U64 endt_us);
void md_os_w32_date_time_from_system_time(MD_DateTime* out, SYSTEMTIME* in);
void md_os_w32_system_time_from_date_time(SYSTEMTIME* out, MD_DateTime* in);
void md_os_w32_dense_time_from_file_time (MD_DenseTime* out, FILETIME* in);
MD_API MD_U32 md_os_w32_sleep_ms_from_endt_us(MD_U64 endt_us);
inline void
md_os_w32_date_time_from_system_time(MD_DateTime* out, SYSTEMTIME* in)
@@ -101,7 +101,7 @@ md_os_w32_date_time_from_system_time(MD_DateTime* out, SYSTEMTIME* in)
out->day = in->wDay;
out->hour = in->wHour;
out->md_min = in->wMinute;
out->min = in->wMinute;
out->sec = in->wSecond;
out->msec = in->wMilliseconds;
}
@@ -114,7 +114,7 @@ md_os_w32_system_time_from_date_time(SYSTEMTIME* out, MD_DateTime* in)
out->wDay = in->day;
out->wHour = in->hour;
out->wMinute = in->md_min;
out->wMinute = in->min;
out->wSecond = in->sec;
out->wMilliseconds = in->msec;
}
@@ -169,7 +169,7 @@ md_os_get_current_path__ainfo(MD_AllocatorInfo ainfo) {
MD_TempArena scratch = md_scratch_begin(ainfo);
{
DWORD length = GetCurrentDirectoryW(0, 0);
MD_U16* memory = md_push_array__no_zero(scratch.arena, MD_U16, length + 1);
MD_U16* memory = md_push_array__no_zero(scratch.arena, MD_U16, length + 1);
length = GetCurrentDirectoryW(length + 1, (WCHAR*)memory);
name = md_str8_from(ainfo, md_str16(memory, length));
}
@@ -182,9 +182,9 @@ md_os_get_current_path__ainfo(MD_AllocatorInfo ainfo) {
//- rjf: basic
inline void* md_os_reserve ( MD_U64 size) { void* result = VirtualAlloc( 0, size, MEM_RESERVE, PAGE_READWRITE); return result; }
inline MD_B32 md_os_commit (void* ptr, MD_U64 size) { MD_B32 result = (VirtualAlloc(ptr, size, MEM_COMMIT, PAGE_READWRITE) != 0); return result; }
inline void md_os_decommit(void* ptr, MD_U64 size) { VirtualFree (ptr, size, MEM_DECOMMIT); }
inline void* md_os_reserve ( MD_U64 size) { void* result = VirtualAlloc( 0, size, MEM_RESERVE, PAGE_READWRITE); return result; }
inline MD_B32 md_os_commit (void* ptr, MD_U64 size) { MD_B32 result = (VirtualAlloc(ptr, size, MEM_COMMIT, PAGE_READWRITE) != 0); return result; }
inline void md_os_decommit(void* ptr, MD_U64 size) { VirtualFree (ptr, size, MEM_DECOMMIT); }
inline void
md_os_release(void* ptr, MD_U64 size) {