Skip to content

Commit

Permalink
Revert "runtime: cleanup free_memory comptime conditional (#18968)"
Browse files Browse the repository at this point in the history
This reverts commit 571469a.
  • Loading branch information
spytheman committed Jul 26, 2023
1 parent 571469a commit e03c032
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
19 changes: 11 additions & 8 deletions vlib/runtime/free_memory_impl_darwin.c.v
Expand Up @@ -19,13 +19,16 @@ fn C.host_page_size(host C.host_t, out_page_size &C.vm_size_t) int
fn C.host_statistics64(host C.host_t, flavor int, host_info_out &int, host_info_outCnt &u32) int

fn free_memory_impl() usize {
mut hs := C.vm_statistics64_data_t{}
mut vmsz := u32(C.HOST_VM_INFO64_COUNT)
mut hps := u32(0)
mut host := C.mach_host_self()
unsafe {
C.host_statistics64(host, C.HOST_VM_INFO64, &int(&hs), &vmsz)
C.host_page_size(host, &C.vm_size_t(&hps))
$if macos {
mut hs := C.vm_statistics64_data_t{}
mut vmsz := u32(C.HOST_VM_INFO64_COUNT)
mut hps := u32(0)
mut host := C.mach_host_self()
unsafe {
C.host_statistics64(host, C.HOST_VM_INFO64, &int(&hs), &vmsz)
C.host_page_size(host, &C.vm_size_t(&hps))
}
return usize(u64(hs.free_count) * u64(hps))
}
return usize(u64(hs.free_count) * u64(hps))
return 1
}
9 changes: 6 additions & 3 deletions vlib/runtime/free_memory_impl_linux.c.v
@@ -1,7 +1,10 @@
module runtime

fn free_memory_impl() usize {
page_size := usize(C.sysconf(C._SC_PAGESIZE))
av_phys_pages := usize(C.sysconf(C._SC_AVPHYS_PAGES))
return page_size * av_phys_pages
$if linux {
page_size := usize(C.sysconf(C._SC_PAGESIZE))
av_phys_pages := usize(C.sysconf(C._SC_AVPHYS_PAGES))
return page_size * av_phys_pages
}
return 1
}

0 comments on commit e03c032

Please sign in to comment.