X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=home%2Flib%2Flogin_functions.sh;h=b6dd8a6dc34732cc6a1a5dc5bc8fc827a084e130;hb=921bf326e2d6ba8c67e6ba13e30957a8c4224ffe;hp=490d739e6b55e8ac6d5a796dae48d2600aff12f5;hpb=1690f00e271d294e9f96f91bdcffcf17a5f190d1;p=khome.git

diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index 490d739..b6dd8a6 100644
--- a/home/lib/login_functions.sh
+++ b/home/lib/login_functions.sh
@@ -28,8 +28,27 @@ notify_done() {
 
 ## p : string -> unit
 p() {
+    local -r usage='Usage: p [FILE] NAME'
+    local name
+    local file
+
+    case "$#" in
+        0)
+            echo "$usage" >&2
+            return 1;;
+        1)
+            file=~/._p/p
+            name="$1";;
+        2)
+            file="$1"
+            name="$2";;
+        *)
+            echo "$usage" >&2
+            return 1;;
+    esac
+
     awk \
-        -v _s="$1" \
+        -v _s="$name" \
         '
             BEGIN {_s = tolower(_s)}
 
@@ -73,7 +92,7 @@ p() {
                 }
             }
         ' \
-        ~/._p/p \
+        "$file" \
         | xsel -i -b -t 30000
 }
 
@@ -655,11 +674,46 @@ status() {
 
     echo 'accounting'
 
-    printf '%stmux\n%ssessions %d, clients %d\n' \
-        "$indent_unit" \
-        "${indent_unit}${indent_unit}" \
-        "$(tmux list-sessions 2> /dev/null | wc -l)" \
-        "$(tmux list-clients  2> /dev/null | wc -l)"
+    printf '%stmux (s->c)\n' "$indent_unit"
+    ps -eo comm,cmd \
+    | awk '
+        # Expecting lines like:
+        #     "tmux: server    tmux -L pistactl new-session -d -s pistactl"
+        #     "tmux: client    tmux -L foo"
+        #     "tmux: client    tmux -Lbar"
+        /^tmux:/ {
+            # XXX This of course assumes pervasive usage of -L
+            # TODO Handle -S
+            role=$2
+            split($0, sides_of_L, "-L")
+            split(sides_of_L[2], words_right_of_L, FS)
+            sock=words_right_of_L[1]
+            if (!sock) {
+                sock = "anon"
+            } else {
+                sock = "named." sock
+            }
+            roles[role]++
+            socks[sock]++
+            count[role, sock]++
+        }
+
+        END {
+            sock_sep = ""
+            for (sock in socks) {
+                printf "%s%s ", sock_sep, sock
+                sock_sep = "\n"
+                role_sep = ""
+                for (role in roles) {
+                    printf "%s%d", role_sep, count[role, sock]
+                    role_sep = "->"
+                }
+            }
+            printf "\n"
+        }' \
+    | sort \
+    | column -t \
+    | indent "${indent_unit}${indent_unit}"
 
     echo