Fixes getPhysicalMemory() on Mac machines (broken in previous fix).

schuemie · schuemie · commit d7ef2ac12e6b · 2025-04-10T13:29:28.000+02:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: ParallelLogger
 Type: Package
 Title: Support for Parallel Computation, Logging, and Function Automation
-Version: 3.4.1
-Date: 2025-03-28
+Version: 3.4.2
+Date: 2025-04-10
 Authors@R: c(
   person("Martijn", "Schuemie", email = "schuemie@ohdsi.org", role = c("aut", "cre")),
   person("Marc", "Suchard", role = c("aut")),
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+ParallelLogger 3.4.2
+====================
+
+Bugfixes
+
+1. Fixes `getPhysicalMemory()` on Mac machines (broken in previous fix).
+
+
 ParallelLogger 3.4.1
 ====================
 
diff --git a/R/Cluster.R b/R/Cluster.R
@@ -339,7 +339,7 @@ getPhysicalMemory <- function() {
     }
   } else if (os == "Linux" || os == "Darwin") {
     memory <- tryCatch(
-      as.numeric(system("/usr/sbin/sysctl -n hw.memsize", intern = TRUE))/1e+09, 
+      as.numeric(system("/usr/sbin/sysctl -n hw.memsize", intern = TRUE))/1e+09, # Convert to GB
       error = function(e) {
         return(NA)
       },
@@ -348,7 +348,7 @@ getPhysicalMemory <- function() {
       }
     )
     if (!is.na(memory)) {
-      return(memory / (1e9)) # Convert to GB
+      return(memory) 
     } else {
       memory <- tryCatch({
         output <- system("grep MemTotal /proc/meminfo", intern = TRUE)

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ getPhysicalMemory <- function() {`
`339`	`339`	`}`
`340`	`340`	`} else if (os == "Linux" \|\| os == "Darwin") {`
`341`	`341`	`memory <- tryCatch(`
`342`		`- as.numeric(system("/usr/sbin/sysctl -n hw.memsize", intern = TRUE))/1e+09,`
	`342`	`+ as.numeric(system("/usr/sbin/sysctl -n hw.memsize", intern = TRUE))/1e+09, # Convert to GB`
`343`	`343`	`error = function(e) {`
`344`	`344`	`return(NA)`
`345`	`345`	`},`
`@@ -348,7 +348,7 @@ getPhysicalMemory <- function() {`
`348`	`348`	`}`
`349`	`349`	`)`
`350`	`350`	`if (!is.na(memory)) {`
`351`		`- return(memory / (1e9)) # Convert to GB`
	`351`	`+ return(memory)`
`352`	`352`	`} else {`
`353`	`353`	`memory <- tryCatch({`
`354`	`354`	`output <- system("grep MemTotal /proc/meminfo", intern = TRUE)`