Commit Graph

79 Commits

Author SHA1 Message Date
romner
85a10f0305 Fix ROCm SMI makefile flags 2023-06-02 16:14:24 +02:00
romner
cd6979277d Fix error when ROCm SMI static compilation fails 2023-06-02 15:44:44 +02:00
romner
daaa45324f Load ROCm SMI dynamically by default, optionally statically compile and link 2023-06-02 15:34:12 +02:00
aristocratos
093edfe948 Minor changes in wording... 2023-06-01 19:49:00 +02:00
aristocratos
b9a4d31fa4 Fix Makefile dependency order and layout 2023-06-01 19:37:53 +02:00
romner
a0163ce220 Statically link ROCm SMI 2023-06-01 16:42:02 +02:00
romner-set
b2df0696fd Dynamically load NVML 2023-06-01 03:41:56 +02:00
aristocratos
8c710a2b68 Makefile auto detection and initial logic for excluding gpu code when libs are missing 2023-05-20 01:41:04 +02:00
romner-set
c352bf2613 Add ROCm SMI backend for AMD GPU support 2023-05-15 19:42:55 +02:00
romner
0e0025a2c3 Update makefile text, fix typo and adhere to contibuting guidelines 2023-05-14 17:31:39 +02:00
romner
d522a91ef4 Add rudimentary, fullscreen single-GPU NVML utilization graph 2023-05-12 19:34:47 +02:00
Jakob P. Liljenberg
c29fc009bc
Merge pull request #565 from nobounce/nb/makefile-fix-version
Bump the makefile version in the printed banner
2023-07-16 16:04:04 +02:00
zackiloco
77bd1569ff Fix the makefile version in the printed banner 2023-06-28 01:49:43 +02:00
simplepad
8ad8463bc5
add g++12 (without a dash) detection, fix Makefile not accounting for a possibly missing gcc 2023-06-27 00:48:44 +03:00
zackiloco
dec9fa1663 Enable Clang as a compiler.
Clang 16.0.0 or later can now be used to compile btop. Simply call
`CXX=clang++` make.

If the CXX variable contains an incompatible Clang version try to
fallback to GCC.
2023-05-25 23:00:07 +02:00
zackiloco
a2fa9da073 Replace statvfs64 with statvfs and define _FILE_OFFSET_BITS=64.
On my musl system statvfs64 is not exposed by default. The musl FAQ
recommends against using type64_t types, see:
https://wiki.musl-libc.org/faq.html#Q:-Do-I-need-to-define-%3Ccode%3E_LARGEFILE64_SOURCE%3C/code%3E-to-get-64bit-%3Ccode%3Eoff_t%3C/code%3E?.

Defining `_FILE_OFFSET_BITS=64` and using type_t lets type_t use the 64
bit interface, see:
https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html#index-_005fFILE_005fOFFSET_005fBITS.
2023-05-25 23:00:07 +02:00
zackiloco
c996f50751 Include 3rd party headers with isystem to silence warnings. 2023-05-25 13:53:18 +02:00
Brenno Lemos
816c4e43fd feat: prefer fmt submodule over copy-and-paste headers 2023-05-23 10:10:36 -03:00
Steffen
99c5991c1c Replace -ftree-loop-vectorize with -ftree-vectorize.
In preparation for LLVM support use -ftree-vectorize as it is understood
by clang (unlike -ftree-loop-vectorize) and it is an umbrella for the
former and -ftree-slp-vectorize. See https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html.
2023-02-13 00:36:10 +00:00
aristocratos
c4ee41ebc0 Fixed: Makefile, VERBOSE flag now shows directory creation, Issue #480 2022-12-15 17:42:07 +01:00
NexAdn
0d17fb66c4
Makefile: make build targets depend on directories
Since directory creation is a requirement for writing the built
artifacts, this commit introduces a dependency on the directories for
all build targets (compile and link), so parallel builds can't fail
because a build target is executed before the directories target.

Closes: https://github.com/aristocratos/btop/issues/479
2022-12-15 10:30:51 +01:00
aristocratos
a201944dc7 Added autodetection for gcc12 to make compiling on macos Ventura easier. 2022-10-28 22:33:16 +02:00
aristocratos
2ff8864418 Makefile: Reverse VERBOSE bool to not stop with macOS make 2022-10-10 13:02:07 +02:00
aristocratos
080a47e649 Added: VERBOSE=true flag for Makefile to display all compiler commands and fixed so already set CXXFLAGS and LDFLAGS are displayed. 2022-10-10 12:29:32 +02:00
Yonatan Avhar
b9cb628f9c Fix makefile to install to /usr/local instead of /usr 2022-05-08 14:37:48 +03:00
Yonatan Avhar
fee972364b Update makefile to install/remove icons and desktop entry 2022-05-07 15:01:48 +03:00
aristocratos
c88169fc85 Makefile supress find test error 2022-02-14 22:21:50 +01:00
aristocratos
f630a8da3b Makefile fixed fallback for outdated find 2022-02-14 22:19:26 +01:00
aristocratos
49b415d733 Makefile progress accuracy 2022-02-14 22:01:21 +01:00
Bernhard M. Wiedemann
f9a7cdbe09
Sort input file list
so that btop builds in a reproducible way
in spite of indeterministic filesystem readdir order

See https://reproducible-builds.org/ for why this is good.
2022-02-13 03:52:16 +01:00
aristocratos
951423dba5 Added: Percentage progress to Makefile 2022-02-10 08:46:39 +01:00
aristocratos
22061fa627 v1.2.0 FreeBSD Support 2022-01-16 14:19:31 +01:00
Jos Dehaes
3d7bb52e48 Squashed commit of the following:
commit 7add05599de74d8047a9802fd673ae62a91a3372
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Jan 11 23:48:16 2022 +0100

    bring in line with upstream

commit ddb2fb0fac
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Jan 11 23:35:21 2022 +0100

    fix CPU name

commit 01a1dda734
Merge: 3b6dac6 96ac114
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Jan 11 23:29:17 2022 +0100

    merge main into freebsd

commit 3b6dac640e
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Jan 11 23:17:07 2022 +0100

    disk IO working

commit 30b33730b3
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Jan 11 22:47:44 2022 +0100

    reduce memleak drastically

commit 682746ff0e
Merge: 9fdf6d0 891051c
Author: Jakob P. Liljenberg <admin@qvantnet.com>
Date:   Sat Dec 18 19:50:13 2021 +0100

    Merge pull request #186 from GuillaumeGomez/freebsd

    Remove duplicated fstype

commit 891051c8ab
Author: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date:   Sun Dec 5 23:03:17 2021 +0100

    Remove duplicated fstype

commit 9fdf6d0204
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Nov 27 20:55:49 2021 +0100

    iterate over ALL pools

commit 860a9fe472
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Nov 27 20:30:43 2021 +0100

    RAII

commit 7c433be4a6
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Nov 21 21:36:44 2021 +0100

    regular filesystems + ZFS

commit 70d9777908
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Nov 20 22:57:00 2021 +0100

    some comment + minor cleanup

commit a61df3ff98
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Nov 20 22:51:49 2021 +0100

    it does some IO!!

commit f32358bd47
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Nov 16 22:30:55 2021 +0100

    correct unit number

commit d12b4d9d23
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Nov 16 21:58:12 2021 +0100

    readability

commit a6602ff22b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Nov 16 21:53:33 2021 +0100

    correctly iterate over devstat. still no idea how to map the devices we get back here to mountpoints

commit e64610a163
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Nov 16 21:20:42 2021 +0100

    RAII

commit 98693aac25
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 24 21:04:04 2021 +0200

    devstat WIP

commit 8940d68f47
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Oct 24 16:15:29 2021 +0200

    Fixed cpu usage in cpu box, process cpu usage still wrong

commit b547ccb258
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Oct 24 11:25:28 2021 +0200

    Makefile even with OSX Makefile

commit a5eabe20b6
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Oct 24 11:20:46 2021 +0200

    Updated Makefile

commit 18451ceb05
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Oct 24 11:13:15 2021 +0200

    Updated Makefile

commit ca183b2b85
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sun Oct 24 11:09:29 2021 +0200

    Fixed up Makefile

commit 235c95274f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 23 23:49:51 2021 +0200

    fix boottime (not sure if needed)

commit cc2a4987ef
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 23 23:38:00 2021 +0200

    temp

commit 30ef6ee050
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 23 22:58:17 2021 +0200

    cpu freq

commit 735894b6ca
Author: aristocratos <gnmjpl@gmail.com>
Date:   Sat Oct 23 21:46:57 2021 +0200

    Fixed leaks and proc tree mode

commit cd3fd1a529
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 22:27:32 2021 +0200

    correct makefile

commit cd644cfc55
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 15:49:39 2021 +0200

    get rid of warnings

commit 81b63652bf
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 15:43:22 2021 +0200

    battery

commit 41ba986954
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 15:31:04 2021 +0200

    process args

commit 137e876da6
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 14:29:36 2021 +0200

    remove debug

commit 5249be0a40
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 14:28:40 2021 +0200

    net stats

commit 96461f4d94
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 13:54:00 2021 +0200

    sane memory stats

commit e5ceeee197
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 13:38:27 2021 +0200

    processes

commit 889433d4c6
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 12:08:47 2021 +0200

    cpu model  + cpu load

commit f037ab306a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 22 10:31:37 2021 +0200

    freebsd first work

commit de62167921
Merge: a590dd3 a0ee404
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 20 23:10:36 2021 +0200

    Merge branch 'main' into OSX

    # Conflicts:
    #	CHANGELOG.md
    #	Makefile
    #	src/btop.cpp

commit a590dd3f67
Author: aristocratos <admin@qvantnet.com>
Date:   Mon Oct 18 11:20:12 2021 +0200

    Ignore format-truncation

commit 4c30742d41
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 18 10:08:01 2021 +0200

    comments about temp sensors

commit 46030de77c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 18 08:10:37 2021 +0200

    available = total - used

commit 4c228de0ef
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 17 22:19:41 2021 +0200

    use sysconf to get arg_max - seems simpler

commit c60fc29f0f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 17 22:10:50 2021 +0200

    arg_max should be int on macos

commit 0b5a931a6d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 17 22:01:42 2021 +0200

    only fetch max_args once

commit 71d5cd5fd9
Author: aristocratos <admin@qvantnet.com>
Date:   Sat Oct 16 23:24:07 2021 +0200

    Reverted mutexes back to custom atomic bool based locks

commit 3f34a67df6
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 16 21:47:55 2021 +0200

    these helpers can be static

commit fc19c46c8a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 16 21:44:49 2021 +0200

    code cleanup: put the code in .cpp to enable incremental build

commit c252c618c0
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 16 21:09:21 2021 +0200

    don't crash on intel

commit 9f88187c29
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 16 21:06:18 2021 +0200

    small improvement

commit 808f09c974
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 16 20:59:48 2021 +0200

    don't iterate 3 times

commit d8408336e3
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 16 20:59:27 2021 +0200

    remove debug

commit 4f078c3beb
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 13 23:38:27 2021 +0200

    more temperature (M1 + intel)

commit 289880aaa6
Merge: 88a2528 3ffb212
Author: aristocratos <admin@qvantnet.com>
Date:   Sat Oct 16 19:37:09 2021 +0200

    Merge branch 'OSX' of github.com:aristocratos/btop into OSX

commit 88a2528ca3
Author: aristocratos <admin@qvantnet.com>
Date:   Sat Oct 16 19:34:10 2021 +0200

    Merge changes from main

commit 3ffb21203a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 16 19:20:45 2021 +0200

    release a bit more - still has negative temps for 2 cores on my system

commit 70b4871062
Author: aristocratos <admin@qvantnet.com>
Date:   Sat Oct 16 01:59:44 2021 +0200

    Fixed leaks in Mem and attempt at fixing leaks in sensors.cpp

commit fbae907720
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 15 23:41:37 2021 +0200

    temperature sensors via IOKit

commit cef0f0a68d
Author: aristocratos <admin@qvantnet.com>
Date:   Fri Oct 15 18:39:17 2021 +0200

    Process command line arguments

commit 921cfa01ff
Author: aristocratos <admin@qvantnet.com>
Date:   Wed Oct 13 23:20:15 2021 +0200

    Re-enable setuid and set default SU_GROUP to wheel for OSX

commit a416c888c7
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 13 21:16:41 2021 +0200

    temperature

commit e7afe00ce7
Author: aristocratos <admin@qvantnet.com>
Date:   Wed Oct 13 12:54:43 2021 +0200

    Cpu usage working again

commit 4193ef8921
Author: aristocratos <admin@qvantnet.com>
Date:   Wed Oct 13 10:36:51 2021 +0200

    Fixed cpu lazy sorting

commit 93fcb6ff04
Author: aristocratos <admin@qvantnet.com>
Date:   Tue Oct 12 22:22:45 2021 +0200

    Update README.md

commit 683354cd2e
Merge: 8a399c4 6d724d6
Author: aristocratos <admin@qvantnet.com>
Date:   Tue Oct 12 22:19:30 2021 +0200

    Merge pull request #80 from ShrirajHegde/OSX

    Add github workflow for MacOS

commit 8a399c499a
Author: aristocratos <admin@qvantnet.com>
Date:   Tue Oct 12 21:50:46 2021 +0200

    pointer to smart pointer, first pass

commit 772605003a
Author: aristocratos <admin@qvantnet.com>
Date:   Tue Oct 12 18:54:38 2021 +0200

    Fixed detailed memory not updating

commit 28cb677533
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 11 22:19:25 2021 +0200

    more memory free-up - still leaks like crazy

commit 304457863f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 11 21:48:07 2021 +0200

    more RAII cleanup

commit 82e2e3c55c
Author: aristocratos <admin@qvantnet.com>
Date:   Mon Oct 11 12:40:25 2021 +0200

    Removed non present cpu fields and fixed calculation for selectable cpu field graphs

commit 68603f2b37
Author: aristocratos <admin@qvantnet.com>
Date:   Mon Oct 11 10:57:04 2021 +0200

    RAII Wrappers for Cpu::get_battery()

commit d5cb24fbeb
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 10 20:23:11 2021 +0200

    RAII

commit 8fad5a61be
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 9 21:44:16 2021 +0200

    get more disk IO stats

commit 7fa903cf16
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 9 21:43:48 2021 +0200

    fix build

commit 98036db660
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 9 21:18:25 2021 +0200

    remove unnecessary uptime param

commit aae7ae35ca
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 9 21:07:23 2021 +0200

    remove debug logging

commit 5187420b04
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 9 21:06:43 2021 +0200

    fix process elapsed time

commit 89582c0ea6
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 9 21:06:29 2021 +0200

    don't double free

commit 6d724d6155
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date:   Sat Oct 9 21:46:33 2021 +0530

    Change Upload filename

commit 4f94ecc8ad
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date:   Sat Oct 9 21:40:11 2021 +0530

    Fix upload path

commit e1d6d0a1f2
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date:   Sat Oct 9 21:36:13 2021 +0530

    Skip installing gcc via Homebrew
    Change job name

commit 02cdd9d759
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date:   Sat Oct 9 21:30:40 2021 +0530

    Fix uploading
    Remove distclean

commit 39eb6c396f
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date:   Sat Oct 9 21:26:57 2021 +0530

    Disable static compilation

commit 099592bccd
Author: aristocratos <admin@qvantnet.com>
Date:   Sat Oct 9 17:52:10 2021 +0200

    Ignore empty pid 0 to fix tree mode

commit a28e17556e
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date:   Sat Oct 9 21:17:11 2021 +0530

    Add workflow for MacOS

commit aee9179c0a
Author: aristocratos <admin@qvantnet.com>
Date:   Sat Oct 9 17:36:46 2021 +0200

    Disable failed tty mode detection for OSX

commit 4b7b98058d
Author: aristocratos <admin@qvantnet.com>
Date:   Sat Oct 9 11:28:32 2021 +0200

    Fixed disk io and added io activity based on read/write

commit bfa0629e7d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 8 22:28:10 2021 +0200

    fill in 0 for ioticks

commit a016ff8a03
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 8 22:16:01 2021 +0200

    disk io from IOreg. Does not show any io though

commit f98606c6db
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 8 09:32:06 2021 +0200

    per process IO stats

commit c8b50ed488
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 8 00:11:08 2021 +0200

    don't show autofs, it's useless

commit c4df64d440
Author: aristocratos <admin@qvantnet.com>
Date:   Thu Oct 7 18:41:49 2021 +0200

    Fixed compile time display for gmake and command timings

commit b3e6f495f7
Author: aristocratos <admin@qvantnet.com>
Date:   Thu Oct 7 18:26:15 2021 +0200

    Fixed clk_tck -> clkTck

commit e53799188f
Author: aristocratos <admin@qvantnet.com>
Date:   Thu Oct 7 18:25:14 2021 +0200

    Fixed better detection for OSX

commit b864edf984
Author: aristocratos <admin@qvantnet.com>
Date:   Thu Oct 7 18:24:37 2021 +0200

    Fixed cumulative cpu usage

commit 6a3c5d9b97
Author: aristocratos <admin@qvantnet.com>
Date:   Thu Oct 7 13:20:30 2021 +0200

    Proc::collect() better cpu percent accurazy

commit 84d0596294
Merge: 3564f8e 98e1e87
Author: aristocratos <admin@qvantnet.com>
Date:   Thu Oct 7 12:56:55 2021 +0200

    Merge branch 'OSX' of github.com:aristocratos/btop into OSX

commit 3564f8e4c2
Author: aristocratos <admin@qvantnet.com>
Date:   Thu Oct 7 12:56:27 2021 +0200

    Proc::collect() fixed cputimes and cpu percentage calc

commit 98e1e87405
Merge: 60c5636 d96fdd7
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Thu Oct 7 11:32:41 2021 +0200

    Merge branch 'main' into OSX

commit 60c5636cd7
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 22:45:54 2021 +0200

    fix warning

commit 489e446152
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 22:38:40 2021 +0200

    details + process states

commit 7e5a808c73
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 22:38:19 2021 +0200

    avoid details crash

commit 9c9da4606b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 21:03:21 2021 +0200

    fix quit on macos

commit ec7415384d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 00:41:37 2021 +0200

    fix mistake in makefile

commit 5ac8fa4c8a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 18:56:13 2021 +0200

    don't show /dev

commit d901bbebd9
Author: aristocratos <gnmjpl@gmail.com>
Date:   Wed Oct 6 17:27:51 2021 +0200

     Ignore tags and other branches

commit c7f1e71e29
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 16:00:41 2021 +0200

    comment

commit b9d58e3faf
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 15:55:58 2021 +0200

    impossible to get CPU freq on M1 apparently

commit 66072711c2
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 15:33:43 2021 +0200

    detect full

commit 6bb0e930a2
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 00:38:46 2021 +0200

    CPU freq in GHz

commit a5f10f1a0f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 15:13:18 2021 +0200

    check array length

commit 155c848b97
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 15:05:20 2021 +0200

    switch to other way to get CPU freq (still does not work)

commit cf51ba2ebe
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 14:45:44 2021 +0200

    remove some warnings

commit 775dff5f72
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 14:16:45 2021 +0200

    fix link

commit 8c67967775
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 14:16:38 2021 +0200

    reduce diff more

commit 70b47d2ca8
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 14:10:23 2021 +0200

    reduce diff with main branch

commit ca9cb48054
Merge: d0c6c0a c66b46f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 13:49:20 2021 +0200

    Merge remote-tracking branch 'origin/main' into OSX

    # Conflicts:
    #	Makefile
    #	src/osx/btop_collect.cpp

commit c66b46f850
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 13:41:57 2021 +0200

    battery state via CoreFoundation

commit d0c6c0a362
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 10:51:36 2021 +0200

    all disks + load averages

commit ca67526dc1
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 10:33:55 2021 +0200

    show all disks

commit 56119f99a9
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 00:17:41 2021 +0200

    procs sorting/filtering

commit 8d86011d72
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 23:42:17 2021 +0200

    battery states

commit a9b64d62e4
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 23:24:59 2021 +0200

    battery hack works on M1

commit ce51031142
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 23:18:22 2021 +0200

    ugly hack to get battery

commit d5e6725c6c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 22:42:42 2021 +0200

    CPU stuff

commit 5c02bd8c83
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 21:25:42 2021 +0200

    network

commit d5da9d4983
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 15:43:05 2021 +0200

    correct cached size

commit 5f11aba504
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 12:03:48 2021 +0200

    vm stats from syscall + swap

commit 776fc96852
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 10:48:07 2021 +0200

    seems to work indeed

commit 7b40e2835a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 10:46:14 2021 +0200

    allow override optimization flag

commit 005ea24e4c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 10:09:24 2021 +0200

    update Makefile

commit af8cec9deb
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 4 15:32:55 2021 +0200

    some more params

commit 7ebe4f7594
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 4 15:15:55 2021 +0200

    show more disks

commit e50a56394a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 4 14:52:56 2021 +0200

    disks show something

commit 6497a8c202
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 4 09:15:35 2021 +0200

    reformat

commit 28e152b80c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 23:21:13 2021 +0200

    decrease diff with upstream

commit 40da88e9ca
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 22:56:14 2021 +0200

    try to get disks to show

commit eaf2bb56a5
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 22:42:01 2021 +0200

    don't crash on deque::back()

commit f66b6f712c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 22:08:21 2021 +0200

    cpu freq, name & process uid/name

commit 34a8a61f4d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 21:46:11 2021 +0200

    basic process info

commit 29bb2dcc5f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 21:45:39 2021 +0200

    initialize mutex (needed on macos apparently and not on linux)

commit fb5970b000
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 2 23:53:41 2021 +0200

    comment

commit 49d16cdddd
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 2 23:51:29 2021 +0200

    extract delimiters

commit 3db9d66476
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 2 23:48:28 2021 +0200

    first infos on macos: memory used & free

commit f8acb2f854
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Sep 28 23:37:03 2021 +0200

    make it compile on macos (M1 - arm64). Does not run though

commit bbba17cd35
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 10:51:36 2021 +0200

    all disks + load averages

commit 548203e93d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 10:33:55 2021 +0200

    show all disks

commit 0ab2be3985
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Oct 6 00:17:41 2021 +0200

    procs sorting/filtering

commit 096104c90b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 23:42:17 2021 +0200

    battery states

commit 0ad93684c2
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 23:24:59 2021 +0200

    battery hack works on M1

commit c75b0f1cea
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 23:18:22 2021 +0200

    ugly hack to get battery

commit 600b4f72b3
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 22:42:42 2021 +0200

    CPU stuff

commit 4eb812d52c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 21:25:42 2021 +0200

    network

commit 899be68a78
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 15:43:05 2021 +0200

    correct cached size

commit a1c7f935e3
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 12:03:48 2021 +0200

    vm stats from syscall + swap

commit bd1050a740
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 10:48:07 2021 +0200

    seems to work indeed

commit 5094b73758
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 10:46:14 2021 +0200

    allow override optimization flag

commit 8811270332
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Oct 5 10:09:24 2021 +0200

    update Makefile

commit 42f966f448
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 4 15:32:55 2021 +0200

    some more params

commit c1e6d6a62e
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 4 15:15:55 2021 +0200

    show more disks

commit 50fcdaa854
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 4 14:52:56 2021 +0200

    disks show something

commit 264bf2d7da
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Mon Oct 4 09:15:35 2021 +0200

    reformat

commit 1fd625086b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 23:21:13 2021 +0200

    decrease diff with upstream

commit 17f9f3703c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 22:56:14 2021 +0200

    try to get disks to show

commit 8462ae6431
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 22:42:01 2021 +0200

    don't crash on deque::back()

commit 78bce5b5a6
Merge: 53e379d f9505a4
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 22:08:34 2021 +0200

    Merge branch 'aristocratos:main' into main

commit 53e379d74d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 22:08:21 2021 +0200

    cpu freq, name & process uid/name

commit 2a44b307ef
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 21:46:11 2021 +0200

    basic process info

commit 66534eb5b5
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sun Oct 3 21:45:39 2021 +0200

    initialize mutex (needed on macos apparently and not on linux)

commit 0983917f26
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 2 23:53:41 2021 +0200

    comment

commit 9732507248
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 2 23:51:29 2021 +0200

    extract delimiters

commit 6e704ce838
Merge: fe4db7c 7bfbd83
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 2 23:48:43 2021 +0200

    Merge branch 'main' of github.com:joske/btop

commit fe4db7c16c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Sat Oct 2 23:48:28 2021 +0200

    first infos on macos: memory used & free

commit 7bfbd83a47
Merge: 8c8139b a15f961
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Fri Oct 1 17:05:26 2021 +0200

    Merge branch 'aristocratos:main' into main

commit 8c8139bd1d
Merge: 679d21c a246c09
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Sep 29 21:50:00 2021 +0200

    Merge branch 'aristocratos:main' into main

commit 679d21cd22
Merge: 4c70c5b a49b8f9
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Sep 29 20:23:34 2021 +0200

    Merge branch 'aristocratos:main' into main

commit 4c70c5bdd9
Merge: 84a9746 c70667e
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Wed Sep 29 08:30:05 2021 +0200

    Merge branch 'aristocratos:main' into main

commit 84a974695a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date:   Tue Sep 28 23:37:03 2021 +0200

    make it compile on macos (M1 - arm64). Does not run though
2022-01-12 00:04:26 +01:00
stwnt
0e2517ae11 Create dependency files in build directory when compiling. 2021-12-19 23:53:01 +01:00
aristocratos
cb6ad141eb Added support for partial static linking on OSX 2021-11-16 07:16:55 +01:00
aristocratos
125e3c0cb2 v1.1.0 OSX Support 2021-11-14 01:23:12 +01:00
aristocratos
4926acda5f Makefile OSX and freebsd fixes 2021-11-13 21:25:08 +01:00
aristocratos
7ca4940deb Added OSX fixes for upcoming merge 2021-11-13 21:19:18 +01:00
aristocratos
496283ea1a Moved flags not needing to be tested 2021-10-24 01:16:15 +02:00
aristocratos
a046f75949 Fixed: Makefile now tests compiler flag compatibility 2021-10-21 08:16:52 +02:00
aristocratos
f15c2fdcf6 Fixed: Makefile g++ -dumpmachine failure to get platform on some distros 2021-10-18 20:55:06 +02:00
Jan Günter
ac1b6aab47 adopting review comments
https://github.com/aristocratos/btop/pull/92#discussion_r730320662
https://github.com/aristocratos/btop/pull/92#discussion_r730320819
2021-10-17 01:02:37 +02:00
Jan Günter
bca3521472 updated makefile to add cf-protection for i*86 builds 2021-10-16 15:37:40 +02:00
Jan Günter
7d4c2bd3c9 updated Makefile
- added platform and arch detection from CXX machine tuple
- add PLATFORM_LC, a lowercase version of PLATFORM, for case insensitive comparison
- added bool flag STRIP to force -s linker flag
- turned linker warnings into errors in case of STATIC to fail in case of glibc static linking issues
- bumped version to 1.3
2021-10-16 15:15:56 +02:00
aristocratos
69c5eba1db Fixed: Uid -> User fallback to getpwuid() if failure for non static builds 2021-10-06 10:47:24 +02:00
Shriraj Hegde
665a8b1366 Add 'info' option in help
Might be helpful when more platforms are compatible
2021-10-05 00:27:15 +05:30
aristocratos
68d88e6e4d v1.0.9 Bug fixes 2021-09-26 13:46:51 +02:00
aristocratos
3b4a7c12fc Changed: Only look for g++-11 if CXX=g++ 2021-09-25 11:48:33 +02:00
Edward Davis
b9e470fc81 Add make install missing reset escape sequence. 2021-09-21 13:05:03 -07:00
aristocratos
8288d7c311 Added QUIET variable "true/false" to suppress most messages during build 2021-09-21 18:57:16 +02:00