Switching to memuse to get physical memory

Author: schuemie

DESCRIPTION

@@ -2,7 +2,7 @@ Package: ParallelLogger
 Type: Package
 Title: Support for Parallel Computation, Logging, and Function Automation
 Version: 3.4.2
-Date: 2025-04-10
+Date: 2025-05-20
 Authors@R: c(
   person("Martijn", "Schuemie", email = "schuemie@ohdsi.org", role = c("aut", "cre")),
   person("Marc", "Suchard", role = c("aut")),
@@ -22,7 +22,8 @@ Imports:
   jsonlite,
   methods,
   utils,
-  rstudioapi
+  rstudioapi,
+  memuse
 Suggests:
   sendmailR,
   testthat,

NEWS.md

@@ -3,7 +3,7 @@ ParallelLogger 3.4.2
 
 Bugfixes
 
-1. Fixes `getPhysicalMemory()` on Mac machines (broken in previous fix).
+1. The `getPhysicalMemory()` package now uses the `memuse` package, for simplicity and better reliability.
 
 
 ParallelLogger 3.4.1

R/Cluster.R

@@ -313,55 +313,14 @@ formatError <- function(threadNumber, error, args) {
 #' Get the total amount of physical memory
 #'
 #' @returns
-#' The number of GB of RAM. Returns NA if the function failed. One GB is 
-#' 1,000,000,000 bytes.
+#' The number of GB of RAM. One GB is 1,000,000,000 bytes.
 #' 
 #' @examples
 #' getPhysicalMemory()
 #' 
 #' @export
 getPhysicalMemory <- function() {
-  os <- Sys.info()[['sysname']]
-  if (os == "Windows") {
-    output <- tryCatch(
-      system("wmic ComputerSystem get TotalPhysicalMemory /value", intern = TRUE),
-      error = function(e) {
-        return("")
-      }
-    )
-    idx <- grep("TotalPhysicalMemory=", output, value = TRUE)
-    if (length(idx) > 0) {
-      memoryString <- gsub("TotalPhysicalMemory=", "", idx[1])
-      memory <- as.numeric(memoryString)
-      return(memory / (1e9)) # Convert to GB
-    } else {
-      return(NA)
-    }
-  } else if (os == "Linux" || os == "Darwin") {
-    memory <- tryCatch(
-      as.numeric(system("/usr/sbin/sysctl -n hw.memsize", intern = TRUE))/1e+09, # Convert to GB
-      error = function(e) {
-        return(NA)
-      },
-      warning = function(e) {
-        return(NA)
-      }
-    )
-    if (!is.na(memory)) {
-      return(memory) 
-    } else {
-      memory <- tryCatch({
-        output <- system("grep MemTotal /proc/meminfo", intern = TRUE)
-        output <- gsub("kB", "", gsub("MemTotal:", "", output), ignore.case = TRUE)
-        as.numeric(output) / 1e6 # Convert to GB
-      },
-      error = function(e) {
-        return(NA)
-      })
-      return(memory)
-    }
-  } else {
-    warning("Operating system not supported.")
-    return(NA)
-  }
+  memory <- memuse::Sys.meminfo()$totalram
+  memory <- memuse::swap.unit(x, "GB")
+  return(memory@size)
 }

tests/testthat/test-cluster.R

@@ -78,10 +78,5 @@ test_that("Test getThreadNumber", {
 
 
 test_that("Test getPhysicalMemory", {
-  # Very dirty, but skip_on_cran() doesn't work on CRAN's M1mac machine
-  # (see https://github.com/r-lib/testthat/issues/2074)
-  if (Sys.getenv("CDM5_POSTGRESQL_CDM_SCHEMA", unset = "") == "") {
-    skip("Not an OHDSI machine, so skipped test for getPhysicalMemory()")
-  }
   expect_false(is.na(getPhysicalMemory()))
 })