Mirrors/vm-bhyve
1
0
Fork 0
mirror of https://github.com/churchers/vm-bhyve.git synced 2025-12-11 09:20:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix get_part whitespace handling and add uptime to vm list -v

Browse Source
This commit is contained in:
Matt Churchyard
2020-02-04 10:13:26 +00:00
parent 21db926695
commit 392a640b24
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vm-base
View File

@@ -25,7 +25,7 @@
# POSSIBILITY OF SUCH DAMAGE.
VERSION=1.5-devel
VERSION_INT=105004
VERSION_INT=105005
VERSION_BSD=$(uname -K)
PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin

15
lib/vm-core
View File

@@ -30,7 +30,7 @@
core::list(){
local _name _loader _cpu _our_host
local _memory _run _vm _auto _num _graphics _vnc _pid
local _state _pcpu _rss
local _state _pcpu _rss _uptime
local _format="%s^%s^%s^%s^%s^%s^%s^%s\n"
cmd::parse_args "$@"
@@ -40,14 +40,14 @@ core::list(){
vm::running_load
[ -n "${VM_OPT_VERBOSE}" ] && _format="%s^%s^%s^%s^%s^%s^%s^%s^%s^%s\n";
[ -n "${VM_OPT_VERBOSE}" ] && _format="%s^%s^%s^%s^%s^%s^%s^%5s^%8s^%14s^%s\n";
# pass everything below here to column(1)
{
if [ -n "${VM_OPT_VERBOSE}" ]; then
printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTOSTART" "%CPU" "RSS" "STATE"
printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTO" "%CPU" "RSZ" "UPTIME" "STATE"
else
printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTOSTART" "STATE"
printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTO" "STATE"
fi
for _ds in ${VM_DATASTORE_LIST}; do
@@ -69,6 +69,7 @@ core::list(){
_state=""
_pcpu="-"
_rss="-"
_uptime="-"
# check if the guest is running
if vm::running_check "_run" "_pid" "${_name}" || \
@@ -82,13 +83,15 @@ core::list(){
fi
if [ -n "${_pid}" -a -n "${VM_OPT_VERBOSE}" ]; then
_state=$(ps -o"%cpu"= -o"rss"= -p "${_pid}")
_state=$(ps -o"%cpu"= -o"rss"= -o"etime"= -p "${_pid}")
if [ -n "${_state}" ]; then
util::get_part "_pcpu" "${_state}" 1
util::get_part "_rss" "${_state}" 2
util::get_part "_uptime" "${_state}" 3
[ -n "${_rss}" ] && _rss=$(info::__bytes_human "${_rss}" 1 2)
_uptime=$(echo "${_uptime}" |sed 's/\-/d /')
fi
fi
@@ -108,7 +111,7 @@ core::list(){
fi
if [ -n "${VM_OPT_VERBOSE}" ]; then
printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_pcpu}" "${_rss}" "${_run}"
printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_pcpu}" "${_rss}" "${_uptime}" "${_run}"
else
printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_run}"
fi

2
lib/vm-util
View File

@@ -394,5 +394,5 @@ util::get_part(){
local _data="$2"
local _num="$3"
setvar "${_var}" $(echo "${_data}" |cut -d" " -f${_num})
setvar "${_var}" $(echo "${_data}" |cut -w -f${_num})
}