Mercurial > hg > octave-jordi

changeset 21050:4e2e93ec558a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use gh_manager::auto_lock to ensure lock state is properly restored * graphics.cc (gh_manager::do_process_events, Fdrawnow): Use gh_manager::auto_lock to ensure that lock state is restored no matter how control leaves the function.
author John W. Eaton <jwe@octave.org>
date Fri, 08 Jan 2016 15:30:22 -0500
parents 0be406e2ede1
children 5c5af828c248
files libinterp/corefcn/graphics.cc
diffstat 1 files changed, 37 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc
+++ b/libinterp/corefcn/graphics.cc
@@ -9422,30 +9422,30 @@
     {
       e = graphics_event ();
 
-      gh_manager::lock ();
-
-      if (! event_queue.empty ())
-        {
-          if (callback_objects.empty () || force)
-            {
-              e = event_queue.front ();
-
-              event_queue.pop_front ();
-            }
-          else
-            {
-              const graphics_object& go = callback_objects.front ();
-
-              if (go.get_properties ().is_interruptible ())
-                {
-                  e = event_queue.front ();
-
-                  event_queue.pop_front ();
-                }
-            }
-        }
-
-      gh_manager::unlock ();
+      {
+        gh_manager::auto_lock guard;
+
+        if (! event_queue.empty ())
+          {
+            if (callback_objects.empty () || force)
+              {
+                e = event_queue.front ();
+
+                event_queue.pop_front ();
+              }
+            else
+              {
+                const graphics_object& go = callback_objects.front ();
+
+                if (go.get_properties ().is_interruptible ())
+                  {
+                    e = event_queue.front ();
+
+                    event_queue.pop_front ();
+                  }
+              }
+          }
+      }
 
       if (e.ok ())
         {
@@ -9455,12 +9455,12 @@
     }
   while (e.ok ());
 
-  gh_manager::lock ();
-
-  if (event_queue.empty () && event_processing == 0)
-    command_editor::remove_event_hook (gh_manager::process_events);
-
-  gh_manager::unlock ();
+  {
+    gh_manager::auto_lock guard;
+
+    if (event_queue.empty () && event_processing == 0)
+      command_editor::remove_event_hook (gh_manager::process_events);
+  }
 
   if (events_executed)
     flush_octave_stdout ();
@@ -10707,8 +10707,6 @@
   if (args.length () > 4)
     print_usage ();
 
-  gh_manager::lock ();
-
   unwind_protect frame;
 
   frame.protect_var (Vdrawnow_requested, false);
@@ -10716,6 +10714,8 @@
 
   if (++drawnow_executing <= 1)
     {
+      gh_manager::auto_lock guard;
+
       if (args.length () == 0 || args.length () == 1)
         {
           Matrix hlist = gh_manager::figure_handle_list (true);
@@ -10755,11 +10755,7 @@
               if (val.compare ("expose"))
                 do_events = false;
               else
-                {
-                  gh_manager::unlock ();
-
-                  error ("drawnow: invalid argument, 'expose' is only valid option");
-                }
+                error ("drawnow: invalid argument, 'expose' is only valid option");
             }
 
           if (do_events)
@@ -10785,17 +10781,9 @@
 
           if (pos_p == std::string::npos &&
               pos_c == std::string::npos)
-            {
-              gh_manager::unlock ();
-
-              error ("drawnow: empty output ''");
-            }
+            error ("drawnow: empty output ''");
           else if (pos_c == std::string::npos)
-            {
-              gh_manager::unlock ();
-
-              error ("drawnow: empty pipe '|'");
-            }
+            error ("drawnow: empty pipe '|'");
           else if (pos_p != std::string::npos && pos_p < pos_c)
             {
               // Strip leading pipe character
@@ -10812,12 +10800,8 @@
                   file_stat fs (dirname);
 
                   if (! fs || ! fs.is_dir ())
-                    {
-                      gh_manager::unlock ();
-
-                      error ("drawnow: nonexistent directory '%s'",
-                             dirname.c_str ());
-                    }
+                    error ("drawnow: nonexistent directory '%s'",
+                           dirname.c_str ());
 
                 }
             }
@@ -10850,8 +10834,6 @@
         }
     }
 
-  gh_manager::unlock ();
-
   return ovl ();
 }