diff --git a/ChangeLog b/ChangeLog index c8ef30e9..0f1913ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ ebusd - ChangeLog ----------------- +2014-10-21 Roland Jax +* class EBusLoop: recvBuffer removed. + 2014-10-09 Roland Jax * class BaseLoop, EBusLoop: polling functionality implemented. * Version changed from 0.3.0 to 0.4.0 diff --git a/README b/README index cc0a85ff..58e6aa89 100644 --- a/README +++ b/README @@ -31,6 +31,7 @@ Dependency ---------- * libebus (https://github.com/yuhu-/libebus) * glibc + * pkgconfig Build diff --git a/lib/wqueue.h b/lib/wqueue.h index be40507b..159f73cf 100644 --- a/lib/wqueue.h +++ b/lib/wqueue.h @@ -30,13 +30,13 @@ public: WQueue() { pthread_mutex_init(&m_mutex, NULL); - pthread_cond_init(&m_condv, NULL); + pthread_cond_init(&m_cond, NULL); } ~WQueue() { pthread_mutex_destroy(&m_mutex); - pthread_cond_destroy(&m_condv); + pthread_cond_destroy(&m_cond); } void add(T item) @@ -45,7 +45,7 @@ public: m_queue.push_back(item); - pthread_cond_signal(&m_condv); + pthread_cond_signal(&m_cond); pthread_mutex_unlock(&m_mutex); } @@ -54,7 +54,7 @@ public: pthread_mutex_lock(&m_mutex); while (m_queue.size() == 0) - pthread_cond_wait(&m_condv, &m_mutex); + pthread_cond_wait(&m_cond, &m_mutex); T item = m_queue.front(); m_queue.pop_front(); @@ -78,7 +78,7 @@ public: private: std::list m_queue; pthread_mutex_t m_mutex; - pthread_cond_t m_condv; + pthread_cond_t m_cond; };