diff options
| -rw-r--r-- | NEWS | 9 | ||||
| m--------- | gnulib | 0 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/rm/4-million-entry-dir | 35 |
4 files changed, 45 insertions, 0 deletions
@@ -17,6 +17,15 @@ GNU coreutils NEWS -*- outline -*- to dst/s/b rather than simply linking dst/s/b to dst/s/a. [This bug appears to have been present in "the beginning".] + fts-using tools (rm, du, chmod, chgrp, chown, chcon) no longer use memory + proportional to the number of entries in each directory they process. + Before, rm -rf 4-million-entry-directory would consume about 1GiB of memory. + Now, it uses less than 30GB, no matter how many entries there are. + [this bug was inherent in the use of fts: thus, for rm the bug was + introduced in coreutils-8.0. The prior implementation of rm did not use + as much memory. du, chmod, chgrp and chown started using fts in 6.0. + chcon was added in coreutils-6.9.91 with fts support. ] + printf '%d' '"' no longer accesses out-of-bounds memory in the diagnostic. [bug introduced in sh-utils-1.16] diff --git a/gnulib b/gnulib -Subproject d2b8ab669f3129ac0d349eead1217adc38d795e +Subproject 47cb657eca1abf2c26c32c8ce03def994a3ee37 diff --git a/tests/Makefile.am b/tests/Makefile.am index eb67512c9..f0200e122 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -135,6 +135,7 @@ TESTS = \ rm/unread3 \ rm/unreadable \ rm/v-slash \ + rm/4-million-entry-dir \ chgrp/default-no-deref \ chgrp/deref \ chgrp/no-x \ diff --git a/tests/rm/4-million-entry-dir b/tests/rm/4-million-entry-dir new file mode 100755 index 000000000..23130a68e --- /dev/null +++ b/tests/rm/4-million-entry-dir @@ -0,0 +1,35 @@ +#!/bin/sh +# in coreutils-8.12, this would have required ~1GB of memory + +# Copyright (C) 2011 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../src +print_ver_ rm + +very_expensive_ + +# Put 4M files in a directory. +mkdir d && cd d || framework_failure_ +seq 4000000|xargs touch || framework_failure_ + +cd .. + +# Restricted to 50MB, rm from coreutils-8.12 would fail with a +# diagnostic like "rm: fts_read failed: Cannot allocate memory". +ulimit -v 50000 +rm -rf d || fail=1 + +Exit $fail |