Loading...
--- libmalloc/libmalloc-317.121.1/src/internal.h
+++ libmalloc/libmalloc-283.100.6/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>
@@ -56,20 +57,12 @@
 #include <mach/vm_page_size.h>
 #include <mach/vm_param.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
 #include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -105,7 +98,6 @@
 #include "nano_malloc_common.h"
 #include "nano_malloc.h"
 #include "nanov2_malloc.h"
-#include "pguard_malloc.h"
 #include "purgeable_malloc.h"
 #include "malloc_private.h"
 #include "thresholds.h"
@@ -120,16 +112,10 @@
 #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 MALLOC_NOINLINE
 void
@@ -138,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
@@ -170,12 +137,4 @@
 void set_msl_lite_hooks(set_msl_lite_hooks_callout_t callout);
 
 
-// pthread reserves 5 TSD keys for libmalloc
-#define __TSD_MALLOC_PGUARD_SAMPLE_COUNTER __PTK_LIBMALLOC_KEY0
-#define __TSD_MALLOC_UNUSED1               __PTK_LIBMALLOC_KEY1
-#define __TSD_MALLOC_UNUSED2               __PTK_LIBMALLOC_KEY2
-#define __TSD_MALLOC_UNUSED3               __PTK_LIBMALLOC_KEY3
-#define __TSD_MALLOC_UNUSED4               __PTK_LIBMALLOC_KEY4
-
-
 #endif // __INTERNAL_H