atria-soft/esignal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] better coverage > 84.6%

Browse Source
This commit is contained in:
Edouard DUPIN
2016-02-25 22:42:23 +01:00
parent 1f346fd313
commit abb334a3a2
18 changed files with 539 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esignal/details/ISignal.hxx
View File

@@ -10,8 +10,8 @@
#include <esignal/ISignal.h>
#include <esignal/details/Signal.hxx>
template<class... Args>
esignal::ISignal<Args...>::ISignal(esignal::Interface& _signalInterfaceLink,
template<class... T_ARGS>
esignal::ISignal<T_ARGS...>::ISignal(esignal::Interface& _signalInterfaceLink,
const std::string& _name,
const std::string& _description):
m_signalInterfaceLink(_signalInterfaceLink),
@@ -21,18 +21,18 @@ esignal::ISignal<Args...>::ISignal(esignal::Interface& _signalInterfaceLink,
m_signalInterfaceLink.signalAdd(this);
}
template<class... Args>
esignal::ISignal<Args...>::~ISignal() {
template<class... T_ARGS>
esignal::ISignal<T_ARGS...>::~ISignal() {
m_signalInterfaceLink.signalRemove(this);
}
template<class... Args>
const std::string& esignal::ISignal<Args...>::getName() const {
template<class... T_ARGS>
const std::string& esignal::ISignal<T_ARGS...>::getName() const {
return m_name;
}
template<class... Args>
const std::string& esignal::ISignal<Args...>::getDescription() const {
template<class... T_ARGS>
const std::string& esignal::ISignal<T_ARGS...>::getDescription() const {
return m_description;
}

28
esignal/details/LockSharedPtrRef.hxx
View File

@@ -7,28 +7,35 @@
*/
#include <esignal/LockSharedPtrRef.h>
#include <esignal/debug.h>
template<class TYPE>
esignal::LockSharedPtrRef<TYPE>::LockSharedPtrRef(TYPE* _pointer) :
m_counter(nullptr) {
ESIGNAL_VERBOSE("LockSharedPtrRef new [START] " << int64_t(_pointer));
if (_pointer != nullptr) {
m_counter = new RefCount<TYPE>(_pointer);
m_counter->inc();
}
ESIGNAL_VERBOSE("LockSharedPtrRef new [STOP]");
}
template<class TYPE>
esignal::LockSharedPtrRef<TYPE>::LockSharedPtrRef(const LockSharedPtrRef<TYPE>& _obj) :
m_counter(_obj.m_counter) {
ESIGNAL_VERBOSE("LockSharedPtrRef new [START] ref ...");
if (m_counter == nullptr) {
return;
}
m_counter->inc();
ESIGNAL_VERBOSE("LockSharedPtrRef new [STOP]");
}
template<class TYPE>
esignal::LockSharedPtrRef<TYPE>& esignal::LockSharedPtrRef<TYPE>::operator=(const esignal::LockSharedPtrRef<TYPE>& _obj) {
ESIGNAL_VERBOSE("LockSharedPtrRef copy [START]");
if (&_obj == this) {
ESIGNAL_VERBOSE("LockSharedPtrRef copy [STOP] auto-copy");
return *this;
}
if (m_counter != nullptr) {
@@ -37,41 +44,57 @@ esignal::LockSharedPtrRef<TYPE>& esignal::LockSharedPtrRef<TYPE>::operator=(cons
}
m_counter = _obj.m_counter;
if (m_counter == nullptr) {
ESIGNAL_VERBOSE("LockSharedPtrRef copy [STOP] no counter");
return *this;
}
m_counter->inc();
ESIGNAL_VERBOSE("LockSharedPtrRef copy [STOP]");
return *this;
}
template<class TYPE>
esignal::LockSharedPtrRef<TYPE>::LockSharedPtrRef(LockSharedPtrRef<TYPE>&& _obj) :
m_counter(std::move(_obj.m_counter)) {
ESIGNAL_VERBOSE("LockSharedPtrRef move [DONE]");
}
template<class TYPE>
esignal::LockSharedPtrRef<TYPE>::~LockSharedPtrRef() {
ESIGNAL_VERBOSE("LockSharedPtrRef delete [START]");
rmShared();
ESIGNAL_VERBOSE("LockSharedPtrRef delete [STOP]");
}
template<class TYPE>
void esignal::LockSharedPtrRef<TYPE>::rmShared() {
ESIGNAL_VERBOSE("LockSharedPtrRef rmShared [START]");
if (m_counter == nullptr) {
return;
}
int64_t count = m_counter->dec();
if (count > 0) {
m_counter = nullptr;
return;
}
delete m_counter;
m_counter = nullptr;
ESIGNAL_VERBOSE("LockSharedPtrRef rmShared [STOP]");
}
template<class TYPE>
void esignal::LockSharedPtrRef<TYPE>::removeData() {
ESIGNAL_VERBOSE("LockSharedPtrRef removeData [START]");
if (m_counter != nullptr) {
m_counter->remove();
}
ESIGNAL_VERBOSE("LockSharedPtrRef removeData [STOP]");
}
template<class TYPE>
void esignal::LockSharedPtrRef<TYPE>::disconnect(std::size_t _uid) {
ESIGNAL_VERBOSE("LockSharedPtrRef disconnect [START] " << _uid);
if (m_counter == nullptr) {
ESIGNAL_VERBOSE("LockSharedPtrRef disconnect [STOP] No counter");
return;
}
m_counter->lock();
@@ -80,10 +103,13 @@ void esignal::LockSharedPtrRef<TYPE>::disconnect(std::size_t _uid) {
val->disconnect(_uid);
}
m_counter->unlock();
rmShared();
ESIGNAL_VERBOSE("LockSharedPtrRef disconnect [STOP]");
}
template<class TYPE>
bool esignal::LockSharedPtrRef<TYPE>::isAlive() {
ESIGNAL_VERBOSE("LockSharedPtrRef isAlive [DONE] ");
return m_counter != nullptr;
}

14
esignal/details/RefCount.hxx
View File

@@ -8,56 +8,70 @@
#pragma once
#include <esignal/RefCount.h>
#include <esignal/debug.h>
template<class TYPE>
esignal::RefCount<TYPE>::RefCount(TYPE* _data) :
m_count(0),
m_data(_data) {
ESIGNAL_VERBOSE(int64_t(this) << " RefCount New : " << int64_t(_data));
// nothing to do.
}
template<class TYPE>
esignal::RefCount<TYPE>::~RefCount() {
ESIGNAL_VERBOSE(int64_t(this) << " RefCount delete");
m_data = nullptr;
}
template<class TYPE>
void esignal::RefCount<TYPE>::lock() {
ESIGNAL_VERBOSE(int64_t(this) << " RefCount LOCK [START]");
m_lock.lock();
ESIGNAL_VERBOSE(int64_t(this) << " RefCount LOCK [STOP]");
}
template<class TYPE>
void esignal::RefCount<TYPE>::unlock() {
ESIGNAL_VERBOSE(int64_t(this) << " RefCount UN-LOCK [START]");
m_lock.unlock();
ESIGNAL_VERBOSE(int64_t(this) << " RefCount UN-LOCK [STOP]");
}
template<class TYPE>
void esignal::RefCount<TYPE>::inc() {
ESIGNAL_VERBOSE(int64_t(this) << " RefCount INC [START] " << m_count);
lock();
m_count++;
unlock();
ESIGNAL_VERBOSE(int64_t(this) << " RefCount INC [STOP] " << m_count);
}
template<class TYPE>
int64_t esignal::RefCount<TYPE>::dec() {
ESIGNAL_VERBOSE(int64_t(this) << " RefCount DEC [START] " << m_count);
int64_t val;
lock();
m_count--;
val = m_count;
unlock();
ESIGNAL_VERBOSE(int64_t(this) << " RefCount DEC [STOP] " << m_count);
return val;
}
template<class TYPE>
int64_t esignal::RefCount<TYPE>::getCount() const {
ESIGNAL_VERBOSE(int64_t(this) << " RefCount get count " << m_count);
return m_count;
}
template<class TYPE>
void esignal::RefCount<TYPE>::remove() {
ESIGNAL_VERBOSE(int64_t(this) << " RefCount remove [START]");
lock();
m_data = nullptr;
unlock();
ESIGNAL_VERBOSE(int64_t(this) << " RefCount remove [STOP]");
}
template<class TYPE>

198
esignal/details/Signal.hxx
View File

@@ -13,43 +13,67 @@
#define __class__ "Signal<T_ARGS>"
template<typename... T_ARGS>
esignal::Signal<T_ARGS...>::Signal():
esignal::Signal<T_ARGS...>::Signal(ObserverConnection _countObs):
esignal::Base(_countObs),
m_callInProgress(0) {
// nothing to do
}
template<typename... T_ARGS>
void esignal::Signal<T_ARGS...>::emit(const T_ARGS&... _args) {
#ifdef DEBUG
int32_t tmpID = s_uidSignalEmit++;
#endif
// TODO : Add protection ... but how ...
m_callInProgress++;
ESIGNAL_DEBUG(esignal::logIndent(m_callInProgress-1) << " signal{" << tmpID << "} :");
for (size_t iii=0; iii < m_executors.size(); ++iii) {
m_executors[iii]->emit(_args...);
}
if (m_callInProgress == 1) {
bool haveRemove = false;
auto it = m_executors.begin();
while (it != m_executors.end()) {
if ( *it == nullptr
|| (*it)->m_removed == true) {
it = m_executors.erase(it);
haveRemove = true;
continue;
}
++it;
}
if (haveRemove == true) {
if (m_connectionObserver!=nullptr) {
m_connectionObserver(m_executors.size());
}
}
}
m_callInProgress--;
}
template<typename... T_ARGS>
void esignal::Signal<T_ARGS...>::removeIfPossible() {
if (m_callInProgress != 0) {
return;
}
bool haveRemove = false;
auto it = m_executors.begin();
while (it != m_executors.end()) {
if ( *it == nullptr
|| (*it)->m_removed == true) {
it = m_executors.erase(it);
haveRemove = true;
continue;
}
++it;
}
if (haveRemove == true) {
if (m_connectionObserver!=nullptr) {
m_connectionObserver(m_executors.size());
}
}
}
template<typename... T_ARGS>
@@ -85,7 +109,10 @@ bool esignal::Signal<T_ARGS...>::empty() const {
template<typename... T_ARGS>
void esignal::Signal<T_ARGS...>::clear() {
m_executors.clear();
for (size_t iii=0; iii < m_executors.size(); ++iii) {
m_executors[iii]->m_removed = true;
}
removeIfPossible();
}
@@ -157,170 +184,3 @@ bool esignal::Signal<T_ARGS...>::ExecutorShared::isSharedPtr(const std::shared_p
}
#if 0
template<typename... T> esignal::Signal<T...>::Signal() :
m_callInProgress(0),
m_someOneRemoveInCall(false) {
}
template<typename... T> esignal::Signal<T...>::~Signal() {
}
void esignal::Signal<T...>::connect(std::shared_ptr<void> _obj, std::function<void(const T&...)> _function ) {
if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), _function));
} else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), _function));
}
}
template<typename... T> void esignal::Signal<T...>::connect(std::function<void(const T&...)> _function ) {
if (m_callInProgress == 0) {
m_callerListDirect.push_back(_function);
} else {
m_callerListDirectInCallback.push_back(_function);
}
}
template<typename... T> bool esignal::Signal<T...>::isRegistered(std::shared_ptr<void> _obj) {
if (_obj == nullptr) {
return false;
}
for (auto &it : m_callerList) {
std::shared_ptr<void> obj = it.first.lock();
if (obj == _obj) {
return true;
}
}
for (auto &it : m_callerListInCallback) {
std::shared_ptr<void> obj = it.first.lock();
if (obj == _obj) {
return true;
}
}
return false;
}
template<typename... T> void esignal::Signal<T...>::release(std::shared_ptr<void> _obj) {
if (m_callInProgress == 0) {
// Remove from the list :
auto it(m_callerList.begin());
while(it != m_callerList.end()) {
if (it->first.lock() == _obj) {
it = m_callerList.erase(it);
} else {
++it;
}
}
} else {
// just remove weak poointer
auto it(m_callerList.begin());
while(it != m_callerList.end()) {
if (it->first.lock() == _obj) {
it->first.reset();
} else {
++it;
}
}
m_someOneRemoveInCall = true;
}
// remove from add list in callback progress
auto it = m_callerListInCallback.begin();
while(it != m_callerListInCallback.end()) {
if (it->first.lock() == _obj) {
it = m_callerListInCallback.erase(it);
} else {
++it;
}
}
}
template<typename... T> void esignal::Signal<T...>::emit(const T&... _data) {
#ifdef DEBUG
m_signalCallLevel++;
int32_t tmpID = m_uidSignal++;
#endif
m_callInProgress++;
if (m_periodic == true) {
ESIGNAL_VERBOSE(esignal::logIndent(m_signalCallLevel-1) << "emit signal{" << tmpID << "} : signal='" << m_name << "' data='" << /*etk::to_string(_data) <<*/ "' to: " << m_callerList.size() << " element(s)");
} else {
ESIGNAL_DEBUG(esignal::logIndent(m_signalCallLevel-1) << "emit signal{" << tmpID << "} : signal='" << m_name << "' data='" << /*etk::to_string(_data) <<*/ "' to: " << m_callerList.size() << " element(s)");
}
{
auto it(m_callerList.begin());
while (it != m_callerList.end()) {
std::shared_ptr<void> destObject = it->first.lock();
if (destObject == nullptr) {
it = m_callerList.erase(it);
ESIGNAL_DEBUG(esignal::logIndent(m_signalCallLevel-1) << " nullptr dest");
continue;
}
if (m_periodic == true) {
ESIGNAL_VERBOSE(esignal::logIndent(m_signalCallLevel-1) << " signal{" << tmpID << "} :");// [" << destObject->getId() << "]" << destObject->getObjectType());
} else {
ESIGNAL_DEBUG(esignal::logIndent(m_signalCallLevel-1) << " signal{" << tmpID << "} :");// [" << destObject->getId() << "]" << destObject->getObjectType());
}
it->second(_data...);
++it;
}
}
{
auto it(m_callerListDirect.begin());
while (it != m_callerListDirect.end()) {
if (m_periodic == true) {
ESIGNAL_VERBOSE(esignal::logIndent(m_signalCallLevel-1) << "X signal{" << tmpID << "} :");// [" << destObject->getId() << "]" << destObject->getObjectType());
} else {
ESIGNAL_DEBUG(esignal::logIndent(m_signalCallLevel-1) << "X signal{" << tmpID << "} :");// [" << destObject->getId() << "]" << destObject->getObjectType());
}
(*it)(_data...);
++it;
}
}
m_callInProgress--;
#ifdef DEBUG
m_signalCallLevel--;
#endif
// Remove element in call phase:
if (m_someOneRemoveInCall == true) {
m_someOneRemoveInCall = false;
// Remove from the list :
auto it(m_callerList.begin());
while(it != m_callerList.end()) {
if (it->first.expired() == true) {
it = m_callerList.erase(it);
} else {
++it;
}
}
}
// add element in call phase:
if (m_callerListInCallback.size() > 0) {
for (auto &it : m_callerListInCallback) {
m_callerList.push_back(it);
}
m_callerListInCallback.clear();
}
if (m_callerListDirectInCallback.size() > 0) {
for (auto &it : m_callerListDirectInCallback) {
m_callerListDirect.push_back(it);
}
m_callerListDirectInCallback.clear();
}
}
template<typename... T> size_t esignal::Signal<T...>::getNumberConnected() {
return m_callerList.size() + m_callerListDirect.size();
}
#endif