From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20195 invoked by alias); 18 Sep 2006 10:48:54 -0000 Received: (qmail 20179 invoked by uid 22791); 18 Sep 2006 10:48:54 -0000 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 18 Sep 2006 10:48:51 +0000 Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k8IAmlOi007029; Mon, 18 Sep 2006 12:48:47 +0200 Received: (from jj@localhost) by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k8IAmlWQ007028; Mon, 18 Sep 2006 12:48:47 +0200 Date: Mon, 18 Sep 2006 10:48:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix 2 NPTL testcases Message-ID: <20060918104847.GN4556@sunsite.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2006-09/txt/msg00033.txt.bz2 Hi! tst-kill4 does something apps generally shouldn't do - it relies on the thread descriptor to be put into stack cache and not being immediately freed, unfortunately if the stack size is larger than the limit for stack cache, it is freed immediately and the stack size is determined from current ulimit -s. This test kept crashing on ia64 for a while, but can be reproduced e.g. on ppc32 with ulimit -s 80000. On IA-64 with its larger page size, writing 100000 bytes into a pipe succeeds in contemporary kernels, even when nobody reads anything from the other pipe's end. This patch changes it to loop, so it will eventually block. 2006-09-18 Jakub Jelinek * tst-kill4.c (do_test): Explicitly set tf thread's stack size. * tst-cancel2.c (tf): Loop as long as something was written. --- libc/nptl/tst-kill4.c.jj 2003-02-21 21:27:54.000000000 +0100 +++ libc/nptl/tst-kill4.c 2006-09-18 12:32:48.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2003. @@ -35,13 +35,30 @@ tf (void *a) int do_test (void) { + pthread_attr_t at; + if (pthread_attr_init (&at) != 0) + { + puts ("attr_create failed"); + exit (1); + } + + /* Limit thread stack size, because if it is too large, pthread_join + will free it immediately rather than put it into stack cache. */ + if (pthread_attr_setstacksize (&at, 2 * 1024 * 1024) != 0) + { + puts ("setstacksize failed"); + exit (1); + } + pthread_t th; - if (pthread_create (&th, NULL, tf, NULL) != 0) + if (pthread_create (&th, &at, tf, NULL) != 0) { puts ("create failed"); exit (1); } + pthread_attr_destroy (&at); + if (pthread_join (th, NULL) != 0) { puts ("join failed"); --- libc/nptl/tst-cancel2.c.jj 2002-11-26 23:49:53.000000000 +0100 +++ libc/nptl/tst-cancel2.c 2006-09-18 12:33:53.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -33,11 +33,7 @@ tf (void *arg) write blocks. */ char buf[100000]; - if (write (fd[1], buf, sizeof (buf)) == sizeof (buf)) - { - puts ("write succeeded"); - return (void *) 1l; - } + while (write (fd[1], buf, sizeof (buf)) > 0); return (void *) 42l; } Jakub