Loading...
--- libmalloc/libmalloc-409.81.2/src/internal.h
+++ libmalloc/libmalloc-283/src/internal.h
@@ -24,10 +24,11 @@
#ifndef __INTERNAL_H
#define __INTERNAL_H
+#define __OS_EXPOSE_INTERNALS__ 1
+
// Toggles for fixes for specific Radars. If we get enough of these, we
// probably should create a separate header file for them.
#define RDAR_48993662 1
-#define OS_ATOMIC_CONFIG_MEMORY_ORDER_DEPENDENCY 1
#include <Availability.h>
#include <TargetConditionals.h>
@@ -35,13 +36,11 @@
#include <platform/string.h>
#undef memcpy
#define memcpy _platform_memmove
-#define _malloc_memcmp_zero_aligned8 _platform_memcmp_zero_aligned8
#include <platform/compat.h>
#include <assert.h>
#include <crt_externs.h>
#include <dirent.h>
#include <errno.h>
-#include <execinfo.h>
#include <fcntl.h>
#include <libc.h>
#include <libkern/OSAtomic.h>
@@ -57,27 +56,13 @@
#include <mach/vm_map.h>
#include <mach/vm_page_size.h>
#include <mach/vm_param.h>
-#include <mach/vm_reclaim.h>
#include <mach/vm_statistics.h>
-#include <machine/cpu_capabilities.h>
-#include <os/atomic_private.h>
-#include <os/crashlog_private.h>
+#include <os/internal/internal_shared.h>
#include <os/lock_private.h>
#include <os/once_private.h>
#include <os/overflow.h>
-#if !TARGET_OS_DRIVERKIT
-# include <os/feature_private.h>
-#endif
#include <os/tsd.h>
#include <paths.h>
-#include <pthread/pthread.h> // _pthread_threadid_self_np_direct()
-#include <pthread/private.h> // _pthread_threadid_self_np_direct()
-#include <pthread/tsd_private.h> // TSD keys
-
-#if __has_feature(ptrauth_calls)
-#include <ptrauth.h>
-#endif
-
#include <signal.h>
#include <stdarg.h>
#include <stdbool.h>
@@ -97,13 +82,6 @@
#include <unistd.h>
#include <xlocale.h>
-// pthread reserves 5 TSD keys for libmalloc
-#define __TSD_MALLOC_PROB_GUARD_SAMPLE_COUNTER __PTK_LIBMALLOC_KEY0
-#define __TSD_MALLOC_ZERO_CORRUPTION_COUNTER __PTK_LIBMALLOC_KEY1
-#define __TSD_MALLOC_THREAD_OPTIONS __PTK_LIBMALLOC_KEY2
-#define __TSD_MALLOC_UNUSED3 __PTK_LIBMALLOC_KEY3
-#define __TSD_MALLOC_UNUSED4 __PTK_LIBMALLOC_KEY4
-
#include "dtrace.h"
#include "base.h"
#include "trace.h"
@@ -118,9 +96,8 @@
#include "magazine_malloc.h"
#include "malloc_common.h"
#include "nano_malloc_common.h"
+#include "nano_malloc.h"
#include "nanov2_malloc.h"
-#include "pgm_malloc.h"
-#include "quarantine_malloc.h"
#include "purgeable_malloc.h"
#include "malloc_private.h"
#include "thresholds.h"
@@ -132,23 +109,13 @@
#include "nanov2_zone.h"
#include "magazine_inline.h"
#include "stack_logging.h"
-#include "stack_trace.h"
#include "malloc_implementation.h"
MALLOC_NOEXPORT
-extern bool malloc_tracing_enabled;
+extern boolean_t malloc_tracing_enabled;
MALLOC_NOEXPORT
extern unsigned malloc_debug_flags;
-
-MALLOC_NOEXPORT
-extern bool malloc_space_efficient_enabled;
-
-MALLOC_NOEXPORT
-extern bool malloc_medium_space_efficient_enabled;
-
-MALLOC_NOEXPORT
-extern bool malloc_quarantine_enabled;
MALLOC_NOEXPORT MALLOC_NOINLINE
void
@@ -157,25 +124,6 @@
MALLOC_NOEXPORT MALLOC_NOINLINE MALLOC_USED
int
malloc_gdb_po_unsafe(void);
-
-MALLOC_NOEXPORT __attribute__((always_inline, const))
-static inline bool
-malloc_traced(void)
-{
- return malloc_tracing_enabled;
-}
-
-static inline uint32_t
-_malloc_cpu_number(void)
-{
-#if TARGET_OS_SIMULATOR
- size_t n;
- pthread_cpu_number_np(&n);
- return (uint32_t)n;
-#else
- return _os_cpu_number();
-#endif
-}
/*
* Copies the malloc library's _malloc_msl_lite_hooks_t structure to a given
@@ -188,4 +136,5 @@
typedef void (*set_msl_lite_hooks_callout_t) (struct _malloc_msl_lite_hooks_s *hooksp, size_t size);
void set_msl_lite_hooks(set_msl_lite_hooks_callout_t callout);
+
#endif // __INTERNAL_H