projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
20c70c9
)
Difficult to see how any unprotected write with multiple readers
author
Carl Hetherington
<cth@carlh.net>
Tue, 19 May 2020 23:51:25 +0000
(
01:51
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 20 May 2020 19:56:28 +0000
(21:56 +0200)
could be safe.
src/lib/writer.cc
patch
|
blob
|
history
diff --git
a/src/lib/writer.cc
b/src/lib/writer.cc
index d346c4a4ff32eba5573ffe6c897f29301a02f101..699f220c4df31fdef6dfbae02086515119e60fd6 100644
(file)
--- a/
src/lib/writer.cc
+++ b/
src/lib/writer.cc
@@
-777,10
+777,9
@@
Writer::video_reel (int frame) const
void
Writer::set_digest_progress (Job* job, float progress)
{
void
Writer::set_digest_progress (Job* job, float progress)
{
- /* I believe this is thread-safe */
- _digest_progresses[boost::this_thread::get_id()] = progress;
-
boost::mutex::scoped_lock lm (_digest_progresses_mutex);
boost::mutex::scoped_lock lm (_digest_progresses_mutex);
+
+ _digest_progresses[boost::this_thread::get_id()] = progress;
float min_progress = FLT_MAX;
for (map<boost::thread::id, float>::const_iterator i = _digest_progresses.begin(); i != _digest_progresses.end(); ++i) {
min_progress = min (min_progress, i->second);
float min_progress = FLT_MAX;
for (map<boost::thread::id, float>::const_iterator i = _digest_progresses.begin(); i != _digest_progresses.end(); ++i) {
min_progress = min (min_progress, i->second);