From 54df818f2706940982cad665dfb0ccd272314454 Mon Sep 17 00:00:00 2001
From: snek <snek@deno.com>
Date: Wed, 18 Dec 2024 11:08:31 +0100
Subject: [PATCH] chore: upgrade libc

---
 Cargo.lock              | 4 ++--
 Cargo.toml              | 2 +-
 ext/node/ops/os/cpus.rs | 9 +++++++--
 runtime/ops/os/mod.rs   | 5 ++++-
 runtime/sys_info.rs     | 6 +++++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6cfb3779e4de79..d5a2aca2fb18ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4552,9 +4552,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libffi"
diff --git a/Cargo.toml b/Cargo.toml
index 0f52c28de6982e..1104f5e3bb0141 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -149,7 +149,7 @@ indexmap = { version = "2", features = ["serde"] }
 ipnet = "2.3"
 jsonc-parser = { version = "=0.26.2", features = ["serde"] }
 lazy-regex = "3"
-libc = "0.2.126"
+libc = "0.2.168"
 libz-sys = { version = "1.1.20", default-features = false }
 log = { version = "0.4.20", features = ["kv"] }
 lsp-types = "=0.97.0" # used by tower-lsp and "proposed" feature is unstable in patch releases
diff --git a/ext/node/ops/os/cpus.rs b/ext/node/ops/os/cpus.rs
index 3f5f430f65f792..2b931884c36a74 100644
--- a/ext/node/ops/os/cpus.rs
+++ b/ext/node/ops/os/cpus.rs
@@ -73,12 +73,17 @@ pub fn cpu_info() -> Option<Vec<CpuInfo>> {
       cpu_speed = 2_400_000_000;
     }
 
+    extern "C" {
+      fn mach_host_self() -> std::ffi::c_uint;
+      static mut mach_task_self_: std::ffi::c_uint;
+    }
+
     let mut num_cpus: libc::natural_t = 0;
     let mut info: *mut libc::processor_cpu_load_info_data_t =
       std::ptr::null_mut();
     let mut msg_type: libc::mach_msg_type_number_t = 0;
     if libc::host_processor_info(
-      libc::mach_host_self(),
+      mach_host_self(),
       libc::PROCESSOR_CPU_LOAD_INFO,
       &mut num_cpus,
       &mut info as *mut _ as *mut libc::processor_info_array_t,
@@ -111,7 +116,7 @@ pub fn cpu_info() -> Option<Vec<CpuInfo>> {
     }
 
     libc::vm_deallocate(
-      libc::mach_task_self(),
+      mach_task_self_,
       info.as_ptr() as libc::vm_address_t,
       msg_type as _,
     );
diff --git a/runtime/ops/os/mod.rs b/runtime/ops/os/mod.rs
index b8ebc88bedca2e..71169217a7ed47 100644
--- a/runtime/ops/os/mod.rs
+++ b/runtime/ops/os/mod.rs
@@ -424,8 +424,11 @@ fn rss() -> usize {
   let mut count = libc::MACH_TASK_BASIC_INFO_COUNT;
   // SAFETY: libc calls
   let r = unsafe {
+    extern "C" {
+      static mut mach_task_self_: std::ffi::c_uint;
+    }
     libc::task_info(
-      libc::mach_task_self(),
+      mach_task_self_,
       libc::MACH_TASK_BASIC_INFO,
       task_info.as_mut_ptr() as libc::task_info_t,
       &mut count as *mut libc::mach_msg_type_number_t,
diff --git a/runtime/sys_info.rs b/runtime/sys_info.rs
index cffc90e9da5280..f99cfc99f96b03 100644
--- a/runtime/sys_info.rs
+++ b/runtime/sys_info.rs
@@ -278,11 +278,15 @@ pub fn mem_info() -> Option<MemInfo> {
       mem_info.swap_total = xs.xsu_total;
       mem_info.swap_free = xs.xsu_avail;
 
+      extern "C" {
+        fn mach_host_self() -> std::ffi::c_uint;
+      }
+
       let mut count: u32 = libc::HOST_VM_INFO64_COUNT as _;
       let mut stat = std::mem::zeroed::<libc::vm_statistics64>();
       if libc::host_statistics64(
         // TODO(@littledivy): Put this in a once_cell.
-        libc::mach_host_self(),
+        mach_host_self(),
         libc::HOST_VM_INFO64,
         &mut stat as *mut libc::vm_statistics64 as *mut _,
         &mut count,