Commit Graph

224 Commits

Author SHA1 Message Date
Pawel "l0ner" Soltys
869d43f102 Fixed RAM usage calculation on FreeBSD
- Instead of displaying hardware ram quantity, display ram available to be
  allocated by applications. FreeBSD uses some ram for kernel, segment mappings
  and other stuff. Those memory pages are not available for allocation by
  applications.
- Calculate correctly ram usage. Active + Wired (buffers). Nothing else.

For more info see:
- http://www.cyberciti.biz/files/scripts/freebsd-memory.pl.txt
- conky source code on github
- output of top and vmstat on FreeBSD
- http://www.zabbix.com/forum/showthread.php?t=21826
- https://support.zabbix.com/browse/ZBXNEXT-774

htop on FreeBSD uses linux procfs compatibility layer, and thus it's readings
are a little off.
2015-02-13 18:46:28 +01:00
Pawel "l0ner" Soltys
80d70b7a4d fix for cpu systctl failing on 64 bit OpenBSD
On 64bit system KERN_CPTIME systctl gets returned as 64bit uint.
On 32bit system it's returned as 32bit uint. This is not documented anywhere
(or maybe I've missed it). I've added preprocessor test for 64bit system.
2015-02-12 20:00:30 +01:00
Pawel "l0ner" Soltys
d21be2b87c openbsd: use unsigned ints to store cpu stats 2015-02-01 17:29:04 +01:00
Pawel "l0ner" Soltys
a727edef8f Openbsd: output error message on error 2015-02-01 17:10:52 +01:00
Pawel "l0ner" Soltys
33eac9d16d openbsd: changed cpu stats errors 2015-02-01 17:09:21 +01:00
Pawel "l0ner" Soltys
ea98710e16 removed messages about experimental *BSD support 2015-01-28 11:32:44 +01:00
Matt McCormick
d07e07ba01 Merge pull request #16 from thewtex/OSX-travis
Also run an OSX Travis build.
2015-01-27 23:04:05 -05:00
Matt McCormick
9dbf8086d4 Also run an OSX Travis build. 2015-01-26 15:57:36 -05:00
Pawel "l0ner" Soltys
c052f58eab Workaround for compilation on OpenBSD 5.6
On OpenBSD 5.6 sys/ucred.h uses NGROUP define, but misses include to
sys/param.h in which NGROUP is defined. sys/ucred.h is included in
sys/mount.h which we need to get the cached ram. Because of this include
chain our compilation will fail with missing NGROUP define. This can be
resolved by including in our code (and in correct order) system headers.
2015-01-26 20:25:00 +01:00
Pawel "l0ner" Soltys
d516985146 fix missing headers on OpenBSD 2015-01-21 13:43:42 +01:00
Pawel "l0ner" Soltys
1ea2fe6d56 Merge branch 'openbsd_new' of github.com:l0ner/tmux-mem-cpu-load into openbsd_new
Conflicts:
	CMakeLists.txt
2015-01-20 15:15:11 +01:00
Pawel "l0ner" Soltys
668a1d97dd suggestion about script that can be used to strip whitespaces 2015-01-20 15:13:39 +01:00
Pawel "l0ner" Soltys
b5a2fcfd34 update readme with supported platforms 2015-01-20 15:11:32 +01:00
Pawel "l0ner" Soltys
69df3a37bf STATUS on OS message detection, consistent spacing 2015-01-20 15:08:47 +01:00
Pawel "l0ner" Soltys
cc8eb47868 remove useless bsd/memory_openbsd.cc 2015-01-20 15:04:14 +01:00
Pawel "l0ner" Soltys
9bd9e79d36 Strip unnecessary whitespaces 2015-01-20 15:03:49 +01:00
Pawel "l0ner" Soltys
3e7ce96903 removed junk, reindentation to adhere to style guidelines 2015-01-20 15:03:49 +01:00
Pawel "l0ner" Soltys
580b076b79 OpenBSD: missing headers, typos
cpu.h: underscores in get_cpu_count()
load.cc: underscores in get_cpu_count(), typos
memory.cc: missing headers
2015-01-20 15:03:49 +01:00
Pawel "l0ner" Soltys
112004f3db FreeBSD and OpenBSD ports
- Removed OpenBSD stuff from freebsd port
- Renamed bsd folder to freebsd since now it contains only
  freebsd-relevant files.
- Changed CMake instructions to account for bsd port changes
- modified main source file to account for openbsd port
2015-01-20 15:03:48 +01:00
Pawel "l0ner" Soltys
8afed01977 Openbsd port. Should work. 2015-01-20 15:02:47 +01:00
Pawel "l0ner" Soltys
243487903a Strip unnecessary whitespaces 2015-01-20 14:50:07 +01:00
Matt McCormick
360ef2e9f2 Version bump to 3.0.0. v3.0.0 2015-01-20 08:11:40 -05:00
Matt McCormick
3e0789b3d3 CMakeLists.txt formatting. 2015-01-20 08:11:20 -05:00
Matt McCormick
68ab061cb4 Rename tmux-mem-cpu-load.cc to main.cc. 2015-01-20 08:05:28 -05:00
Matt McCormick
9498e06ac4 Collect top level code files into common directory.
A little more organized.
2015-01-20 08:04:02 -05:00
Matt McCormick
5132f338fd Merge pull request #14 from thewtex/option-compatibility
Option compatibility
2015-01-20 07:53:48 -05:00
Matt McCormick
040857a4e8 Fix unused expression result warnings on OSX. 2015-01-19 23:28:38 -05:00
Matt McCormick
ea0e620a46 Update the README for new usage. 2015-01-19 23:02:48 -05:00
Matt McCormick
fa4a5b5c2b Print error message to std::cerr. 2015-01-19 23:02:48 -05:00
Matt McCormick
1bfda9484a Detect old option specification fail informatively.
Print the information message to std::cout so it gets printed on the tmux
status line so users of 2.X know how to update their configuration.
2015-01-19 23:02:04 -05:00
Matt McCormick
4c00be77ff Fix trailing whitespace. 2015-01-19 22:17:36 -05:00
Matt McCormick
5cd5a2468b Change tmux-mem-cpu-load extension to .cc for consistency. 2015-01-19 22:16:23 -05:00
Matt McCormick
05d226964a Fix trailing whitespace. 2015-01-19 22:14:36 -05:00
Matt McCormick
7e72e47d2c Fix authors name spelling. 2015-01-19 21:59:13 -05:00
Matt McCormick
17dbdfe9ea More consistent spacing in CMakeLists.txt. 2015-01-19 21:54:35 -05:00
Matt McCormick
87a92fa108 Use message(STATUS for OS detection messages.
Changes message output.  Preceeds with "--" for CMake status messages.
2015-01-19 21:50:47 -05:00
Matt McCormick
ca82149c10 Merge pull request #13 from l0ner/master
Pull l0ner/master into upstream.
2015-01-19 21:47:04 -05:00
Pawel "l0ner" Soltys
4d6c6760b3 removed junk, reindentation to adhere to style guidelines 2015-01-20 02:57:14 +01:00
Pawel "l0ner" Soltys
3a78f44e39 OpenBSD: missing headers, typos
cpu.h: underscores in get_cpu_count()
load.cc: underscores in get_cpu_count(), typos
memory.cc: missing headers
2015-01-20 02:44:21 +01:00
Pawel "l0ner" Soltys
ae5c71441b FreeBSD and OpenBSD ports
- Removed OpenBSD stuff from freebsd port
- Renamed bsd folder to freebsd since now it contains only
  freebsd-relevant files.
- Changed CMake instructions to account for bsd port changes
- modified main source file to account for openbsd port
2015-01-19 23:57:53 +01:00
Pawel "l0ner" Soltys
3fd4a21d27 Openbsd port. Should work. 2015-01-19 23:41:51 +01:00
Pawel "l0ner" Soltys
e459d40228 note about vim modelines and lower-case in CMake files 2015-01-19 18:01:53 +01:00
Pawel "l0ner" Soltys
ec6b1c6cc7 remove leftover argParse.cc reference from CMakeList.txt 2015-01-19 17:55:29 +01:00
Pawel "l0ner" Soltys
dd8253e6df added CONTRIBUTING file with instructions for eventual contributors 2015-01-19 17:51:40 +01:00
Pawel "l0ner" Soltys
08bc9b7ecf replaced argParser with getopt_long based one
Solves issue:
28040b61da (commitcomment-9327906)

No GPL2-based code anymore in the codebase.
2015-01-19 17:17:38 +01:00
Pawel "l0ner" Soltys
eb338d92c5 rename config.h back to version.h since it contains only version after last commit 2015-01-18 20:04:28 +01:00
Pawel "l0ner" Soltys
2fb24571ef use inline function for unit conversion instead of macros 2015-01-18 20:02:46 +01:00
Pawel "l0ner" Soltys
7c883b924a restore parsing of /proc/meminfo to get memory usage
See issue:
e7f2dd25e8 (commitcomment-9327932)

Unfortunately we can't pull info about cached memory from sysinfo.
Thus we need stick to /proc/meminfo parsing. See code for more comments.
2015-01-18 19:20:55 +01:00
Pawel "l0ner" Soltys
ed8ed793bf renamed bsd/common.h to getsysctl.h to better reflect it's function 2015-01-18 17:27:08 +01:00
Pawel "l0ner" Soltys
a53bbddef8 added cmake generated config.h file to gitignore 2015-01-18 17:24:17 +01:00