Add maxrss to ps_memory_full_info() on macOS

NEWS.md

@@ -1,5 +1,8 @@
 # ps (development version)
 
+* `ps_memory_full_info()` now contains `maxrss`, the maximum resident set
+  size for the calling process.
+
 # ps 1.8.1
 
 * ps can now be installed again on unsupported platforms.

R/low-level.R

@@ -574,6 +574,8 @@
 #' might not have access to some processes that `ps_memory_info()` can
 #' query:
 #'
+#' * `maxrss` maximum resident set size over the process's lifetime. This
+#'   only works for the calling process, otherwise it is `NA_real_`.
 #' * `uss`: Unique Set Size, this is the memory which is unique to a
 #'   process and which would be freed if the process was terminated right
 #'   now.
@@ -608,6 +610,13 @@
 
 ps_memory_full_info <- function(p = ps_handle()) {
   assert_ps_handle(p)
+  info <- ps_memory_info(p)
+  info[["maxrss"]] <- if (Sys.getpid() == ps_pid(p)) {
+    .Call(psll_memory_maxrss, p)
+  } else {
+    NA_real_
+  }
+
   type <- ps_os_type()
   if (type[["LINUX"]]) {
     match <- function(re) {
@@ -620,23 +629,18 @@
       sum(as.integer(st), na.rm = TRUE) * 1024
     }
 
-    info <- ps_memory_info(p)
     smaps <- .Call(ps__memory_maps, p)
     info[["uss"]] <- match("\nPrivate.*:\\s+(\\d+)")
     info[["pss"]] <- match("\nPss:\\s+(\\d+)")
     info[["swap"]] <- match("\nSwap:\\s+(\\d+)")
-    info
 
   } else if (type[["MACOS"]]) {
-    info <- ps_memory_info(p)
     info[["uss"]] <- .Call(psll_memory_uss, p)
-    info
 
-  } else if (type[["WINDOWS"]]) {
-    info <- ps_memory_info(p)
+    } else if (type[["WINDOWS"]]) {
     info[["uss"]] <- .Call(psll_memory_uss, p)
-    info
   }
+  info
 }
 
 process_signal_result <- function(p, res, err_msg) {

src/api-posix.c

@@ -478,3 +478,13 @@
   UNPROTECT(1);
   return res;
 }
+
+SEXP psll_memory_maxrss(SEXP p) {
+  struct rusage rusage;
+  getrusage(RUSAGE_SELF, &rusage);
+#if defined(__APPLE__)
+  return Rf_ScalarReal(rusage.ru_maxrss);
+#else
+  return Rf_ScalarReal(rusage.ru_maxrss * 1024.0);
+#endif
+}

src/api-windows.c

@@ -1029,6 +1029,12 @@ SEXP psll_memory_uss(SEXP p) {
   return Rf_ScalarInteger(wsCounters.NumberOfPrivatePages * sysinfo.dwPageSize);
 }
 
+SEXP psll_memory_maxrss(SEXP p) {
+  PROCESS_MEMORY_COUNTERS info;
+  GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
+  return Rf_ScalarReal(info.PeakWorkingSetSize);
+}
+
 SEXP ps__users() {
   HANDLE hServer = WTS_CURRENT_SERVER_HANDLE;
   WCHAR *buffer_user = NULL;

src/dummy.c

@@ -120,6 +120,7 @@ SEXP psll_connections(SEXP x) { return ps__dummy("ps_connections"); }
 SEXP psll_get_nice(SEXP x) { return ps__dummy("ps_get_nice"); }
 SEXP psll_set_nice(SEXP x, SEXP y) { return ps__dummy("ps_set_nice"); }
 SEXP psll_memory_uss(SEXP p) { return ps__dummy("psll_memory_uss"); }
+SEXP psll_memory_maxrss(SEXP p) { return ps__dummy("psll_memory_maxrss"); }
 SEXP psll_get_cpu_aff(SEXP p) { return ps__dummy("psll_get_cpu_aff"); }
 SEXP psll_set_cpu_aff(SEXP p) { return ps__dummy("psll_set_cpu_aff"); }
 SEXP psll_wait(SEXP pps, SEXP timeout) { return ps__dummy("psll_wait"); }

src/init.c

@@ -60,6 +60,7 @@ static const R_CallMethodDef callMethods[]  = {
   { "psll_cpu_times",    (DL_FUNC) psll_cpu_times,    1 },
   { "psll_memory_info",  (DL_FUNC) psll_memory_info , 1 },
   { "psll_memory_uss",   (DL_FUNC) psll_memory_uss,   1 },
+  { "psll_memory_maxrss",(DL_FUNC) psll_memory_maxrss,1 },
   { "psll_send_signal",  (DL_FUNC) psll_send_signal , 2 },
   { "psll_suspend",      (DL_FUNC) psll_suspend,      1 },
   { "psll_resume",       (DL_FUNC) psll_resume,       1 },

src/ps.h

@@ -32,6 +32,7 @@ SEXP psll_num_threads(SEXP p);
 SEXP psll_cpu_times(SEXP p);
 SEXP psll_memory_info(SEXP p);
 SEXP psll_memory_uss(SEXP p);
+SEXP psll_memory_maxrss(SEXP p);
 SEXP psll_send_signal(SEXP p, SEXP sig);
 SEXP psll_suspend(SEXP p);
 SEXP psll_resume(SEXP p);