Mirrors/vm-bhyve
1
0
Fork 0
mirror of https://github.com/churchers/vm-bhyve.git synced 2026-01-04 03:54:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

VSZ seems to be fairly useless as it simply matches configured memory

Browse Source
This commit is contained in:
Matt Churchyard
2020-01-31 14:00:53 +00:00
parent c5250b8097
commit 21db926695
2 changed files with 8 additions and 11 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. # POSSIBILITY OF SUCH DAMAGE.
VERSION=1.5-devel VERSION=1.5-devel
VERSION_INT=105003 VERSION_INT=105004
VERSION_BSD=$(uname -K) VERSION_BSD=$(uname -K)
PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin

17
lib/vm-core
View File

@@ -30,7 +30,7 @@
core::list(){ core::list(){
local _name _loader _cpu _our_host local _name _loader _cpu _our_host
local _memory _run _vm _auto _num _graphics _vnc _pid local _memory _run _vm _auto _num _graphics _vnc _pid
local _state _pcpu _vsz _rss local _state _pcpu _rss
local _format="%s^%s^%s^%s^%s^%s^%s^%s\n" local _format="%s^%s^%s^%s^%s^%s^%s^%s\n"
cmd::parse_args "$@" cmd::parse_args "$@"
@@ -40,12 +40,12 @@ core::list(){
vm::running_load vm::running_load
[ -n "${VM_OPT_VERBOSE}" ] && _format="%s^%s^%s^%s^%s^%s^%s^%s^%s^%s^%s\n"; [ -n "${VM_OPT_VERBOSE}" ] && _format="%s^%s^%s^%s^%s^%s^%s^%s^%s^%s\n";
# pass everything below here to column(1) # pass everything below here to column(1)
{ {
if [ -n "${VM_OPT_VERBOSE}" ]; then if [ -n "${VM_OPT_VERBOSE}" ]; then
printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTOSTART" "%CPU" "VSZ" "RSS" "STATE" printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTOSTART" "%CPU" "RSS" "STATE"
else else
printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTOSTART" "STATE" printf "${_format}" "NAME" "DATASTORE" "LOADER" "CPU" "MEMORY" "VNC" "AUTOSTART" "STATE"
fi fi
@@ -68,7 +68,6 @@ core::list(){
_pid="" _pid=""
_state="" _state=""
_pcpu="-" _pcpu="-"
_vsz="-"
_rss="-" _rss="-"
# check if the guest is running # check if the guest is running
@@ -83,14 +82,12 @@ core::list(){
fi fi
if [ -n "${_pid}" -a -n "${VM_OPT_VERBOSE}" ]; then if [ -n "${_pid}" -a -n "${VM_OPT_VERBOSE}" ]; then
_state=$(ps -o"%cpu"= -o"vsz"= -o"rss"= -p "${_pid}") _state=$(ps -o"%cpu"= -o"rss"= -p "${_pid}")
if [ -n "${_state}" ]; then if [ -n "${_state}" ]; then
util::get_part "_pcpu" "${_state}" 1 util::get_part "_pcpu" "${_state}" 1
util::get_part "_vsz" "${_state}" 2 util::get_part "_rss" "${_state}" 2
util::get_part "_rss" "${_state}" 3
[ -n "${_vsz}" ] && _vsz=$(info::__bytes_human "${_vsz}" 1 2)
[ -n "${_rss}" ] && _rss=$(info::__bytes_human "${_rss}" 1 2) [ -n "${_rss}" ] && _rss=$(info::__bytes_human "${_rss}" 1 2)
fi fi
fi fi
@@ -111,7 +108,7 @@ core::list(){
fi fi
if [ -n "${VM_OPT_VERBOSE}" ]; then if [ -n "${VM_OPT_VERBOSE}" ]; then
printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_pcpu}" "${_vsz}" "${_rss}" "${_run}" printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_pcpu}" "${_rss}" "${_run}"
else else
printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_run}" printf "${_format}" "${_name}" "${_ds}" "${_loader}" "${_cpu}" "${_memory}" "${_vnc}" "${_auto}" "${_run}"
fi fi
@@ -154,7 +151,7 @@ core::create(){
[ -z "${_name}" ] && util::usage [ -z "${_name}" ] && util::usage
# check guest name # check guest name
util::check_name "${_name}" || util::err "invalid virtual machine name - '${_name}'" util::check_name "${_name}" 46 || util::err "invalid virtual machine name - '${_name}'"
datastore::get_guest "${_name}" && util::err "virtual machine already exists in ${VM_DS_PATH}/${_name}" datastore::get_guest "${_name}" && util::err "virtual machine already exists in ${VM_DS_PATH}/${_name}"
datastore::get "${_ds}" || util::err "unable to load datastore - '${_ds}'" datastore::get "${_ds}" || util::err "unable to load datastore - '${_ds}'"