process-attributes-ps-args / process-attributes-ps-format for Darwin

process-attributes-ps-args / process-attributes-ps-format for Darwin

[Filipp Gunbin]

Hello Michael,

Here's the patch for Darwin.

Also I've added a piece of code to automatically set profile for local
sudo case, so the users on macOS don't see the empty list in Proced by
default.

Strangely, ps on macOS doesn't have keyword to output group name, so
I've omitted it.

Thanks,
Filipp

diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el
index 81990c6a33..901826bfc1 100644
--- a/lisp/net/tramp-integration.el
+++ b/lisp/net/tramp-integration.el
@@ -430,6 +430,100 @@ tramp-connection-local-busybox-ps-variables
  'tramp-connection-local-busybox-ps-profile
  tramp-connection-local-busybox-ps-variables)
 
+\f
+;; Darwin (macOS)
+(defconst tramp-darwin-process-attributes-ps-args
+  `("-acxww"
+    "-o"
+    ,(mapconcat
+      #'identity
+      '("pid"
+        "uid"
+        "user"
+        "gid"
+        "comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+      ",")
+    "-o" "state=abcde"
+    "-o"
+    ,(mapconcat
+      #'identity
+      '("ppid"
+        "pgid"
+        "sess"
+        "tty"
+        "tpgid"
+        "minflt"
+        "majflt"
+        "time"
+        "pri"
+        "nice"
+        "vsz"
+        "rss"
+        "etime"
+        "pcpu"
+        "pmem"
+        "args")
+      ","))
+  "List of arguments for \"ps\".
+See `tramp-process-attributes-ps-args'.")
+
+(defconst tramp-darwin-process-attributes-ps-format
+  '((pid . number)
+    (euid . number)
+    (user . string)
+    (egid . number)
+    (comm . 52)
+    (state . 5)
+    (ppid . number)
+    (pgrp . number)
+    (sess . number)
+    (ttname . string)
+    (tpgid . number)
+    (minflt . number)
+    (majflt . number)
+    (time . tramp-ps-time)
+    (pri . number)
+    (nice . number)
+    (vsize . number)
+    (rss . number)
+    (etime . tramp-ps-time)
+    (pcpu . number)
+    (pmem . number)
+    (args . nil))
+  "Alist of formats for \"ps\".
+See `tramp-process-attributes-ps-format'.")
+
+(defconst tramp-connection-local-darwin-ps-variables
+  `((tramp-process-attributes-ps-args
+     . ,tramp-darwin-process-attributes-ps-args)
+    (tramp-process-attributes-ps-format
+     . ,tramp-darwin-process-attributes-ps-format))
+  "Default connection-local ps variables for remote Darwin
+connections.")
+
+(connection-local-set-profile-variables
+ 'tramp-connection-local-darwin-ps-profile
+ tramp-connection-local-darwin-ps-variables)
+
+
+\f
+;; Preset default "ps" profile for the case of local sudo, based on
+;; system type.
+
+(let ((local-sudo-profile
+       (cond ((eq system-type 'darwin)
+              'tramp-connection-local-darwin-ps-profile)
+             ;; ...add other system types here
+             )))
+  (when local-sudo-profile
+    (connection-local-set-profiles
+     `(:application tramp :protocol "sudo" :user "root" :machine ,(system-name))
+     local-sudo-profile)
+    (connection-local-set-profiles
+     '(:application tramp :protocol "sudo" :user "root" :machine "localhost")
+     local-sudo-profile)))
+
+
 (add-hook 'tramp-unload-hook
 	  (lambda () (unload-feature 'tramp-integration 'force)))
 

Re: process-attributes-ps-args / process-attributes-ps-format for Darwin

[Michael Albinus]

Filipp Gunbin <fgunbin@fastmail.fm> writes:

> Hello Michael,

Hi Filipp,

> Here's the patch for Darwin.

Thanks for this, I've applied it in your name.

> Also I've added a piece of code to automatically set profile for local
> sudo case, so the users on macOS don't see the empty list in Proced by
> default.

Yep. I've adapted it a little bit; there's no need to discriminate for
"sudo" profile and "root" user. The ps command shall behave similar for
everybody on a macOS machine.

> Strangely, ps on macOS doesn't have keyword to output group name, so
> I've omitted it.

Some attributes are also missing for other systems. I believe, the most
important attributes we need are `pid', `comm', and `state'.

> Thanks,
> Filipp

Best regards, Michael.

Re: process-attributes-ps-args / process-attributes-ps-format for Darwin

[Filipp Gunbin]

On 12/04/2022 09:46 +0200, Michael Albinus wrote:

> Filipp Gunbin <fgunbin@fastmail.fm> writes:
>
>> Hello Michael,
>
> Hi Filipp,
>
>> Here's the patch for Darwin.
>
> Thanks for this, I've applied it in your name.
>
>> Also I've added a piece of code to automatically set profile for local
>> sudo case, so the users on macOS don't see the empty list in Proced by
>> default.
>
> Yep. I've adapted it a little bit; there's no need to discriminate for
> "sudo" profile and "root" user. The ps command shall behave similar for
> everybody on a macOS machine.
>
>> Strangely, ps on macOS doesn't have keyword to output group name, so
>> I've omitted it.
>
> Some attributes are also missing for other systems. I believe, the most
> important attributes we need are `pid', `comm', and `state'.
>
>> Thanks,
>> Filipp
>
> Best regards, Michael.

Great, thank you!