cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tmux-mem-cpu-load: Fix memory calculation, and remove tmux dependency

Browse Source 
This adds a patch from fluffy that fixes the memory usage calculation, which
was previously wildly incorrect (on my box: before 484, after 16889). See
https://github.com/thewtex/tmux-mem-cpu-load/pull/61

Also, I'm removing the run-time dependency on tmux. Although this program
is designed to be used in the tmux status bar, there's no reason it can't
be used in any other status bar, and it doesn't actually use tmux in any
way.
This commit is contained in:
Adam Weinberger 2019-12-22 18:54:47 +00:00
parent 810c33ca0e
commit af6855fdad
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=520651
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/tmux-mem-cpu-load/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= tmux-mem-cpu-load
PORTVERSION= 3.4.0
PORTREVISION= 3
PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
@ -12,8 +12,6 @@ COMMENT= CPU, RAM, and load monitor for use with tmux
LICENSE= APACHE20
RUN_DEPENDS= tmux:sysutils/tmux
USES= cmake compiler:c++11-lang
USE_GITHUB= yes
GH_ACCOUNT= thewtex

24
sysutils/tmux-mem-cpu-load/files/patch-freebsd_memory.cc Normal file
View File

@ -0,0 +1,24 @@
From e24890652e3674fe4677722aab8644e62da37348 Mon Sep 17 00:00:00 2001
From: Dima Panov <fluffy@FreeBSD.org>
Date: Fri, 20 Dec 2019 02:47:32 +1000
Subject: [PATCH] Fix calculate memory usage on FreeBSD
---
freebsd/memory.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/freebsd/memory.cc b/freebsd/memory.cc
index 5500032..687a0a8 100644
--- freebsd/memory.cc
+++ freebsd/memory.cc
@@ -63,8 +63,8 @@ void mem_status( MemoryStatus & status )
//u_int unused = ( cache + inactive + free ) * page_size;
// Used memory on FreeBSD is active + wired.
- u_int used = ( active + wired ) * page_size;
+ u_int used = ( active + wired );
- status.used_mem = convert_unit( static_cast< float >( used ), MEGABYTES );
+ status.used_mem = convert_unit( static_cast< float >( used * (page_size >> 10) ), MEGABYTES, KILOBYTES );
status.total_mem = convert_unit( static_cast< float >( page_count * (page_size >> 10) ), MEGABYTES, KILOBYTES);
}