CC-tea/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2026-04-20 18:27:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop workarounds for GCC 10

Browse Source 
GCC 10 and even 11 don't receive updates anymore.

Using Debian stable as the baseline (as done previously), most major
distributions have a recent enought toolchain with GCC 11 or later. The
same applies for LLVM.

Signed-off-by: Steffen Winter <steffen.winter@proton.me>
This commit is contained in:
Steffen Winter
2025-04-19 14:43:23 +02:00
committed by Steffen
parent fa5189c6e6
commit b21b1daa84
3 changed files with 6 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/btop.cpp
View File

@@ -36,16 +36,13 @@ tab-size = 4
#include <regex>
#include <chrono>
#include <utility>
#include <semaphore>
#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"
@@ -456,17 +453,10 @@ namespace Runner {
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() { ; }
// TODO: This can be made a local without too much effort.
std::binary_semaphore do_work { 0 };
inline void thread_wait() { do_work.acquire(); }
inline void thread_trigger() { do_work.release(); }
#endif
//* RAII wrapper for pthread_mutex locking
class thread_lock {
@@ -1121,8 +1111,6 @@ int main(int argc, char **argv) {
sigaddset(&mask, SIGUSR1);
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);