coffee/cpp-ipc
1
0
Fork 0
mirror of https://github.com/mutouyun/cpp-ipc.git synced 2025-12-07 01:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove Wno-unused-variable

Browse Source
This commit is contained in:
mutouyun 2019-01-24 23:20:50 +08:00
parent 67972a8c7c
commit 512de713f1
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/ipc.pro
View File

@ -4,7 +4,7 @@ TARGET = ipc
CONFIG -= qt CONFIG -= qt
CONFIG += c++14 c++1z # may be useless CONFIG += c++14 c++1z # may be useless
!msvc:QMAKE_CXXFLAGS += -Wno-attributes -Wno-missing-field-initializers -Wno-unused-variable !msvc:QMAKE_CXXFLAGS += -Wno-attributes -Wno-missing-field-initializers
DEFINES += __IPC_LIBRARY__ DEFINES += __IPC_LIBRARY__
DESTDIR = ../output DESTDIR = ../output

25
src/platform/waiter_linux.h
View File

@ -18,12 +18,7 @@ class waiter {
std::atomic<unsigned> counter_ { 0 }; std::atomic<unsigned> counter_ { 0 };
public: public:
using handle_t = void*; using handle_t = waiter*;
private:
constexpr static waiter* waiter_cast(handle_t h) {
return static_cast<waiter*>(h);
}
public: public:
constexpr static handle_t invalid() { constexpr static handle_t invalid() {
@ -73,23 +68,21 @@ public:
void close(handle_t h) { void close(handle_t h) {
if (h == invalid()) return; if (h == invalid()) return;
auto w = waiter_cast(h); if (h->counter_.fetch_sub(1, std::memory_order_acq_rel) == 1) {
if (w->counter_.fetch_sub(1, std::memory_order_acq_rel) == 1) {
::printf("destroy...\n"); ::printf("destroy...\n");
::pthread_cond_destroy (&(w->cond_ )); ::pthread_cond_destroy (&(h->cond_ ));
::pthread_mutex_destroy(&(w->mutex_)); ::pthread_mutex_destroy(&(h->mutex_));
::printf("destroy end...\n"); ::printf("destroy end...\n");
} }
} }
bool wait(handle_t h) { bool wait(handle_t h) {
if (h == invalid()) return false; if (h == invalid()) return false;
auto w = waiter_cast(h); if (::pthread_mutex_lock(&(h->mutex_)) != 0) {
if (::pthread_mutex_lock(&(w->mutex_)) != 0) {
return false; return false;
} }
IPC_UNUSED_ auto guard = unique_ptr(&(w->mutex_), ::pthread_mutex_unlock); IPC_UNUSED_ auto guard = unique_ptr(&(h->mutex_), ::pthread_mutex_unlock);
if (::pthread_cond_wait(&(w->cond_), &(w->mutex_)) != 0) { if (::pthread_cond_wait(&(h->cond_), &(h->mutex_)) != 0) {
return false; return false;
} }
return true; return true;
@ -97,12 +90,12 @@ public:
void notify(handle_t h) { void notify(handle_t h) {
if (h == invalid()) return; if (h == invalid()) return;
::pthread_cond_signal(&(waiter_cast(h)->cond_)); ::pthread_cond_signal(&(h->cond_));
} }
void broadcast(handle_t h) { void broadcast(handle_t h) {
if (h == invalid()) return; if (h == invalid()) return;
::pthread_cond_broadcast(&(waiter_cast(h)->cond_)); ::pthread_cond_broadcast(&(h->cond_));
} }
}; };