kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-06 15:29:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

make mi_options static, rename out_buf for the debug extension

Browse source
This commit is contained in:
Daan 2025-03-28 13:49:14 -07:00
parent 11cfb42fa0
commit 9228b4814a
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mimalloc/internal.h
View file

@ -339,10 +339,6 @@ typedef struct mi_option_desc_s {
const char* legacy_name; // potential legacy option name const char* legacy_name; // potential legacy option name
} mi_option_desc_t; } mi_option_desc_t;
// the static options
extern mi_decl_hidden mi_option_desc_t mi_options[_mi_option_last];
/* ----------------------------------------------------------- /* -----------------------------------------------------------
Inlined definitions Inlined definitions
----------------------------------------------------------- */ ----------------------------------------------------------- */

15
src/options.c
View file

@ -98,8 +98,8 @@ int mi_version(void) mi_attr_noexcept {
#endif #endif
#endif #endif
// Static options (only exposed for the debugger) // Static options
mi_option_desc_t mi_options[_mi_option_last] = static mi_option_desc_t mi_options[_mi_option_last] =
{ {
// stable options // stable options
#if MI_DEBUG || defined(MI_SHOW_ERRORS) #if MI_DEBUG || defined(MI_SHOW_ERRORS)
@ -329,7 +329,7 @@ static void mi_cdecl mi_out_stderr(const char* msg, void* arg) {
#ifndef MI_MAX_DELAY_OUTPUT #ifndef MI_MAX_DELAY_OUTPUT
#define MI_MAX_DELAY_OUTPUT ((size_t)(16*1024)) #define MI_MAX_DELAY_OUTPUT ((size_t)(16*1024))
#endif #endif
static char out_buf[MI_MAX_DELAY_OUTPUT+1]; static char mi_output_buffer[MI_MAX_DELAY_OUTPUT+1];
static _Atomic(size_t) out_len; static _Atomic(size_t) out_len;
static void mi_cdecl mi_out_buf(const char* msg, void* arg) { static void mi_cdecl mi_out_buf(const char* msg, void* arg) {
@ -345,7 +345,8 @@ static void mi_cdecl mi_out_buf(const char* msg, void* arg) {
if (start+n >= MI_MAX_DELAY_OUTPUT) { if (start+n >= MI_MAX_DELAY_OUTPUT) {
n = MI_MAX_DELAY_OUTPUT-start-1; n = MI_MAX_DELAY_OUTPUT-start-1;
} }
_mi_memcpy(&out_buf[start], msg, n); mi_assert_internal(start + n <= MI_MAX_DELAY_OUTPUT);
_mi_memcpy(&mi_output_buffer[start], msg, n);
} }
static void mi_out_buf_flush(mi_output_fun* out, bool no_more_buf, void* arg) { static void mi_out_buf_flush(mi_output_fun* out, bool no_more_buf, void* arg) {
@ -354,10 +355,10 @@ static void mi_out_buf_flush(mi_output_fun* out, bool no_more_buf, void* arg) {
size_t count = mi_atomic_add_acq_rel(&out_len, (no_more_buf ? MI_MAX_DELAY_OUTPUT : 1)); size_t count = mi_atomic_add_acq_rel(&out_len, (no_more_buf ? MI_MAX_DELAY_OUTPUT : 1));
// and output the current contents // and output the current contents
if (count>MI_MAX_DELAY_OUTPUT) count = MI_MAX_DELAY_OUTPUT; if (count>MI_MAX_DELAY_OUTPUT) count = MI_MAX_DELAY_OUTPUT;
out_buf[count] = 0; mi_output_buffer[count] = 0;
out(out_buf,arg); out(mi_output_buffer,arg);
if (!no_more_buf) { if (!no_more_buf) {
out_buf[count] = '\n'; // if continue with the buffer, insert a newline mi_output_buffer[count] = '\n'; // if continue with the buffer, insert a newline
} }
} }