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

[DEV] test1

Browse Source
This commit is contained in:
Edouard DUPIN
2016-02-18 22:01:36 +01:00
parent 95743826f6
commit 7a712a8d8c
4 changed files with 295 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
esignal/details/Signal.cpp
View File

@@ -13,152 +13,9 @@
#undef __class__
#define __class__ "Signal<void>"
esignal::Signal<void>::Signal(esignal::Interface& _signalInterfaceLink,
const std::string& _name,
const std::string& _description,
bool _periodic) :
esignal::Base(_signalInterfaceLink, _name, _description, _periodic) {
}
esignal::Signal<void>::~Signal() {
}
void esignal::Signal<void>::connect(std::shared_ptr<void> _obj, std::function<void()> _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));
}
}
void esignal::Signal<void>::connect(std::function<void()> _function ) {
if (m_callInProgress == 0) {
m_callerListDirect.push_back(_function);
} else {
m_callerListDirectInCallback.push_back(_function);
}
}
void esignal::Signal<void>::release(std::shared_ptr<void> _obj) {
auto it(m_callerList.begin());
if (m_callInProgress == 0) {
// Remove from the list :
while(it != m_callerList.end()) {
if (it->first.lock() == _obj) {
//ESIGNAL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "'");
it = m_callerList.erase(it);
} else {
++it;
}
}
} else {
// just remove weak poointer
while(it != m_callerList.end()) {
if (it->first.lock() == _obj) {
//ESIGNAL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "' (delayed)");
it->first.reset();
} else {
++it;
}
}
m_someOneRemoveInCall = true;
}
// remove from add list in callback progress
it = m_callerListInCallback.begin();
while(it != m_callerListInCallback.end()) {
if (it->first.lock() == _obj) {
//ESIGNAL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "' (notActive)");
it = m_callerListInCallback.erase(it);
} else {
++it;
}
}
}
void esignal::Signal<void>::emit() {
#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 << "' to: " << m_callerList.size() << " element(s)");
} else {
ESIGNAL_DEBUG(esignal::logIndent(m_signalCallLevel-1) << "emit signal{" << tmpID << "} : signal='" << m_name << "' 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();
++it;
}
}
{
auto it(m_callerListDirect.begin());
while (it != m_callerListDirect.end()) {
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)();
++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) {
if (it.first.expired() == false) {
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();
}
}
size_t esignal::Signal<void>::getNumberConnected() {
return m_callerList.size() + m_callerListDirect.size();;
}
#if 0
// void generic signal
template class esignal::Signal<void>;
//template class esignal::Signal<void>;
// std generic signal
template class esignal::Signal<bool>;
template class esignal::Signal<std::string>;
@@ -194,3 +51,4 @@ template class esignal::Signal<etk::Color<unsigned char,3>>;
template class esignal::Signal<etk::Color<float,4>>;
template class esignal::Signal<etk::Color<float,3>>;
#endif

35
esignal/details/Signal.hxx
View File

@@ -8,23 +8,23 @@
#pragma once
#include <esignal/Signal.h>
#include <functional>
#include <memory>
#undef __class__
#define __class__ "Signal<T>"
template<typename T> esignal::Signal<T>::Signal(esignal::Interface& _signalInterfaceLink,
const std::string& _name,
const std::string& _description,
bool _periodic) :
esignal::Base(_signalInterfaceLink, _name, _description, _periodic) {
#if 0
template<typename... T> esignal::Signal<T...>::Signal() :
m_callInProgress(0),
m_someOneRemoveInCall(false) {
}
template<typename T> esignal::Signal<T>::~Signal() {
template<typename... T> esignal::Signal<T...>::~Signal() {
}
template<typename T> void esignal::Signal<T>::connect(std::shared_ptr<void> _obj, std::function<void(const T&)> _function ) {
template<typename... T> 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 {
@@ -32,7 +32,7 @@ template<typename T> void esignal::Signal<T>::connect(std::shared_ptr<void> _obj
}
}
template<typename T> void esignal::Signal<T>::connect(std::function<void(const T&)> _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 {
@@ -40,7 +40,7 @@ template<typename T> void esignal::Signal<T>::connect(std::function<void(const T
}
}
template<typename T> bool esignal::Signal<T>::isRegistered(std::shared_ptr<void> _obj) {
template<typename... T> bool esignal::Signal<T...>::isRegistered(std::shared_ptr<void> _obj) {
if (_obj == nullptr) {
return false;
}
@@ -59,7 +59,7 @@ template<typename T> bool esignal::Signal<T>::isRegistered(std::shared_ptr<void>
return false;
}
template<typename T> void esignal::Signal<T>::release(std::shared_ptr<void> _obj) {
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());
@@ -93,16 +93,16 @@ template<typename T> void esignal::Signal<T>::release(std::shared_ptr<void> _obj
}
}
template<typename T> void esignal::Signal<T>::emit(const T& _data) {
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)");
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)");
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());
@@ -118,7 +118,7 @@ template<typename T> void esignal::Signal<T>::emit(const T& _data) {
} else {
ESIGNAL_DEBUG(esignal::logIndent(m_signalCallLevel-1) << " signal{" << tmpID << "} :");// [" << destObject->getId() << "]" << destObject->getObjectType());
}
it->second(_data);
it->second(_data...);
++it;
}
}
@@ -130,7 +130,7 @@ template<typename T> void esignal::Signal<T>::emit(const T& _data) {
} else {
ESIGNAL_DEBUG(esignal::logIndent(m_signalCallLevel-1) << "X signal{" << tmpID << "} :");// [" << destObject->getId() << "]" << destObject->getObjectType());
}
(*it)(_data);
(*it)(_data...);
++it;
}
}
@@ -166,9 +166,10 @@ template<typename T> void esignal::Signal<T>::emit(const T& _data) {
}
}
template<typename T> size_t esignal::Signal<T>::getNumberConnected() {
template<typename... T> size_t esignal::Signal<T...>::getNumberConnected() {
return m_callerList.size() + m_callerListDirect.size();
}
#endif