python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-08-08 22:36:48 +02:00
Code Issues Releases Activity

add unit string fields and topline bytes fields

Browse Source
This commit is contained in:
Kelly Brazil
2025-07-08 11:45:47 -07:00
parent 10d1ab1c74
commit 424d9c1347
1 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
jc/parsers/top.py
View File

@ -45,26 +45,31 @@ All `-` values are converted to `null`
"cpu_hardware": float, "cpu_hardware": float,
"cpu_software": float, "cpu_software": float,
"cpu_steal": float, "cpu_steal": float,
"mem_total": float, # [0] "mem_unit": string,
"mem_free": float, # [0] "mem_total": float,
"mem_used": float, # [0] "mem_free": float,
"mem_buff_cache": float, # [0] "mem_used": float,
"swap_total": float, # [0] "mem_buff_cache": float,
"swap_free": float, # [0] "swap_unit": string,
"swap_used": float, # [0] "swap_total": float,
"mem_available": float, # [0] "swap_free": float,
"swap_used": float,
"mem_available": float,
"processes": [ "processes": [
{ {
"pid": integer, "pid": integer,
"user": string, "user": string,
"priority": integer, "priority": integer,
"nice": integer, "nice": integer,
"virtual_mem": float, # [1] "virtual_mem": float,
"virtual_mem_bytes": integer, "virtual_mem_bytes": integer,
"resident_mem": float, # [1] "virtual_mem_unit": string,
"resident_mem": float,
"resident_mem_bytes": integer, "resident_mem_bytes": integer,
"shared_mem": float, # [1] "resident_mem_unit": string,
"shared_mem": float,
"shared_mem_bytes": integer, "shared_mem_bytes": integer,
"shared_mem_unit": string,
"status": string, "status": string,
"percent_cpu": float, "percent_cpu": float,
"percent_mem": float, "percent_mem": float,
@ -85,12 +90,15 @@ All `-` values are converted to `null`
"thread_count": integer, "thread_count": integer,
"last_used_processor": integer, "last_used_processor": integer,
"time": string, "time": string,
"swap": float, # [1] "swap": float,
"swap_bytes": integer, "swap_bytes": integer,
"code": float, # [1] "swap_unit": string,
"code": float,
"code_bytes": integer, "code_bytes": integer,
"data": float, # [1] "code_unit": string,
"data": float,
"data_bytes": integer, "data_bytes": integer,
"data_unit": string,
"major_page_fault_count": integer, "major_page_fault_count": integer,
"minor_page_fault_count": integer, "minor_page_fault_count": integer,
"dirty_pages_count": integer, "dirty_pages_count": integer,
@ -109,8 +117,9 @@ All `-` values are converted to `null`
] ]
"major_page_fault_count_delta": integer, "major_page_fault_count_delta": integer,
"minor_page_fault_count_delta": integer, "minor_page_fault_count_delta": integer,
"used": float, # [1] "used": float,
"used_bytes": integer, "used_bytes": integer,
"used_unit": string,
"ipc_namespace_inode": integer, "ipc_namespace_inode": integer,
"mount_namespace_inode": integer, "mount_namespace_inode": integer,
"net_namespace_inode": integer, "net_namespace_inode": integer,
@ -131,9 +140,6 @@ All `-` values are converted to `null`
} }
] ]
[0] Values are in the units output by `top`
[1] Unit suffix stripped during float conversion
Examples: Examples:
$ top -b -n 3 | jc --top -p $ top -b -n 3 | jc --top -p
@ -448,17 +454,24 @@ def _process(proc_data: List[Dict], quiet=False) -> List[Dict]:
} }
bytes_list: Set = { bytes_list: Set = {
'virtual_mem', 'resident_mem', 'shared_mem', 'swap', 'code', 'data', 'mem_total', 'mem_free', 'mem_used', 'mem_available', 'mem_buff_cache',
'used' 'swap_total', 'swap_free', 'swap_used', 'virtual_mem', 'resident_mem',
'shared_mem', 'swap', 'code', 'data', 'used'
} }
for idx, item in enumerate(proc_data): for idx, item in enumerate(proc_data):
for key in item: for key in item.copy():
# root truncation warnings # root truncation warnings
if isinstance(item[key], str) and item[key].endswith('+') and not quiet: if isinstance(item[key], str) and item[key].endswith('+') and not quiet:
jc.utils.warning_message([f'item[{idx}]["{key}"] was truncated by top']) jc.utils.warning_message([f'item[{idx}]["{key}"] was truncated by top'])
# root int and float conversions # root int and float conversions
if key in bytes_list:
if key.startswith('mem_'):
item[key + '_bytes'] = jc.utils.convert_size_to_int(item[key] + item['mem_unit'])
if key.startswith('swap_'):
item[key + '_bytes'] = jc.utils.convert_size_to_int(item[key] + item['swap_unit'])
if key in int_list: if key in int_list:
item[key] = jc.utils.convert_to_int(item[key]) item[key] = jc.utils.convert_to_int(item[key])
@ -496,6 +509,10 @@ def _process(proc_data: List[Dict], quiet=False) -> List[Dict]:
# do int/float conversions for the process objects # do int/float conversions for the process objects
if proc[key]: if proc[key]:
if key in bytes_list: if key in bytes_list:
if proc[key][-1] not in ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9'):
proc[key + '_unit'] = proc[key][-1]
else:
proc[key + '_unit'] = 'b'
proc[key + '_bytes'] = jc.utils.convert_size_to_int(proc[key], posix_mode=True) proc[key + '_bytes'] = jc.utils.convert_size_to_int(proc[key], posix_mode=True)
if key in int_list: if key in int_list:
@ -620,6 +637,7 @@ def parse(
line_list = line.split() line_list = line.split()
item_obj.update( item_obj.update(
{ {
'mem_unit': line_list[0],
'mem_total': line_list[3], 'mem_total': line_list[3],
'mem_free': line_list[5], 'mem_free': line_list[5],
'mem_used': line_list[7], 'mem_used': line_list[7],
@ -633,6 +651,7 @@ def parse(
line_list = line.split() line_list = line.split()
item_obj.update( item_obj.update(
{ {
'swap_unit': line_list[0],
'swap_total': line_list[2], 'swap_total': line_list[2],
'swap_free': line_list[4], 'swap_free': line_list[4],
'swap_used': line_list[6], 'swap_used': line_list[6],