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

[DEV] remove specificity of signal to Object to shared_ptr<void>

Browse Source
This commit is contained in:
Edouard DUPIN 2014-10-28 23:13:38 +01:00
parent dbecf900be
commit 00b385f433
4 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
sources/ewol/object/Signal.h
View File

@ -22,9 +22,9 @@ namespace ewol {
#define __class__ "object::Signal<T>" #define __class__ "object::Signal<T>"
template<typename T> class Signal : public SignalBase { template<typename T> class Signal : public SignalBase {
private: private:
std::vector<std::pair<std::weak_ptr<ewol::Object>, std::vector<std::pair<std::weak_ptr<void>,
std::function<void(const T&)>>> m_callerList; // current list of binded element std::function<void(const T&)>>> m_callerList; // current list of binded element
std::vector<std::pair<std::weak_ptr<ewol::Object>, std::vector<std::pair<std::weak_ptr<void>,
std::function<void(const T&)>>> m_callerListInCallback; // temporaty list (when add one in call process) std::function<void(const T&)>>> m_callerListInCallback; // temporaty list (when add one in call process)
public: public:
/** /**
@ -63,44 +63,44 @@ namespace ewol {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, args2))); m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, args2)));
} }
*/ */
template<class TYPE> template<class TYPE_CLASS, class TYPE>
void bind(std::shared_ptr<ewol::Object> _obj, void (TYPE::*_func)(const T&)) { void bind(std::shared_ptr<TYPE_CLASS> _obj, void (TYPE::*_func)(const T&)) {
std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj); std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj);
if (obj2 == nullptr) { if (obj2 == nullptr) {
EWOL_ERROR("Can not bind signal ..."); EWOL_ERROR("Can not bind signal ...");
return; return;
} }
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1))); m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1)));
} else { } else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1))); m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1)));
} }
} }
// TODO : Rework this when I understand the use of variadic template with std::function // TODO : Rework this when I understand the use of variadic template with std::function
template<class TYPE, typename TYPE2> template<class TYPE_CLASS, class TYPE, typename TYPE2>
void bind1(std::shared_ptr<ewol::Object> _obj, void (TYPE::*_func)(const T&, const TYPE2&), TYPE2 _param1) { void bind1(std::shared_ptr<TYPE_CLASS> _obj, void (TYPE::*_func)(const T&, const TYPE2&), TYPE2 _param1) {
std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj); std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj);
if (obj2 == nullptr) { if (obj2 == nullptr) {
EWOL_ERROR("Can not bind signal ..."); EWOL_ERROR("Can not bind signal ...");
return; return;
} }
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, _param1))); m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, _param1)));
} else { } else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, _param1))); m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, _param1)));
} }
} }
template<class TYPE, typename TYPE2, typename TYPE3> template<class TYPE_CLASS, class TYPE, typename TYPE2, typename TYPE3>
void bind2(std::shared_ptr<ewol::Object> _obj, void (TYPE::*_func)(const T&, const TYPE2&, const TYPE3&), TYPE2 _param1, TYPE3 _param2) { void bind2(std::shared_ptr<TYPE_CLASS> _obj, void (TYPE::*_func)(const T&, const TYPE2&, const TYPE3&), TYPE2 _param1, TYPE3 _param2) {
std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj); std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj);
if (obj2 == nullptr) { if (obj2 == nullptr) {
EWOL_ERROR("Can not bind signal ..."); EWOL_ERROR("Can not bind signal ...");
return; return;
} }
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, _param1, _param2))); m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, _param1, _param2)));
} else { } else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, _param1, _param2))); m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), std::placeholders::_1, _param1, _param2)));
} }
} }
/** /**
@ -109,18 +109,18 @@ namespace ewol {
* @param[in] _func functor to call (do it yourself) * @param[in] _func functor to call (do it yourself)
* @example signalXXXX.connect(shared_from_this(), std::bind(&ClassName::onCallbackXXX, this, std::placeholders::_1)); * @example signalXXXX.connect(shared_from_this(), std::bind(&ClassName::onCallbackXXX, this, std::placeholders::_1));
*/ */
void connect(std::shared_ptr<ewol::Object> _obj, std::function<void(const T&)> _function ) { void connect(std::shared_ptr<void> _obj, std::function<void(const T&)> _function ) {
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), _function)); m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), _function));
} else { } else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), _function)); m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), _function));
} }
} }
/** /**
* @brief remove link on the signal. * @brief remove link on the signal.
* @param[in] _obj shared pointer on the removing object * @param[in] _obj shared pointer on the removing object
*/ */
void release(std::shared_ptr<ewol::Object> _obj) { void release(std::shared_ptr<void> _obj) {
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
// Remove from the list : // Remove from the list :
auto it(m_callerList.begin()); auto it(m_callerList.begin());
@ -160,7 +160,7 @@ namespace ewol {
void emit(const T& _data) { void emit(const T& _data) {
m_signalCallLeval++; m_signalCallLeval++;
m_callInProgress++; m_callInProgress++;
#ifdef DEBUG #if 0
int32_t tmpID = m_uidSignal++; int32_t tmpID = m_uidSignal++;
ewol::Object* srcObject = dynamic_cast<ewol::Object*>(&m_objectLink); ewol::Object* srcObject = dynamic_cast<ewol::Object*>(&m_objectLink);
if (srcObject != nullptr) { if (srcObject != nullptr) {
@ -170,13 +170,13 @@ namespace ewol {
} }
#endif #endif
for (auto &it : m_callerList) { for (auto &it : m_callerList) {
std::shared_ptr<ewol::Object> destObject = it.first.lock(); std::shared_ptr<void> destObject = it.first.lock();
if (destObject == nullptr) { if (destObject == nullptr) {
// TODO : Remove instance ... // TODO : Remove instance ...
EWOL_DEBUG(ewol::object::logIndent(m_signalCallLeval-1) << " nullptr dest"); EWOL_DEBUG(ewol::object::logIndent(m_signalCallLeval-1) << " nullptr dest");
continue; continue;
} }
#ifdef DEBUG #if 0
if (srcObject != nullptr) { if (srcObject != nullptr) {
EWOL_DEBUG(ewol::object::logIndent(m_signalCallLeval-1) << " signal{" << tmpID << "} : [" << destObject->getId() << "]" << destObject->getObjectType()); EWOL_DEBUG(ewol::object::logIndent(m_signalCallLeval-1) << " signal{" << tmpID << "} : [" << destObject->getId() << "]" << destObject->getObjectType());
} else { } else {
@ -216,8 +216,8 @@ namespace ewol {
#define __class__ "object::Signal<void>" #define __class__ "object::Signal<void>"
template<> class Signal<void> : public SignalBase { template<> class Signal<void> : public SignalBase {
private: private:
std::vector<std::pair<std::weak_ptr<ewol::Object>, std::function<void()>>> m_callerList; std::vector<std::pair<std::weak_ptr<void>, std::function<void()>>> m_callerList;
std::vector<std::pair<std::weak_ptr<ewol::Object>, std::function<void()>>> m_callerListInCallback; std::vector<std::pair<std::weak_ptr<void>, std::function<void()>>> m_callerListInCallback;
public: public:
/** /**
* @brief Create a parameter with a specific type. * @brief Create a parameter with a specific type.
@ -245,43 +245,43 @@ namespace ewol {
* @param[in] _func Link on the fuction that might be called (inside a class) * @param[in] _func Link on the fuction that might be called (inside a class)
* @example signalXXXX.connect(shared_from_this(), &ClassName::onCallbackXXX); * @example signalXXXX.connect(shared_from_this(), &ClassName::onCallbackXXX);
*/ */
template<class TYPE> template<class TYPE_CLASS, class TYPE>
void bind(std::shared_ptr<ewol::Object> _obj, void (TYPE::*_func)()) { void bind(std::shared_ptr<TYPE_CLASS> _obj, void (TYPE::*_func)()) {
std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj); std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj);
if (obj2 == nullptr) { if (obj2 == nullptr) {
EWOL_ERROR("Can not bind signal ..."); EWOL_ERROR("Can not bind signal ...");
return; return;
} }
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get()))); m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get())));
} else { } else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get()))); m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get())));
} }
} }
template<class TYPE, class TYPE2> template<class TYPE_CLASS, class TYPE, class TYPE2>
void bind1(std::shared_ptr<ewol::Object> _obj, void (TYPE::*_func)(TYPE2), TYPE2 _param1) { void bind1(std::shared_ptr<TYPE_CLASS> _obj, void (TYPE::*_func)(TYPE2), TYPE2 _param1) {
std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj); std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj);
if (obj2 == nullptr) { if (obj2 == nullptr) {
EWOL_ERROR("Can not bind signal ..."); EWOL_ERROR("Can not bind signal ...");
return; return;
} }
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), _param1))); m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), _param1)));
} else { } else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), _param1))); m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), _param1)));
} }
} }
template<class TYPE, class TYPE2, class TYPE3> template<class TYPE_CLASS, class TYPE, class TYPE2, class TYPE3>
void bind2(std::shared_ptr<ewol::Object> _obj, void (TYPE::*_func)(TYPE2, TYPE3), TYPE2 _param1, TYPE3 _param2) { void bind2(std::shared_ptr<TYPE_CLASS> _obj, void (TYPE::*_func)(TYPE2, TYPE3), TYPE2 _param1, TYPE3 _param2) {
std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj); std::shared_ptr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj);
if (obj2 == nullptr) { if (obj2 == nullptr) {
EWOL_ERROR("Can not bind signal ..."); EWOL_ERROR("Can not bind signal ...");
return; return;
} }
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), _param1, _param2))); m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), _param1, _param2)));
} else { } else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), std::bind(_func, obj2.get(), _param1, _param2))); m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), std::bind(_func, obj2.get(), _param1, _param2)));
} }
} }
/** /**
@ -290,24 +290,24 @@ namespace ewol {
* @param[in] _func functor to call (do it yourself) * @param[in] _func functor to call (do it yourself)
* @example signalXXXX.connect(shared_from_this(), std::bind(&ClassName::onCallbackXXX, this, std::placeholders::_1)); * @example signalXXXX.connect(shared_from_this(), std::bind(&ClassName::onCallbackXXX, this, std::placeholders::_1));
*/ */
void connect(std::shared_ptr<ewol::Object> _obj, std::function<void()> _function ) { void connect(std::shared_ptr<void> _obj, std::function<void()> _function ) {
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
m_callerList.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), _function)); m_callerList.push_back(std::make_pair(std::weak_ptr<void>(_obj), _function));
} else { } else {
m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<ewol::Object>(_obj), _function)); m_callerListInCallback.push_back(std::make_pair(std::weak_ptr<void>(_obj), _function));
} }
} }
/** /**
* @brief remove link on the signal. * @brief remove link on the signal.
* @param[in] _obj shared pointer on the removing object * @param[in] _obj shared pointer on the removing object
*/ */
void release(std::shared_ptr<ewol::Object> _obj) { void release(std::shared_ptr<void> _obj) {
auto it(m_callerList.begin()); auto it(m_callerList.begin());
if (m_callInProgress == 0) { if (m_callInProgress == 0) {
// Remove from the list : // Remove from the list :
while(it != m_callerList.end()) { while(it != m_callerList.end()) {
if (it->first.lock() == _obj) { if (it->first.lock() == _obj) {
EWOL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "'"); //EWOL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "'");
it = m_callerList.erase(it); it = m_callerList.erase(it);
} else { } else {
++it; ++it;
@ -317,7 +317,7 @@ namespace ewol {
// just remove weak poointer // just remove weak poointer
while(it != m_callerList.end()) { while(it != m_callerList.end()) {
if (it->first.lock() == _obj) { if (it->first.lock() == _obj) {
EWOL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "' (delayed)"); //EWOL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "' (delayed)");
it->first.reset(); it->first.reset();
} else { } else {
++it; ++it;
@ -329,7 +329,7 @@ namespace ewol {
it = m_callerListInCallback.begin(); it = m_callerListInCallback.begin();
while(it != m_callerListInCallback.end()) { while(it != m_callerListInCallback.end()) {
if (it->first.lock() == _obj) { if (it->first.lock() == _obj) {
EWOL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "' (notActive)"); //EWOL_DEBUG(" unbind : " << _obj->getObjectType() << " signal='" << m_name << "' (notActive)");
it = m_callerListInCallback.erase(it); it = m_callerListInCallback.erase(it);
} else { } else {
++it; ++it;
@ -339,7 +339,7 @@ namespace ewol {
void emit() { void emit() {
m_callInProgress++; m_callInProgress++;
m_signalCallLeval++; m_signalCallLeval++;
#ifdef DEBUG #if 0
int32_t tmpID = m_uidSignal++; int32_t tmpID = m_uidSignal++;
ewol::Object* srcObject = dynamic_cast<ewol::Object*>(&m_objectLink); ewol::Object* srcObject = dynamic_cast<ewol::Object*>(&m_objectLink);
if (srcObject != nullptr) { if (srcObject != nullptr) {
@ -349,13 +349,13 @@ namespace ewol {
} }
#endif #endif
for (auto &it : m_callerList) { for (auto &it : m_callerList) {
std::shared_ptr<ewol::Object> destObject = it.first.lock(); std::shared_ptr<void> destObject = it.first.lock();
if (destObject == nullptr) { if (destObject == nullptr) {
// TODO : Remove instance ... // TODO : Remove instance ...
EWOL_DEBUG(ewol::object::logIndent(m_signalCallLeval-1) << " nullptr dest"); EWOL_DEBUG(ewol::object::logIndent(m_signalCallLeval-1) << " nullptr dest");
continue; continue;
} }
#ifdef DEBUG #if 0
if (srcObject != nullptr) { if (srcObject != nullptr) {
EWOL_DEBUG(ewol::object::logIndent(m_signalCallLeval-1) << " signal{" << tmpID << "} : [" << destObject->getId() << "]" << destObject->getObjectType()); EWOL_DEBUG(ewol::object::logIndent(m_signalCallLeval-1) << " signal{" << tmpID << "} : [" << destObject->getId() << "]" << destObject->getObjectType());
} else { } else {

2
sources/ewol/object/SignalBase.h
View File

@ -46,7 +46,7 @@ namespace ewol {
const std::string& getDescription() const { const std::string& getDescription() const {
return m_description; return m_description;
} }
virtual void release(std::shared_ptr<ewol::Object> _obj) = 0; virtual void release(std::shared_ptr<void> _obj) = 0;
}; };
std::ostream& operator <<(std::ostream& _os, const SignalBase& _obj); std::ostream& operator <<(std::ostream& _os, const SignalBase& _obj);
const char* logIndent(int32_t _iii); const char* logIndent(int32_t _iii);

2
sources/ewol/object/SignalList.cpp
View File

@ -40,7 +40,7 @@ std::vector<std::string> ewol::object::SignalList::signalGetAll() const {
return out; return out;
} }
void ewol::object::SignalList::unBindAll(const std::shared_ptr<ewol::Object>& _object) { void ewol::object::SignalList::unBindAll(const std::shared_ptr<void>& _object) {
if (_object == nullptr) { if (_object == nullptr) {
EWOL_ERROR("Input ERROR nullptr pointer Object ..."); EWOL_ERROR("Input ERROR nullptr pointer Object ...");
return; return;

2
sources/ewol/object/SignalList.h
View File

@ -44,7 +44,7 @@ namespace ewol {
* @brief Remove binding on all event class. * @brief Remove binding on all event class.
* @param[in] _object Object to unlink. * @param[in] _object Object to unlink.
*/ */
void unBindAll(const std::shared_ptr<ewol::Object>& _object); void unBindAll(const std::shared_ptr<void>& _object);
}; };
}; };
}; };