From patchwork Fri Jan 30 17:04:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Breazeal X-Patchwork-Id: 4851 Received: (qmail 4716 invoked by alias); 30 Jan 2015 17:04:40 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 4661 invoked by uid 89); 30 Jan 2015 17:04:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 30 Jan 2015 17:04:28 +0000 Received: from svr-orw-fem-04.mgc.mentorg.com ([147.34.97.41]) by relay1.mentorg.com with esmtp id 1YHEzZ-0001rD-IO from Don_Breazeal@mentor.com for gdb-patches@sourceware.org; Fri, 30 Jan 2015 09:04:25 -0800 Received: from build4-lucid-cs (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.3.224.2; Fri, 30 Jan 2015 09:04:25 -0800 Received: by build4-lucid-cs (Postfix, from userid 1905) id D741940EDD; Fri, 30 Jan 2015 09:04:24 -0800 (PST) From: Don Breazeal To: Subject: [PATCH] gdb.base/info-os.c: clean up SysV IPC on error Date: Fri, 30 Jan 2015 09:04:24 -0800 Message-ID: <1422637464-20419-1-git-send-email-donb@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes We have noticed here that over time some of our test systems accumulate stale System V IPC resources. At least some of this is due to a GDB test program, gdb.base/info-os.c. The program doesn't clean up any allocated IPC objects when an error occurs. System V IPC objects will stay around forever unless they are explicitly removed (or until a reboot). This patch puts the IPC cleanup code into a function and calls the function everywhere that a fatal error can occur, as well as at successful termination. I looked at changing the SysV IPC key for allocating the IPC objects to IPC_PRIVATE. That would prevent a namespace conflict with the key. However, the test needs to read the actual key number from the 'info os' command output, and IPC_PRIVATE won't work for that. One can clean up stale resources allocated by this test on Linux systems by running 'ipcs' and looking for shared memory objects with keys in the range 0xf55-0x133d, semaphore objects with keys in the range 0x1d04-20ec, and message queue objects in the range 0x14ae-0x1896. Use the 'ipcrm' command to delete the IPC objects. Note that other programs (like vncserver) use these objects, so make sure that the object is stale before deleting it. Tested on x86_64 Ubuntu. OK? thanks --Don gdb/testsuite/ 2015-01-29 Don Breazeal * gdb.base/info-os.c (shmid, semid, msqid): Make variables static and initialize them. (ipc_cleanup): New function. (main): Don't declare shmid, semid, and msqid. Call ipc_cleanup on error, or on exit in place of making 'remove' calls directly. --- gdb/testsuite/gdb.base/info-os.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.base/info-os.c b/gdb/testsuite/gdb.base/info-os.c index ae2606a..d6e3e50 100644 --- a/gdb/testsuite/gdb.base/info-os.c +++ b/gdb/testsuite/gdb.base/info-os.c @@ -26,6 +26,22 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +/* System V IPC identifiers. */ +static int shmid = -1, semid = -1, msqid = -1; + +/* Delete any System V IPC resources that were allocated. */ + +static void +ipc_cleanup (void) +{ + if (shmid >= 0) + shmctl (shmid, IPC_RMID, NULL); + if (semid >= 0) + semctl (semid, 0, IPC_RMID, NULL); + if (msqid >= 0) + msgctl (msqid, IPC_RMID, NULL); +} + void * thread_proc (void *args) { @@ -38,7 +54,6 @@ main (void) { const int flags = IPC_CREAT | 0666; key_t shmkey = 3925, semkey = 7428, msgkey = 5294; - int shmid, semid, msqid; FILE *fd; pthread_t thread; struct sockaddr_in sock_addr; @@ -74,6 +89,7 @@ main (void) if (semid < 0) { printf ("Cannot create semaphore after %d tries.\n", retries); + ipc_cleanup (); return 1; } @@ -89,6 +105,7 @@ main (void) if (msqid < 0) { printf ("Cannot create message queue after %d tries.\n", retries); + ipc_cleanup (); return 1; } @@ -102,6 +119,7 @@ main (void) if (sock < 0) { printf ("Cannot create socket.\n"); + ipc_cleanup (); return 1; } @@ -113,6 +131,7 @@ main (void) if (status < 0) { printf ("Cannot bind socket.\n"); + ipc_cleanup (); return 1; } @@ -122,6 +141,7 @@ main (void) if (status < 0) { printf ("Cannot find name of socket.\n"); + ipc_cleanup (); return 1; } port = ntohs (sock_addr.sin_port); @@ -130,14 +150,13 @@ main (void) if (status < 0) { printf ("Cannot listen on socket.\n"); + ipc_cleanup (); return 1; } /* Set breakpoint here. */ - shmctl (shmid, IPC_RMID, NULL); - semctl (semid, 0, IPC_RMID, NULL); - msgctl (msqid, IPC_RMID, NULL); + ipc_cleanup (); fclose (fd); close (sock);