Commit Graph

333 Commits

Author SHA1 Message Date
Matt McCormick
6e1dbc6b1f Version bump to 3.3.0. v3.3.0 2016-03-06 20:33:34 -05:00
Matt McCormick
b8594ecb82 Correct total memory output for the default mode. 2016-03-06 10:57:38 -05:00
Michał Goliński
159051079b Changes in README.rst 2016-03-05 19:34:37 +01:00
Michał Goliński
cc59b4952f Powerline support 2016-03-05 11:19:31 +01:00
Matt McCormick
68fd497108 Update README with mem-mode instructions. 2016-02-15 00:02:58 -05:00
Matt McCormick
be0b914c49 Merge pull request #32 from thewtex/mem-mode-all-platforms
Mem mode all platforms
2016-02-15 00:00:11 -05:00
Matt McCormick
6938941b99 Add help for memory display mode. 2016-02-14 23:52:56 -05:00
Matt McCormick
42275e094d Memory mode output for platforms other than osx.
Refactor status string generation into a common function.
2016-02-14 23:47:02 -05:00
Matt McCormick
fb8e3c6ad0 Add .gitattributes to check whitespace errors. 2016-02-10 16:59:39 -05:00
Matt McCormick
e50d34873f Add header guard to conversions.h 2016-02-10 16:54:09 -05:00
Matt McCormick
7eef3670e0 Fix whitespace in osx/memory.cc. 2016-02-10 16:48:37 -05:00
Matt McCormick
4fd854ce16 Give the MEMORY_MODE enum a name.
This improves readability. Also, set the default value in one place in the
declaration.
2016-02-10 16:47:29 -05:00
Matt McCormick
c5f369ae00 Fix trailing whitespace in linux/memory.cc. 2016-02-10 16:41:36 -05:00
Matt McCormick
81fea73e79 Move MEMORY_MODE enum inside include guard. 2016-02-10 16:38:50 -05:00
Matt McCormick
a6f57340d8 Merge pull request #31 from cousine/master
Added memory modes to show different memory calculations
2016-02-10 16:03:03 -05:00
cousine
635334b141 Adhere to the styling guide, added enum for memory modes, refractored memory mode if block to use switch instead and added test cases for free memory and user percentage memory modes 2016-02-10 22:49:49 +02:00
cousine
0e89998ee4 Add new mode to other platforms and indicate mac only support in README 2016-02-10 17:38:11 +02:00
cousine
1b8fa1ec3a Add new option to the readme 2016-02-10 17:35:15 +02:00
cousine
451aed4530 added memory mode to calculate %, and free memory 2016-02-10 17:32:01 +02:00
Matt McCormick
859c60976a Version bump to 3.2.3. v3.2.3 2016-01-09 17:01:28 -05:00
Matt McCormick
cc85854323 Add new contributors to the README. 2016-01-09 17:00:56 -05:00
Matt McCormick
9ad57c906b Merge pull request #30 from tony/freebsd-memory
Fix FreeBSD memory usage
2016-01-09 16:56:53 -05:00
Tony Narlock
c036017db3 Fix FreeBSD memory usage
Total memory would go out of bounds for machines ~ > 3.5gB of
memory due to the limit of what u_int can hold.

Use ``getpagesize()`` and bitshift pagesize so it fits.

See also: https://github.com/thewtex/tmux-mem-cpu-load/issues/29
2016-01-09 10:41:28 -06:00
Matt McCormick
f80a026c45 Merge pull request #28 from allcatsarebeautiful/master
Allow Easy Installation Via Antigen
2015-09-30 22:27:01 -04:00
Travis Heller
7ca3efacad Merge branch 'master' of https://github.com/allcatsarebeautiful/tmux-mem-cpu-load 2015-09-30 13:03:05 -07:00
Travis Heller
e9af4ea2c0 Added License Information 2015-09-30 13:02:36 -07:00
Travis Heller
cd0ad5c8ff Why is the markdown formatting not propagating? 2015-09-30 13:00:36 -07:00
Travis Heller
ff36892e29 Fixed formatting. 2015-09-30 12:27:29 -07:00
Travis Heller
d273cbaf60 RST files don't use Markdown formatting; fixed the link. 2015-09-30 12:25:04 -07:00
Travis Heller
e1908ebd13 Why is the markdown formatting not propagating? 2015-09-30 12:16:00 -07:00
Travis Heller
8e6d013c66 Formatting links in .md 2015-09-30 12:11:21 -07:00
Travis Heller
ad0a88d1f2 Fixed readme linking error 2015-09-30 12:03:57 -07:00
Travis Heller
7cc6ff35cc Added a check to see if the file has already been installed. 2015-09-30 11:51:53 -07:00
Travis Heller
79e16ec38b Supports Antigen via plugin that builds and installs 2015-09-30 10:57:06 -07:00
Matt McCormick
62c18a0778 Merge pull request #27 from thewtex/circle-ci
Add circle-ci status badge.
2015-07-30 16:08:27 -04:00
Matt McCormick
b61503e76a Add circle-ci status badge. 2015-07-30 16:03:52 -04:00
Matt McCormick
557528b946 Merge pull request #25 from jasperla/ws
Don't print trailing whitespace for last element
2015-04-02 09:49:51 -04:00
Matt McCormick
1fe9a33252 Merge branch 'load-whitespace' 2015-04-02 09:42:35 -04:00
Matt McCormick
a8367d7f86 Fix color of space preceding the load.
The color preceding of the space preceding the load is
made to be consistent with the load color instead of the default. This is
consistent with the CPU percentage color and easier to read.
2015-04-02 09:37:58 -04:00
Jasper Lievisse Adriaanse
512185a6b3 Don't print trailing whitespace for last element
it's easier to add it in your tmux.conf, then it's to remove it.
2015-04-02 15:35:16 +02:00
Matt McCormick
c6d8a19a24 Version bump to 3.2.1. v3.2.1 2015-03-01 19:23:55 -05:00
Matt McCormick
4355f8ffae Add Jasper to contributors. 2015-03-01 19:23:25 -05:00
Matt McCormick
39dc52f23c Merge pull request #22 from jasperla/openbsd_memory
Switch to using uvmexp which is the prefered way of retrieving memory information
2015-03-01 19:19:39 -05:00
Jasper Lievisse Adriaanse
52540329e5 Switch to using uvmexp which is the prefered way of retrieving memory information
Also fixup some page shifting and casting issues which led to incorrect
amounts of memory being displayed. This also fixes a crash with --colors (#20)
2015-03-01 13:45:31 +01:00
Matt McCormick
e70a16c936 Version bump to 3.2.0. v3.2.0 2015-02-19 22:42:29 -05:00
Matt McCormick
32d9083326 Add NetBSD to the list of supported platforms. 2015-02-19 22:41:53 -05:00
Matt McCormick
ec1959128d Merge pull request #18 from l0ner/devel
Code Refactoring and NetBSD port
2015-02-19 22:39:31 -05:00
Matt McCormick
395ac49e83 Suggest status-left-length 60 in the README.
Addresses #19.
2015-02-19 20:46:17 -05:00
Pawel "l0ner" Soltys
72b8493a59 Code Refactoring and NetBSD support.
* Added NetBSD support.
* removed per-platform header files: all the supported platforms were using
  identical header files for cpu, memory and load (except a few differences).
  Since this was unnecessary code duplication I've gathered what was common
  among the platforms, removed duplicates and moved what was left to the
  common/ dir.
* implemented get_cpu_count() function across all platforms. We are using it
  on every platform, yet not on every one this was implemented as a separate
  function.
* removed platform detection through preprocessor from main: we don't need this
  there anymore, since the headers are common for all platforms. CMake will
  handle setting of correct source files for us now.
* Unified used defines for CPU states across all platforms and made linux use
  them. Added some platform detection to cpu.h in order to set them correctly
  across the platforms.
* moved getsysctl.h to common/ dir, since it's used on Net and Free BSD, and
  thus become a common include.
* Unified load_string() across all platforms. Same case as with the header
  files. We can use the same getloadavg() based logic for getting load averages
  on all platforms. *BSD and OS X code was already the pretty much identical.
  Removed duplicated code and made linux adhere to getloadavg() logic.
2015-02-19 21:29:58 +01:00
Pawel "l0ner" Soltys
87cc9b1ce8 Code Refactoring part 2: unified load_string() function on all platforms
All the platforms were using identical logic based on getloadavg() function to
get the load avg stats (except linux, which was using sinfo struct, but can use getloadavg() function). I've noticed this while working on NetBSD port.

Also: fixed a typo on freebsd.
2015-02-19 21:26:35 +01:00