Handle multiple target events before commit resume

[deliverable/binutils-gdb.git] / gdb / obsd-nat.c

diff --git a/gdb/obsd-nat.c b/gdb/obsd-nat.c
index a3058b00c36b926aa921ccd083ade00778e17d37..faef8ff7d32f91b30033eef2c2a4a5e9769ba7d8 100644 (file)
--- a/gdb/obsd-nat.c
+++ b/gdb/obsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for OpenBSD.
 
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,7 +24,7 @@
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
-#include "gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 
 #include "inf-child.h"
 #include "obsd-nat.h"
@@ -35,16 +35,11 @@
 
 #ifdef PT_GET_THREAD_FIRST
 
-const char *
+std::string
 obsd_nat_target::pid_to_str (ptid_t ptid)
 {
-  if (ptid_get_lwp (ptid) != 0)
-    {
-      static char buf[64];
-
-      xsnprintf (buf, sizeof buf, "thread %ld", ptid_get_lwp (ptid));
-      return buf;
-    }
+  if (ptid.lwp () != 0)
+    return string_printf ("thread %ld", ptid.lwp ());
 
   return normal_pid_to_str (ptid);
 }
@@ -66,7 +61,7 @@ obsd_nat_target::update_thread_list ()
 
       if (!in_thread_list (ptid))
        {
-         if (ptid_get_lwp (inferior_ptid) == 0)
+         if (inferior_ptid.lwp () == 0)
            thread_change_ptid (inferior_ptid, ptid);
          else
            add_thread (ptid);
@@ -154,7 +149,7 @@ obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
       ptid = ptid_t (pid, pe.pe_tid, 0);
       if (!in_thread_list (ptid))
        {
-         if (ptid_get_lwp (inferior_ptid) == 0)
+         if (inferior_ptid.lwp () == 0)
            thread_change_ptid (inferior_ptid, ptid);
          else
            add_thread (ptid);