Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for GCC 10 #787

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ ifeq ($(CXX_IS_CLANG),true)
CLANG_WORKS := true
endif
else
ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt 10; echo $$?),0)
ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt 11; echo $$?),0)
GCC_WORKS := true
endif
endif
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa

## Compilation Linux

Requires at least GCC 10 or Clang 16.
Requires at least GCC 11 or Clang 16.

The makefile also needs GNU coreutils and `sed` (should already be installed on any modern distribution).

Expand Down Expand Up @@ -552,7 +552,7 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa

## Compilation macOS OSX

Requires at least GCC 10 or Clang 16.
Requires at least GCC 11 or Clang 16.

With GCC, version 12 (or better) is needed for macOS Ventura. If you get linker errors on Ventura you'll need to upgrade your command line tools (Version 14.0) is bugged.

Expand Down Expand Up @@ -723,7 +723,7 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa

## Compilation FreeBSD

Requires at least GCC 10 or Clang 16.
Requires at least GCC 11 or Clang 16.

Note that GNU make (`gmake`) is required to compile on FreeBSD.

Expand Down Expand Up @@ -904,7 +904,7 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa

## Compilation OpenBSD

Requires at least GCC 10.
Requires at least GCC 11.

Note that GNU make (`gmake`) is required to compile on OpenBSD.

Expand Down
26 changes: 5 additions & 21 deletions src/btop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,13 @@ tab-size = 4
#include <tuple>
#include <regex>
#include <chrono>
#include <semaphore>
#include <utility>
#ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h>
#include <mach-o/dyld.h>
#include <limits.h>
#endif
#if !defined(__clang__) && __GNUC__ < 11
#include <semaphore.h>
#else
#include <semaphore>
#endif

#include "btop_shared.hpp"
#include "btop_tools.hpp"
Expand Down Expand Up @@ -424,18 +420,7 @@ namespace Runner {
atomic<bool> redraw (false);
atomic<bool> coreNum_reset (false);

//* Setup semaphore for triggering thread to do work
#if !defined(__clang__) && __GNUC__ < 11
sem_t do_work;
inline void thread_sem_init() { sem_init(&do_work, 0, 0); }
inline void thread_wait() { sem_wait(&do_work); }
inline void thread_trigger() { sem_post(&do_work); }
#else
std::binary_semaphore do_work(0);
inline void thread_sem_init() { ; }
inline void thread_wait() { do_work.acquire(); }
inline void thread_trigger() { do_work.release(); }
#endif
std::binary_semaphore sem { 0 };

//* RAII wrapper for pthread_mutex locking
class thread_lock {
Expand Down Expand Up @@ -553,7 +538,7 @@ namespace Runner {

//* ----------------------------------------------- THREAD LOOP -----------------------------------------------
while (not Global::quitting) {
thread_wait();
sem.acquire();
atomic_wait_for(active, true, 5000);
if (active) {
Global::exit_error_msg = "Runner thread failed to get active lock!";
Expand Down Expand Up @@ -840,7 +825,7 @@ namespace Runner {

if (Menu::active and not current_conf.background_update) Global::overlay.clear();

thread_trigger();
sem.release();
atomic_wait_for(active, false, 10);
}

Expand Down Expand Up @@ -868,7 +853,7 @@ namespace Runner {
clean_quit(1);
}
}
thread_trigger();
sem.release();
atomic_wait_for(active, false, 100);
atomic_wait_for(active, true, 100);
}
Expand Down Expand Up @@ -1077,7 +1062,6 @@ int main(int argc, char **argv) {
pthread_sigmask(SIG_BLOCK, &mask, &Input::signal_mask);

//? Start runner thread
Runner::thread_sem_init();
if (pthread_create(&Runner::runner_id, nullptr, &Runner::_runner, nullptr) != 0) {
Global::exit_error_msg = "Failed to create _runner thread!";
clean_quit(1);
Expand Down
Loading