[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2043-gad0f99e

[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  ad0f99e2e9fa7ea07fe49303f9491e6bd301401f (commit)
      from  711f2a3c560868bce4fa6816f557e330bac95319 (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=ad0f99e2e9fa7ea07fe49303f9491e6bd301401f


commit ad0f99e2e9fa7ea07fe49303f9491e6bd301401f
Author: Bastiaan Jacques <address@hidden>
Date:   Thu May 22 00:00:55 2014 +0200

    Remove the barrier mechanism that is intended to protect _thread, because
    _thread is only ever accessed the thread which created it.

diff --git a/libcore/MovieLoader.cpp b/libcore/MovieLoader.cpp
index 28aa4f1..30f68ae 100644
--- a/libcore/MovieLoader.cpp
+++ b/libcore/MovieLoader.cpp
@@ -46,9 +46,7 @@ namespace gnash {
 MovieLoader::MovieLoader(movie_root& mr)
     :
     _killed(false),
-    _movieRoot(mr),
-    _thread(),
-    _barrier(2) // main and loader thread
+    _movieRoot(mr)
 {
 }
 
@@ -57,9 +55,6 @@ MovieLoader::MovieLoader(movie_root& mr)
 void
 MovieLoader::processRequests()
 {
-       // let _thread assignment happen before going on
-    _barrier.wait();
-
 #ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
     log_debug("Starting movie loader thread");
 #endif
@@ -458,7 +453,6 @@ MovieLoader::loadMovie(const std::string& urlstr,
         _killed=false;
         _thread.reset(new boost::thread(std::bind(
                         &MovieLoader::processRequests, this)));
-           _barrier.wait(); // let execution start before proceeding
     }
     else {
         log_debug("loadMovie: waking up existing thread");
diff --git a/libcore/MovieLoader.h b/libcore/MovieLoader.h
index a676ef9..a63bf8d 100644
--- a/libcore/MovieLoader.h
+++ b/libcore/MovieLoader.h
@@ -25,7 +25,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/condition.hpp>
-#include <boost/thread/barrier.hpp>
 
 #include "URL.h"
 #include "MovieClip.h" 
@@ -205,12 +204,6 @@ private:
     movie_root& _movieRoot;
 
     std::unique_ptr<boost::thread> _thread;
-
-       // Barrier to ensure that _thread
-       // is initialized before the loader thread
-       // continues execution
-       boost::barrier _barrier;
-
 };
 
 } // namespace gnash

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

Summary of changes:
 libcore/MovieLoader.cpp |    8 +-------
 libcore/MovieLoader.h   |    7 -------
 2 files changed, 1 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Gnash