[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2042-g711f2a3

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  711f2a3c560868bce4fa6816f557e330bac95319 (commit)
      from  47f771e61b0d143c24ac9131310b334a8e851faf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=711f2a3c560868bce4fa6816f557e330bac95319


commit 711f2a3c560868bce4fa6816f557e330bac95319
Author: Bastiaan Jacques <address@hidden>
Date:   Wed May 21 23:28:46 2014 +0200

    Remove the barrier mechanism, because access to _thread is already
    mutex-protected.

diff --git a/libcore/parser/SWFMovieDefinition.cpp 
b/libcore/parser/SWFMovieDefinition.cpp
index 93713f3..1d25874 100644
--- a/libcore/parser/SWFMovieDefinition.cpp
+++ b/libcore/parser/SWFMovieDefinition.cpp
@@ -71,10 +71,7 @@ namespace gnash
 {
 
 SWFMovieLoader::SWFMovieLoader(SWFMovieDefinition& md)
-    :
-    _movie_def(md),
-    _thread(),
-    _barrier(2) // us and the main thread..
+    : _movie_def(md)
 {
 }
 
@@ -118,7 +115,6 @@ SWFMovieLoader::isSelfThread() const
 void
 SWFMovieLoader::execute(SWFMovieLoader& ml, SWFMovieDefinition* md)
 {
-    ml._barrier.wait(); // let _thread assignment happen before going on
     md->read_all_swf();
 }
 
@@ -137,8 +133,6 @@ SWFMovieLoader::start()
     _thread.reset(new boost::thread(std::bind(
                     execute, std::ref(*this), &_movie_def)));
 
-    _barrier.wait(); // let execution start befor returning
-
     return true;
 }
 
diff --git a/libcore/parser/SWFMovieDefinition.h 
b/libcore/parser/SWFMovieDefinition.h
index 7c18e69..d154819 100644
--- a/libcore/parser/SWFMovieDefinition.h
+++ b/libcore/parser/SWFMovieDefinition.h
@@ -35,7 +35,6 @@
 #include <memory> 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/condition.hpp>
-#include <boost/thread/barrier.hpp>
 #include <memory>
 
 #include "movie_definition.h" // for inheritance
@@ -92,11 +91,6 @@ private:
     mutable boost::mutex _mutex;
     std::unique_ptr<boost::thread> _thread;
 
-    // Barrier to ensure that _thread
-    // is initialized before the loader thread
-    // continues execution
-    boost::barrier _barrier;
-
     /// Entry point for the actual thread
     static void execute(SWFMovieLoader& ml, SWFMovieDefinition* md);
 

-----------------------------------------------------------------------

Summary of changes:
 libcore/parser/SWFMovieDefinition.cpp |    8 +-------
 libcore/parser/SWFMovieDefinition.h   |    6 ------
 2 files changed, 1 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Gnash