[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-262-gbc67435

[Sandro Santilli]

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  bc674358f27c03000f0b2ce715fa3a132f028d17 (commit)
      from  1cc993c2a0e20c29617ab3061df7ffedf95a496e (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=bc674358f27c03000f0b2ce715fa3a132f028d17


commit bc674358f27c03000f0b2ce715fa3a132f028d17
Author: Sandro Santilli <address@hidden>
Date:   Sat Mar 12 23:49:50 2011 +0100

    Include program counter on action limit notification log

diff --git a/libcore/vm/ActionExec.cpp b/libcore/vm/ActionExec.cpp
index f0009a5..e5258d7 100644
--- a/libcore/vm/ActionExec.cpp
+++ b/libcore/vm/ActionExec.cpp
@@ -165,6 +165,8 @@ ActionExec::operator()()
     // must still be carried out. 
 
     // TODO: set this in gnashrc.
+    // NOTE: According to http://www.gnashdev.org/wiki/index.php/ScriptLimits
+    //       this should be 15, not 40, seconds
     const size_t maxTime = 40 * 1000;
     SystemClock clock;
 
@@ -295,7 +297,7 @@ ActionExec::operator()()
                 // Check for script limits hit. 
                 // See: http://www.gnashdev.org/wiki/index.php/ScriptLimits
                 if (clock.elapsed() > maxTime) {
-                    boost::format fmt = boost::format(_("Time exceeded while 
executing code in %1%")) % code.getMovieDefinition().get_url();
+                    boost::format fmt = boost::format(_("Time exceeded while 
executing code in %1% between pc %2% and %3%")) % 
code.getMovieDefinition().get_url() % next_pc % pc;
                     throw ActionLimitException(fmt.str());
                 }
                 // TODO: Run garbage collector ? If stack isn't too big ?

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

Summary of changes:
 libcore/vm/ActionExec.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash