diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-05 01:18:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-06-05 01:18:46 +0200 |
| commit | cc6c991ddd53e2f151140cbadef2da660cd7d6a3 (patch) | |
| tree | 77ee564480ed8e9236dd136d232166d042be6be9 /src/lib/atomicity_checker.cc | |
| parent | bb8cb41bb0e30c704ab034918113af1430f072a1 (diff) | |
This AtomicityChecker was introduced a long time ago for reasons
that are unclear.
This commit removes it because it was causing a bug whereby the
_suspended count on Butler would not go back down to 0 due to signals
being blocked by the AtomicityChecker.
I can see two possibilities:
1. AtomicityChecker is a band-aid for some deeper problem, in which
case other bugs will become apparent. Perhaps it relates to signals
being sent before the butler/player/playlist are connected to content.
2. AtomicityChecker was correct but was not identifiying signals
from different pieces of content correctly; so the correct fix would
be to add the content pointer to the _checker.send() call and block
based also on that.
Diffstat (limited to 'src/lib/atomicity_checker.cc')
| -rw-r--r-- | src/lib/atomicity_checker.cc | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/lib/atomicity_checker.cc b/src/lib/atomicity_checker.cc deleted file mode 100644 index 922aa152a..000000000 --- a/src/lib/atomicity_checker.cc +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 2018 Carl Hetherington <cth@carlh.net> - - This file is part of DCP-o-matic. - - DCP-o-matic is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - DCP-o-matic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>. - -*/ - -#include "atomicity_checker.h" -#include "types.h" - -/** @return true if this change should be ignored */ -bool -AtomicityChecker::send (ChangeType type, int property) -{ - boost::mutex::scoped_lock lm (_mutex); - switch (type) { - case CHANGE_TYPE_PENDING: - _await.insert (property); - return false; - case CHANGE_TYPE_DONE: - case CHANGE_TYPE_CANCELLED: - if (_await.find(property) != _await.end()) { - _await.erase (property); - return false; - } - return true; - } - - return false; -} |
