From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
Date: Thu, 23 May 2002 17:01:30 +0000 (+0000)
Subject: testsuite_hooks.h (__set_testsuite_memlimit): Retrieve current limits before setting.
X-Git-Tag: releases/gcc-3.1.1~291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6387bd396290578b0ddd7046b897c03f2ba8a227;p=thirdparty%2Fgcc.git

testsuite_hooks.h (__set_testsuite_memlimit): Retrieve current limits before setting.

	* testsuite/testsuite_hooks.h (__set_testsuite_memlimit): Retrieve
	current limits before setting.

From-SVN: r53795
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6423488cde13..a0c302784338 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2002-05-23  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
+	* testsuite/testsuite_hooks.h (__set_testsuite_memlimit): Retrieve
+	current limits before setting.
+
 	* acinclude.m4 (enable_symvers): Quote $LD.
 	* aclocal.m4: Regenerate.
 	* configure: Likewise.
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/testsuite_hooks.h
index 08d93d382745..eb87d51f2973 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/testsuite_hooks.h
@@ -81,25 +81,33 @@ void
 __set_testsuite_memlimit(float __size = MEMLIMIT_MB)
 {
     struct rlimit r;
-    r.rlim_cur = (rlim_t)(__size * 1048576);
+    rlim_t limit = (rlim_t)(__size * 1048576);
 
     // Heap size, seems to be common.
 #if _GLIBCPP_HAVE_MEMLIMIT_DATA
+    getrlimit(RLIMIT_DATA, &r);
+    r.rlim_cur = limit;
     setrlimit(RLIMIT_DATA, &r);
 #endif
 
     // Resident set size.
 #if _GLIBCPP_HAVE_MEMLIMIT_RSS
+    getrlimit(RLIMIT_RSS, &r);
+    r.rlim_cur = limit;
     setrlimit(RLIMIT_RSS, &r);
 #endif
 
     // Mapped memory (brk + mmap).
 #if _GLIBCPP_HAVE_MEMLIMIT_VMEM
+    getrlimit(RLIMIT_VMEM, &r);
+    r.rlim_cur = limit;
     setrlimit(RLIMIT_VMEM, &r);
 #endif
 
     // Virtual memory.
 #if _GLIBCPP_HAVE_MEMLIMIT_AS
+    getrlimit(RLIMIT_AS, &r);
+    r.rlim_cur = limit;
     setrlimit(RLIMIT_AS, &r);
 #endif
 }