nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed dead observer while notifying

Browse source
This commit is contained in:
fluxgen 2003-09-08 15:38:46 +00:00
parent 8679fd20b1
commit a4e781298c
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/FbTk/Subject.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Subject.cc,v 1.2 2003/08/19 16:03:26 fluxgen Exp $ // $Id: Subject.cc,v 1.3 2003/09/08 15:38:46 fluxgen Exp $
#include "Subject.hh" #include "Subject.hh"
#include "Observer.hh" #include "Observer.hh"
@ -31,7 +31,7 @@ namespace FbTk {
Subject::SubjectList Subject::s_subjectlist; Subject::SubjectList Subject::s_subjectlist;
Subject::Subject() { Subject::Subject():m_notify_mode(false) {
s_subjectlist.push_back(this); s_subjectlist.push_back(this);
} }
@ -48,14 +48,28 @@ void Subject::attach(Observer *obj) {
} }
void Subject::detach(Observer *obj) { void Subject::detach(Observer *obj) {
if (m_notify_mode)
m_dead_observers.push_back(obj);
else {
m_observerlist.erase(std::remove(m_observerlist.begin(), m_observerlist.erase(std::remove(m_observerlist.begin(),
m_observerlist.end(), obj), m_observerlist.end(), obj),
m_observerlist.end()); m_observerlist.end());
} }
}
void Subject::notify() { void Subject::notify() {
m_notify_mode = true;
std::for_each(m_observerlist.begin(), m_observerlist.end(), std::for_each(m_observerlist.begin(), m_observerlist.end(),
std::bind2nd(std::mem_fun(&Observer::update), this)); std::bind2nd(std::mem_fun(&Observer::update), this));
m_notify_mode = false;
// remove dead observers
if (m_dead_observers.size()) {
std::for_each(m_dead_observers.begin(),
m_dead_observers.end(),
std::bind1st(std::mem_fun(&Subject::detach), this));
m_dead_observers.clear();
}
} }
void Subject::removeObserver(Observer *obj) { void Subject::removeObserver(Observer *obj) {

5
src/FbTk/Subject.hh
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Subject.hh,v 1.3 2003/08/19 16:03:52 fluxgen Exp $ // $Id: Subject.hh,v 1.4 2003/09/08 15:38:46 fluxgen Exp $
#ifndef FBTK_SUBJECT_HH #ifndef FBTK_SUBJECT_HH
#define FBTK_SUBJECT_HH #define FBTK_SUBJECT_HH
@ -44,8 +44,11 @@ public:
void notify(); void notify();
static void removeObserver(Observer *obs); static void removeObserver(Observer *obs);
private: private:
bool m_notify_mode;
typedef std::list<Observer *> ObserverList; typedef std::list<Observer *> ObserverList;
ObserverList m_observerlist; ObserverList m_observerlist;
ObserverList m_dead_observers;
typedef std::list<Subject *> SubjectList; typedef std::list<Subject *> SubjectList;
static SubjectList s_subjectlist; static SubjectList s_subjectlist;