Patchwork [review] Change tui_source_element::line to have type std::string

login
register
mail settings
Submitter Simon Marchi (Code Review)
Date Oct. 21, 2019, 5:29 p.m.
Message ID <gerrit.1571678978000.Id600f3e1d386a2911f187366e05e2ec599068dd2@gnutoolchain-gerrit.osci.io>
Download mbox | patch
Permalink /patch/35202/
State New
Headers show

Comments

Simon Marchi (Code Review) - Oct. 21, 2019, 5:29 p.m.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/178
......................................................................

Change tui_source_element::line to have type std::string

This changes tui_source_element::line to be of type std::string.  This
reduces the number of copies made.

gdb/ChangeLog
2019-10-21  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.h (struct tui_source_element) <line>: Now a
	std::string.
	* tui/tui-winsource.c (tui_show_source_line): Update.
	* tui/tui-source.c (tui_source_window::set_contents): Update.
	* tui/tui-disasm.c (tui_disasm_window::set_contents): Update.

Change-Id: Id600f3e1d386a2911f187366e05e2ec599068dd2
---
M gdb/ChangeLog
M gdb/tui/tui-disasm.c
M gdb/tui/tui-source.c
M gdb/tui/tui-winsource.c
M gdb/tui/tui-winsource.h
5 files changed, 14 insertions(+), 6 deletions(-)
Simon Marchi (Code Review) - Oct. 21, 2019, 5:37 p.m.
Simon Marchi has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/178
......................................................................


Patch Set 1: Code-Review+2
Simon Marchi (Code Review) - Oct. 30, 2019, 7:23 p.m.
Simon Marchi has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/178
......................................................................


Patch Set 2: Code-Review+2

I think this patch could be pushed on its own, it's a good cleanup.

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 44980f2..b0268e3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@ 
 2019-10-21  Tom Tromey  <tom@tromey.com>
 
+	* tui/tui-winsource.h (struct tui_source_element) <line>: Now a
+	std::string.
+	* tui/tui-winsource.c (tui_show_source_line): Update.
+	* tui/tui-source.c (tui_source_window::set_contents): Update.
+	* tui/tui-disasm.c (tui_disasm_window::set_contents): Update.
+
+2019-10-21  Tom Tromey  <tom@tromey.com>
+
 	* tui/tui-winsource.h (tui_exec_info_content): Remove typedef.
 
 2019-10-21  Tom Tromey  <tom@tromey.com>
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 33a3ba1..91c9845 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -216,10 +216,10 @@ 
 	   + asm_lines[i].insn);
 
       /* Now copy the line taking the offset into account.  */
-      if (line.size() > offset)
-	src->line.reset (xstrndup (&line[offset], line_width));
+      if (line.size () > offset)
+	src->line = line.substr (offset, line_width);
       else
-	src->line = make_unique_xstrdup ("");
+	src->line.clear ();
 
       src->line_or_addr.loa = LOA_ADDRESS;
       src->line_or_addr.u.addr = asm_lines[i].addr;
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index bb1013b..f956645 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -183,7 +183,7 @@ 
 				 symtab_to_fullname (s)) == 0
 		   && cur_line_no == locator->line_no);
 
-	      content[cur_line].line = make_unique_xstrdup (text.c_str ());
+	      content[cur_line].line = std::move (text);
 
 	      cur_line++;
 	      cur_line_no++;
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 3fbc49f..5d0bcb4 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -222,7 +222,7 @@ 
     tui_set_reverse_mode (win_info->handle.get (), true);
 
   wmove (win_info->handle.get (), lineno, TUI_EXECINFO_SIZE);
-  tui_puts (line->line.get (), win_info->handle.get ());
+  tui_puts (line->line.c_str (), win_info->handle.get ());
   if (line->is_exec_point)
     tui_set_reverse_mode (win_info->handle.get (), false);
 
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 9417b28..185d3dd 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -62,7 +62,7 @@ 
   {
   }
 
-  gdb::unique_xmalloc_ptr<char> line;
+  std::string line;
   struct tui_line_or_address line_or_addr;
   bool is_exec_point = false;
   tui_bp_flags break_mode = 0;