[binutils-gdb] gdb/tui: don't leak the known_window_types map

[binutils-gdb] gdb/tui: don't leak the known_window_types map

[Andrew Burgess]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d27ff777c65654bc4166165cc45743fcc7bae3a0

commit d27ff777c65654bc4166165cc45743fcc7bae3a0
Author: Andrew Burgess <aburgess@redhat.com>
Date:   Thu Jan 12 16:18:53 2023 +0000

    gdb/tui: don't leak the known_window_types map
    
    This commit finishes the task that was started in the previous
    commit.
    
    Now that all Python TUI window factories are correctly deleted when
    the Python interpreter is shut down, we no longer need to dynamically
    allocate the known_window_types map in tui-layout.c
    
    This commit changes known_window_types to a statically allocated data
    structure, removes the dynamic allocation from
    initialize_known_windows, and then replaces lots of '->' with '.'
    throughout this file.
    
    There should be no user visible changes after this commit.
    
    Reviewed-By: Tom Tromey <tom@tromey.com>

Diff:
---
 gdb/tui/tui-layout.c | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index ba7ec89973e..bb8356c5544 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -343,22 +343,17 @@ make_standard_window (const char *)
   return tui_win_list[V];
 }
 
-/* A map holding all the known window types, keyed by name.  Note that
-   this is heap-allocated and "leaked" at gdb exit.  This avoids
-   ordering issues with destroying elements in the map at shutdown.
-   In particular, destroying this map can occur after Python has been
-   shut down, causing crashes if any window destruction requires
-   running Python code.  */
+/* A map holding all the known window types, keyed by name.  */
 
-static window_types_map *known_window_types;
+static window_types_map known_window_types;
 
 /* See tui-layout.h.  */
 
 known_window_names_range
 all_known_window_names ()
 {
-  auto begin = known_window_names_iterator (known_window_types->begin ());
-  auto end = known_window_names_iterator (known_window_types->end ());
+  auto begin = known_window_names_iterator (known_window_types.begin ());
+  auto end = known_window_names_iterator (known_window_types.end ());
   return known_window_names_range (begin, end);
 }
 
@@ -371,8 +366,8 @@ tui_get_window_by_name (const std::string &name)
     if (name == window->name ())
       return window;
 
-  auto iter = known_window_types->find (name);
-  if (iter == known_window_types->end ())
+  auto iter = known_window_types.find (name);
+  if (iter == known_window_types.end ())
     error (_("Unknown window type \"%s\""), name.c_str ());
 
   tui_win_info *result = iter->second (name.c_str ());
@@ -386,20 +381,18 @@ tui_get_window_by_name (const std::string &name)
 static void
 initialize_known_windows ()
 {
-  known_window_types = new window_types_map;
-
-  known_window_types->emplace (SRC_NAME,
+  known_window_types.emplace (SRC_NAME,
 			       make_standard_window<SRC_WIN,
 						    tui_source_window>);
-  known_window_types->emplace (CMD_NAME,
+  known_window_types.emplace (CMD_NAME,
 			       make_standard_window<CMD_WIN, tui_cmd_window>);
-  known_window_types->emplace (DATA_NAME,
+  known_window_types.emplace (DATA_NAME,
 			       make_standard_window<DATA_WIN,
 						    tui_data_window>);
-  known_window_types->emplace (DISASSEM_NAME,
+  known_window_types.emplace (DISASSEM_NAME,
 			       make_standard_window<DISASSEM_WIN,
 						    tui_disasm_window>);
-  known_window_types->emplace (STATUS_NAME,
+  known_window_types.emplace (STATUS_NAME,
 			       make_standard_window<STATUS_WIN,
 						    tui_locator_window>);
 }
@@ -431,11 +424,11 @@ tui_register_window (const char *name, window_factory &&factory)
      this far then NAME must be a user defined window.  Remove any existing
      factory and replace it with this new version.  */
 
-  auto iter = known_window_types->find (name);
-  if (iter != known_window_types->end ())
-    known_window_types->erase (iter);
+  auto iter = known_window_types.find (name);
+  if (iter != known_window_types.end ())
+    known_window_types.erase (iter);
 
-  known_window_types->emplace (std::move (name_copy),
+  known_window_types.emplace (std::move (name_copy),
 			       std::move (factory));
 }
 
@@ -1216,8 +1209,8 @@ initialize_layouts ()
 static bool
 validate_window_name (const std::string &name)
 {
-  auto iter = known_window_types->find (name);
-  return iter != known_window_types->end ();
+  auto iter = known_window_types.find (name);
+  return iter != known_window_types.end ();
 }
 
 /* Implementation of the "tui new-layout" command.  */