From patchwork Mon Oct 28 17:49:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 99716 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D99093858C78 for ; Mon, 28 Oct 2024 17:50:08 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 7FB763858D34 for ; Mon, 28 Oct 2024 17:49:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7FB763858D34 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7FB763858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730137776; cv=none; b=tewf7r2on5ClN/dQQq+ruM524XNYfEGT1q6n7rGY0FhM4/zgBwHY+Faje86G5Q3S2m1ze6ieAJTrt4pZ2WNiGY/5uBdsZuNaNjHC5Qw4msxWTjZE7nRMKEF5bgPLI3rcGYX7kX41yRmMkuxb4VS9Yt6LfaFAAf3nChMvuVwd/4w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730137776; c=relaxed/simple; bh=lwZgbKnswitU4Y80wpZOw42ZpYvgCbX0xYeJxCDC1eQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=vwfMmH1H884JtDlrafiRtziYeVUwzEWVbqoWnzIsQ9OuAvKUC5riV2fP7dRnIzspEEweoR+w6DkAH+deF/O4GJdmC8HHjbsGVjKfknQ20VpT6upPz8mLQhFE6I+cRvN5TdpOW6JKsXR0Uf9soqKlQDQoGmII3o2oZN69XyppqYc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 916C221F56 for ; Mon, 28 Oct 2024 17:49:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730137769; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hxHpj+AMfArmqi6z+6q2rt+Rt5AVi8KIeT5Zr25N/Xo=; b=lom5laugs3X6BdjBxSAne4avQrJ1Fbb8cA+rWfw0Ef3LPK2kMaxIqRyqo0/DQiK5LoeMbE dwO63ZoUi8gpY63WXgtfQ6Bdo1LRVZ7GLGfWj9IbmC9CD0RP8wDzktxe+304u8I70ofAdP SQxAviMZ3BrDB7m1nJuByKwQwfncDOU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730137769; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hxHpj+AMfArmqi6z+6q2rt+Rt5AVi8KIeT5Zr25N/Xo=; b=C0rHByFhN4g2CzzOoIXJrI42vzchzje6FHn/kGl4K3xWlV0YZlA8QZpSnC6+6ewbY4l0+l BIXdOkFigD2E7YAw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="njJHFXZ/"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=0JlE7XVU DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730137768; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hxHpj+AMfArmqi6z+6q2rt+Rt5AVi8KIeT5Zr25N/Xo=; b=njJHFXZ/LHYIdnBVjIyYGYlJARRTHr+1ro+MxM7XOfXZk6VQKCMPSAFEveRz6Xr08C1lMa IP1JRwAE85tDMVty2Brr8vMFeU366PW79FHNSlv9wSRfa4LeKZ462IsiiaDJ6a2mpaFSHn e/cvZu6+o6q8yoaAkns0puFbUY0URXU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730137768; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hxHpj+AMfArmqi6z+6q2rt+Rt5AVi8KIeT5Zr25N/Xo=; b=0JlE7XVUYzzmXu5YW8L4/VeTvTdcNejs/bBZpUR8wR0kZlhy6T4wRCPsWQndPGd8wFlK8A TJhqvjbOhzudWeCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7B97E137D4 for ; Mon, 28 Oct 2024 17:49:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id yr/ZHKjOH2ccPQAAD6G6ig (envelope-from ) for ; Mon, 28 Oct 2024 17:49:28 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/3] [gdbsupport] Add gdb::{waitpid,read,write,close} Date: Mon, 28 Oct 2024 18:49:11 +0100 Message-Id: <20241028174913.27056-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Rspamd-Queue-Id: 916C221F56 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org We have gdb::handle_eintr, which allows us to rewrite: ... ssize_t ret; do { errno = 0; ret = ::write (pipe[1], "+", 1); } while (ret == -1 && errno == EINTR); ... into: ... ssize_t ret = gdb::handle_eintr (-1, ::write, pipe[1], "+", 1); ... However, the call to write got a bit mangled, requiring effort to decode it back to its original form. Instead, add a new function gdb::write that allows us to write: ... ssize_t ret = gdb::write (pipe[1], "+", 1); ... Likewise for waitpid, read and close. Tested on x86_64-linux. --- gdb/cli/cli-cmds.c | 2 +- gdb/nat/linux-waitpid.c | 2 +- gdbserver/netbsd-low.cc | 10 ++++---- gdbsupport/Makefile.am | 1 + gdbsupport/Makefile.in | 1 + gdbsupport/eintr.cc | 56 +++++++++++++++++++++++++++++++++++++++++ gdbsupport/eintr.h | 7 ++++++ 7 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 gdbsupport/eintr.cc base-commit: 77f6ff446173ac7790f35d43de7d196a768c38b1 diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 65ac7d6e7fb..230fcd549e1 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -923,7 +923,7 @@ run_under_shell (const char *arg, int from_tty) if (pid != -1) { - int ret = gdb::handle_eintr (-1, ::waitpid, pid, &status, 0); + int ret = gdb::waitpid (pid, &status, 0); if (ret == -1) perror_with_name ("Cannot get status of shell command"); } diff --git a/gdb/nat/linux-waitpid.c b/gdb/nat/linux-waitpid.c index 0ac2f9fb2b9..f4ae612c572 100644 --- a/gdb/nat/linux-waitpid.c +++ b/gdb/nat/linux-waitpid.c @@ -51,5 +51,5 @@ status_to_str (int status) int my_waitpid (int pid, int *status, int flags) { - return gdb::handle_eintr (-1, ::waitpid, pid, status, flags); + return gdb::waitpid (pid, status, flags); } diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc index 4b58826e091..450fbcfb20d 100644 --- a/gdbserver/netbsd-low.cc +++ b/gdbserver/netbsd-low.cc @@ -222,7 +222,7 @@ netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus, int options = (target_options & TARGET_WNOHANG) ? WNOHANG : 0; pid_t pid - = gdb::handle_eintr (-1, ::waitpid, ptid.pid (), &status, options); + = gdb::waitpid (ptid.pid (), &status, options); if (pid == -1) perror_with_name (_("Child process unexpectedly missing")); @@ -432,7 +432,7 @@ netbsd_process_target::kill (process_info *process) return -1; int status; - if (gdb::handle_eintr (-1, ::waitpid, pid, &status, 0) == -1) + if (gdb::waitpid (pid, &status, 0) == -1) return -1; mourn (process); return 0; @@ -1123,15 +1123,15 @@ netbsd_qxfer_libraries_svr4 (const pid_t pid, const char *annex, static bool elf_64_file_p (const char *file) { - int fd = gdb::handle_eintr (-1, ::open, file, O_RDONLY); + int fd = gdb::open (file, O_RDONLY); if (fd < 0) perror_with_name (("open")); Elf64_Ehdr header; - ssize_t ret = gdb::handle_eintr (-1, ::read, fd, &header, sizeof (header)); + ssize_t ret = gdb::read (fd, &header, sizeof (header)); if (ret == -1) perror_with_name (("read")); - gdb::handle_eintr (-1, ::close, fd); + gdb::close (fd); if (ret != sizeof (header)) error ("Cannot read ELF file header: %s", file); diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am index e77298751cd..a3c3a11fdb2 100644 --- a/gdbsupport/Makefile.am +++ b/gdbsupport/Makefile.am @@ -61,6 +61,7 @@ libgdbsupport_a_SOURCES = \ common-inferior.cc \ common-regcache.cc \ common-utils.cc \ + eintr.cc \ environ.cc \ errors.cc \ event-loop.cc \ diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in index db3d6f6b4dd..a8696bca377 100644 --- a/gdbsupport/Makefile.in +++ b/gdbsupport/Makefile.in @@ -419,6 +419,7 @@ libgdbsupport_a_SOURCES = \ common-inferior.cc \ common-regcache.cc \ common-utils.cc \ + eintr.cc \ environ.cc \ errors.cc \ event-loop.cc \ diff --git a/gdbsupport/eintr.cc b/gdbsupport/eintr.cc new file mode 100644 index 00000000000..7e24fa56224 --- /dev/null +++ b/gdbsupport/eintr.cc @@ -0,0 +1,56 @@ +/* System calls wrappers for GDB, the GNU debugger. + + Copyright (C) 2024 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include +#include +#include +#include +#include + +namespace gdb { + +extern "C" { + + pid_t + waitpid (pid_t pid, int *wstatus, int options) + { + return gdb::handle_eintr (-1, ::waitpid, pid, wstatus, options); + } + + int + open (const char *pathname, int flags) + { + return gdb::handle_eintr (-1, ::open, pathname, flags); + } + + int + close (int fd) + { + return gdb::handle_eintr (-1, ::close, fd); + } + + ssize_t + read (int fd, void *buf, size_t count) + { + return gdb::handle_eintr (-1, ::read, fd, buf, count); + } + +} + +} diff --git a/gdbsupport/eintr.h b/gdbsupport/eintr.h index e440f935fcf..3919c9fd930 100644 --- a/gdbsupport/eintr.h +++ b/gdbsupport/eintr.h @@ -66,6 +66,13 @@ handle_eintr (ErrorValType errval, const Fun &f, const Args &... args) return ret; } +extern "C" { + extern pid_t waitpid (pid_t pid, int *wstatus, int options); + extern int open (const char *pathname, int flags); + extern int close (int fd); + extern ssize_t read (int fd, void *buf, size_t count); +} + } /* namespace gdb */ #endif /* GDBSUPPORT_EINTR_H */