svn commit: r520651 - in head/sysutils/tmux-mem-cpu-load: . files
Adam Weinberger
adamw at FreeBSD.org
Sun Dec 22 18:54:48 UTC 2019
Author: adamw
Date: Sun Dec 22 18:54:47 2019
New Revision: 520651
URL: https://svnweb.freebsd.org/changeset/ports/520651
Log:
tmux-mem-cpu-load: Fix memory calculation, and remove tmux dependency
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.
Added:
head/sysutils/tmux-mem-cpu-load/files/
head/sysutils/tmux-mem-cpu-load/files/patch-freebsd_memory.cc (contents, props changed)
Modified:
head/sysutils/tmux-mem-cpu-load/Makefile
Modified: head/sysutils/tmux-mem-cpu-load/Makefile
==============================================================================
--- head/sysutils/tmux-mem-cpu-load/Makefile Sun Dec 22 18:44:56 2019 (r520650)
+++ head/sysutils/tmux-mem-cpu-load/Makefile Sun Dec 22 18:54:47 2019 (r520651)
@@ -3,7 +3,7 @@
PORTNAME= tmux-mem-cpu-load
PORTVERSION= 3.4.0
-PORTREVISION= 3
+PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
@@ -11,8 +11,6 @@ MAINTAINER= adamw at FreeBSD.org
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
Added: head/sysutils/tmux-mem-cpu-load/files/patch-freebsd_memory.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/tmux-mem-cpu-load/files/patch-freebsd_memory.cc Sun Dec 22 18:54:47 2019 (r520651)
@@ -0,0 +1,24 @@
+From e24890652e3674fe4677722aab8644e62da37348 Mon Sep 17 00:00:00 2001
+From: Dima Panov <fluffy at 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);
+ }
More information about the svn-ports-all
mailing list