From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6919 invoked by alias); 9 Jun 2012 12:47:18 -0000 Received: (qmail 6897 invoked by uid 22791); 9 Jun 2012 12:47:15 -0000 X-SWARE-Spam-Status: No, hits=-3.2 required=5.0 tests=AWL,BAYES_00,FROM_12LTRDOM,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_XS X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 09 Jun 2012 12:46:53 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1SdL49-0005M2-8A from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Sat, 09 Jun 2012 05:46:53 -0700 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 9 Jun 2012 05:46:52 -0700 Received: from localhost.localdomain (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.1.289.1; Sat, 9 Jun 2012 05:46:51 -0700 From: Yao Qi To: Subject: [PATCH 2/4] Remove socket file at exit. Date: Sat, 09 Jun 2012 12:47:00 -0000 Message-ID: <1339246002-1987-3-git-send-email-yao@codesourcery.com> In-Reply-To: <1339246002-1987-1-git-send-email-yao@codesourcery.com> References: <1339246002-1987-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-06/txt/msg00257.txt.bz2 This patch is to add code to call 'unlink' to make sure agent can remove socket when inferior (after detached from GDB/GDBserver) exits. It fixes the fail below: FAIL: gdb.trace/strace.exp: remove_socket_after_detach: socket file removed gdb/gdbserver: 2012-06-09 Yao Qi PR gdb/14161. * tracepoint.c (gdb_agent_socket_init): Removed. (gdb_agent_remove_socket): New. (gdb_agent_helper_thread): Call gdb_agent_remove_socket at exit. Inline gdb_agent_socket_init here. --- gdb/gdbserver/tracepoint.c | 56 +++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 29 deletions(-) diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index f103dfc..4e6c3ec 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -6748,29 +6748,6 @@ init_named_socket (const char *name) return fd; } -static int -gdb_agent_socket_init (void) -{ - int result, fd; - char name[UNIX_PATH_MAX]; - - result = xsnprintf (name, UNIX_PATH_MAX, "%s/gdb_ust%d", - SOCK_DIR, getpid ()); - if (result >= UNIX_PATH_MAX) - { - trace_debug ("string overflow allocating socket name"); - return -1; - } - - fd = init_named_socket (name); - if (fd < 0) - warning ("Error initializing named socket (%s) for communication with the " - "ust helper thread. Check that directory exists and that it " - "is writable.", name); - - return fd; -} - #ifdef HAVE_UST /* The next marker to be returned on a qTsSTM command. */ @@ -6995,27 +6972,48 @@ gdb_ust_init (void) #endif /* HAVE_UST */ #include +#include + +static char agent_socket_name[UNIX_PATH_MAX]; + +static void +gdb_agent_remove_socket (void) +{ + unlink (agent_socket_name); +} /* Helper thread of agent. */ static void * gdb_agent_helper_thread (void *arg) { - int listen_fd; + atexit (gdb_agent_remove_socket); while (1) { - listen_fd = gdb_agent_socket_init (); + int listen_fd, result; - if (helper_thread_id == 0) - helper_thread_id = syscall (SYS_gettid); + result = xsnprintf (agent_socket_name, UNIX_PATH_MAX, "%s/gdb_ust%d", + SOCK_DIR, getpid ()); + if (result >= UNIX_PATH_MAX) + { + trace_debug ("string overflow allocating socket name"); + break; + } - if (listen_fd == -1) + listen_fd = init_named_socket (agent_socket_name); + if (listen_fd < 0) { - warning ("could not create sync socket\n"); + warning ("Error initializing named socket (%s) for communication " + "with the ust helper thread. Check that directory exists" + " and that it is writable.", agent_socket_name); break; + } + if (helper_thread_id == 0) + helper_thread_id = syscall (SYS_gettid); + while (1) { socklen_t tmp; -- 1.7.0.4