From b6f65c93c462856f26201df0cbfe804b29a65169 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Tue, 12 Nov 2019 15:05:21 -0800 Subject: [PATCH] ps doc update --- README.md | 26 +++++++++++++------------- docs/parsers/ps.md | 43 +++++++++++++++---------------------------- jc/parsers/ps.py | 43 +++++++++++++++---------------------------- 3 files changed, 43 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index e36c84ea..6a5abba2 100755 --- a/README.md +++ b/README.md @@ -938,23 +938,23 @@ $ ps axu | jc --ps -p { "user": "root", "pid": 1, - "cpu_percent": "0.0", - "mem_percent": "0.1", - "vsz": "128072", - "rss": "6676", + "cpu_percent": 0.0, + "mem_percent": 0.1, + "vsz": 128072, + "rss": 6784, "tty": null, "stat": "Ss", "start": "Nov09", - "time": "0:06", + "time": "0:08", "command": "/usr/lib/systemd/systemd --switched-root --system --deserialize 22" }, { "user": "root", "pid": 2, - "cpu_percent": "0.0", - "mem_percent": "0.0", - "vsz": "0", - "rss": "0", + "cpu_percent": 0.0, + "mem_percent": 0.0, + "vsz": 0, + "rss": 0, "tty": null, "stat": "S", "start": "Nov09", @@ -964,10 +964,10 @@ $ ps axu | jc --ps -p { "user": "root", "pid": 4, - "cpu_percent": "0.0", - "mem_percent": "0.0", - "vsz": "0", - "rss": "0", + "cpu_percent": 0.0, + "mem_percent": 0.0, + "vsz": 0, + "rss": 0, "tty": null, "stat": "S<", "start": "Nov09", diff --git a/docs/parsers/ps.md b/docs/parsers/ps.md index 1e7daea4..4a39e574 100644 --- a/docs/parsers/ps.md +++ b/docs/parsers/ps.md @@ -85,23 +85,23 @@ Examples: { "user": "root", "pid": 1, - "cpu_percent": "0.0", - "mem_percent": "0.1", - "vsz": "128072", - "rss": "6676", + "cpu_percent": 0.0, + "mem_percent": 0.1, + "vsz": 128072, + "rss": 6784, "tty": null, "stat": "Ss", "start": "Nov09", - "time": "0:06", + "time": "0:08", "command": "/usr/lib/systemd/systemd --switched-root --system --deserialize 22" }, { "user": "root", "pid": 2, - "cpu_percent": "0.0", - "mem_percent": "0.0", - "vsz": "0", - "rss": "0", + "cpu_percent": 0.0, + "mem_percent": 0.0, + "vsz": 0, + "rss": 0, "tty": null, "stat": "S", "start": "Nov09", @@ -111,10 +111,10 @@ Examples: { "user": "root", "pid": 4, - "cpu_percent": "0.0", - "mem_percent": "0.0", - "vsz": "0", - "rss": "0", + "cpu_percent": 0.0, + "mem_percent": 0.0, + "vsz": 0, + "rss": 0, "tty": null, "stat": "S<", "start": "Nov09", @@ -132,11 +132,11 @@ Examples: "cpu_percent": "0.0", "mem_percent": "0.1", "vsz": "128072", - "rss": "6676", + "rss": "6784", "tty": "?", "stat": "Ss", "start": "Nov09", - "time": "0:06", + "time": "0:08", "command": "/usr/lib/systemd/systemd --switched-root --system --deserialize 22" }, { @@ -165,19 +165,6 @@ Examples: "time": "0:00", "command": "[kworker/0:0H]" }, - { - "user": "root", - "pid": "6", - "cpu_percent": "0.0", - "mem_percent": "0.0", - "vsz": "0", - "rss": "0", - "tty": "?", - "stat": "S", - "start": "Nov09", - "time": "0:00", - "command": "[ksoftirqd/0]" - }, ... ] diff --git a/jc/parsers/ps.py b/jc/parsers/ps.py index 98bce919..7f81d3f0 100644 --- a/jc/parsers/ps.py +++ b/jc/parsers/ps.py @@ -84,23 +84,23 @@ Examples: { "user": "root", "pid": 1, - "cpu_percent": "0.0", - "mem_percent": "0.1", - "vsz": "128072", - "rss": "6676", + "cpu_percent": 0.0, + "mem_percent": 0.1, + "vsz": 128072, + "rss": 6784, "tty": null, "stat": "Ss", "start": "Nov09", - "time": "0:06", + "time": "0:08", "command": "/usr/lib/systemd/systemd --switched-root --system --deserialize 22" }, { "user": "root", "pid": 2, - "cpu_percent": "0.0", - "mem_percent": "0.0", - "vsz": "0", - "rss": "0", + "cpu_percent": 0.0, + "mem_percent": 0.0, + "vsz": 0, + "rss": 0, "tty": null, "stat": "S", "start": "Nov09", @@ -110,10 +110,10 @@ Examples: { "user": "root", "pid": 4, - "cpu_percent": "0.0", - "mem_percent": "0.0", - "vsz": "0", - "rss": "0", + "cpu_percent": 0.0, + "mem_percent": 0.0, + "vsz": 0, + "rss": 0, "tty": null, "stat": "S<", "start": "Nov09", @@ -131,11 +131,11 @@ Examples: "cpu_percent": "0.0", "mem_percent": "0.1", "vsz": "128072", - "rss": "6676", + "rss": "6784", "tty": "?", "stat": "Ss", "start": "Nov09", - "time": "0:06", + "time": "0:08", "command": "/usr/lib/systemd/systemd --switched-root --system --deserialize 22" }, { @@ -164,19 +164,6 @@ Examples: "time": "0:00", "command": "[kworker/0:0H]" }, - { - "user": "root", - "pid": "6", - "cpu_percent": "0.0", - "mem_percent": "0.0", - "vsz": "0", - "rss": "0", - "tty": "?", - "stat": "S", - "start": "Nov09", - "time": "0:00", - "command": "[ksoftirqd/0]" - }, ... ] """