From: Robert W. <ro...@us...> - 2002-09-04 16:40:47
|
FYI. Patch applied to CVS tree and included in September release. The ulimit01 test has been commented out of the runtest/syscalls file for awhile now. I went ahead and removed it from the "all" section of "/testcases/syscalls/Makefile", and added a README file to the "ulimit" directory informing users that the syscall is obsolete. - Robbie Robert V. Williamson <ro...@us...> Linux Test Project IBM Linux Technology Center Phone: (512) 838-9295 T/L: 638-9295 Fax: (512) 838-4603 http://ltp.sourceforge.net Paul Larson <pl...@do...> To: "Steven J. Hill" <sj...@re...> Sent by: cc: ltp...@li... ltp...@li...ur Subject: Re: [LTP] uClibc Patch (5/5)... ceforge.net 09/03/2002 11:30 PM I've noticed this before but figured someone would yell at me if I pulled it out. Anyone have an objection to the removal of this test? or at least removing it from the runtest/syscalls file? -Paul Larson Steven J. Hill wrote: > Remove usage of 'ulimit' not including the 'ulimit' test case. Again > I quote from the man page: > > ----------------------------------------------------------------- > DESCRIPTION > Warning: This routine is obsolete. The include file is no > longer provided by glibc. Use getrlimit(2), setrlimit(2) > and sysconf(3) instead. For the shell command ulimit, see > bash(1). > ----------------------------------------------------------------- > > I would also suggest removal of the 'ulimit' testcase also. Comments > appreciated. Please apply. Thanks. > > -Steve > > >------------------------------------------------------------------------ > >diff -urN ltp-20020813/testcases/kernel/syscalls/llseek/llseek01.c ltp-20020813-patched/testcases/kernel/syscalls/llseek/llseek01.c >--- ltp-20020813/testcases/kernel/syscalls/llseek/llseek01.c Mon Jul 15 05:57:12 2002 >+++ ltp-20020813-patched/testcases/kernel/syscalls/llseek/llseek01.c Tue Sep 3 11:39:58 2002 >@@ -73,6 +73,7 @@ > #include <fcntl.h> > #include <utime.h> > #include <string.h> >+#include <sys/resource.h> > #include <sys/stat.h> > #include <signal.h> > >@@ -193,13 +194,13 @@ > * Setup signal handler to ignore SIGXFSZ signal. > * Create a temporary directory and change directory to it. > * Create a test file under temporary directory. >- * Set the file size limit using ulimit. >+ * Set the file size limit using setrlimit. > */ > void > setup() > { > struct sigaction act; /* struct. to hold signal */ >- long rlp; /* file size limit */ >+ struct rlimit rlp; /* resource for file size limit */ > > /* capture signals */ > tst_sig(NOFORK, DEF_HANDLER, cleanup); >@@ -217,12 +218,12 @@ > /* make a temp directory and cd to it */ > tst_tmpdir(); > >- /* Set limit low, argument is in # of 512 byte blocks */ >- rlp = 2 * (BUFSIZ / 512); >+ /* Set limit low, argument is # bytes */ >+ rlp.rlim_cur = rlp.rlim_max = 2 * BUFSIZ; > >- if (ulimit(2, rlp) == -1) { >+ if (setrlimit(RLIMIT_FSIZE, &rlp) == -1) { > tst_brkm(TBROK, cleanup, >- "Cannot set max. file size using ulimit"); >+ "Cannot set max. file size using setrlimit"); > } > > /* Creat/open a temporary file under above directory */ >diff -urN ltp-20020813/testcases/kernel/syscalls/msync/msync03.c ltp-20020813-patched/testcases/kernel/syscalls/msync/msync03.c >--- ltp-20020813/testcases/kernel/syscalls/msync/msync03.c Mon Aug 27 15:15:14 2001 >+++ ltp-20020813-patched/testcases/kernel/syscalls/msync/msync03.c Tue Sep 3 12:04:55 2002 >@@ -65,6 +65,7 @@ > #include <errno.h> > #include <unistd.h> > #include <sys/mman.h> >+#include <sys/resource.h> > > #include "test.h" > #include "usctest.h" >@@ -147,7 +148,7 @@ > void > setup() > { >- long brkval; /* variable to hold max. break val */ >+ struct rlimit brkval; /* variable to hold max. break val */ > > /* capture signals */ > tst_sig(NOFORK, DEF_HANDLER, cleanup); >@@ -161,11 +162,11 @@ > "getpagesize() failed to get system page size"); > } > >- /* call ulimit function to get the maxmimum possible break value */ >- brkval = ulimit(3); >+ /* call getrlimit function to get the maximum possible break value */ >+ getrlimit(RLIMIT_DATA, &brkval); > >- /* Set the virtual memory address to max. break value */ >- addr = (char *)brkval; >+ /* Set the virtual memory address to maximum break value */ >+ addr = (char *) brkval.rlim_max; > } > > /* >diff -urN ltp-20020813/testcases/kernel/syscalls/munmap/munmap03.c ltp-20020813-patched/testcases/kernel/syscalls/munmap/munmap03.c >--- ltp-20020813/testcases/kernel/syscalls/munmap/munmap03.c Mon Aug 27 15:15:14 2001 >+++ ltp-20020813-patched/testcases/kernel/syscalls/munmap/munmap03.c Tue Sep 3 12:14:32 2002 >@@ -68,8 +68,9 @@ > #include <errno.h> > #include <unistd.h> > #include <fcntl.h> >-#include <sys/stat.h> > #include <sys/mman.h> >+#include <sys/resource.h> >+#include <sys/stat.h> > > #include "test.h" > #include "usctest.h" >@@ -161,7 +162,7 @@ > void > setup() > { >- long brkval; /* variable to hold max. break val */ >+ struct rlimit brkval; /* variable to hold max. break val */ > > /* capture signals */ > tst_sig(NOFORK, DEF_HANDLER, cleanup); >@@ -169,8 +170,8 @@ > /* Pause if that option was specified */ > TEST_PAUSE; > >- /* call ulimit function to get the maxmimum possible break value */ >- brkval = ulimit(3); >+ /* call getrlimit function to get the maximum possible break value */ >+ getrlimit(RLIMIT_DATA, &brkval); > > /* Get the system page size */ > if ((page_sz = getpagesize()) < 0) { >@@ -228,7 +229,7 @@ > } > > /* convert the MAX. possible break value */ >- addr = (char *)brkval; >+ addr = (char *) brkval.rlim_max; > } > > /* > ------------------------------------------------------- This sf.net email is sponsored by: OSDN - Tired of that same old cell phone? Get a new here for FREE! https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390 _______________________________________________ Ltp-list mailing list Ltp...@li... https://lists.sourceforge.net/lists/listinfo/ltp-list |