Commit graph

397 commits

Author SHA1 Message Date
Josh Davies 4a2c4efb9a Added tests for "cpu-mode", short opt --colour
Also fixed (properly) ad83d9b
2016-06-26 14:47:02 +01:00
Josh Davies ad83d9b3a9 Fix: allow -c short option for --color 2016-06-26 14:33:05 +01:00
Josh Davies c623ca889d Added cpu-mode option
Default as before, full load = 100%.
Option 1, full load = 100% * number of cpu threads.
2016-06-26 14:31:34 +01:00
Matt McCormick 3e12a64309 Merge pull request #36 from jasperla/openbsd_mem
Simplify memory calculations on OpenBSD by using uvmexp.pageshift
2016-05-15 07:52:33 -04:00
Matt McCormick 0bc57a9ac8 Tweak description to avoid redundancy.
RAM memory -> RAM.
2016-05-06 09:25:33 -04:00
Matt McCormick ce9de3f9aa Merge pull request #35 from compilenix/master
added averages-count option
2016-05-06 09:24:10 -04:00
Compilenix 710be9e355 Added tests for "averages-count" 2016-05-06 09:03:18 +02:00
Jasper Lievisse Adriaanse 3f647a9b2b Simplify memory calculations on OpenBSD by using uvmexp.pageshift 2016-05-03 20:33:43 +02:00
Compilenix 97a655c856 cleanup 2016-04-28 22:27:19 +02:00
Compilenix cbe3074c6b Update README.rst and AUTHORS 2016-04-28 22:13:05 +02:00
Compilenix 1d1a516eda added averages-count option 2016-04-28 22:05:43 +02:00
Matt McCormick 34b9d39b57 Merge pull request #34 from golinski/master
Adding powerline support
2016-04-14 07:01:33 -04:00
Michał Goliński bac831cd69 Code refactoring for merging
- license header in new files
- changed "powerline" into "powerline-right"
- added braces around one-liners
- small fixes concerning whitespace
2016-04-14 12:30:20 +02:00
golinski e9a3726de7 Change CMakeLists.txt, so it builds on all systems, not only on Linux 2016-03-07 15:14:32 +01:00
Matt McCormick 6e1dbc6b1f Version bump to 3.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. 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