swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Apply a patch to fix the "max resident" size reported by ‘time’

Browse source 
being off by a factor of 4.  (The most recent release of ‘time’ is
  from 1996 BTW...)

svn path=/nixpkgs/trunk/; revision=30143
This commit is contained in:
Eelco Dolstra 2011-10-31 14:44:32 +00:00
parent e15db25ff3
commit bd5e996e20
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/misc/time/default.nix
View file

@ -8,6 +8,8 @@ stdenv.mkDerivation {
sha256 = "0va9063fcn7xykv658v2s9gilj2fq4rcdxx2mn2mmy1v4ndafzp3";
};
patches = [ ./max-resident.patch ];
meta = {
description = "GNU Time, a tool that runs programs and summarizes the system resources they use";

16
pkgs/tools/misc/time/max-resident.patch Normal file
View file

@ -0,0 +1,16 @@
Fix the "max resident" size reported by ‘time’ being off by a factor of 4.
From http://lists.gnu.org/archive/html/help-gnu-utils/2010-10/msg00002.html
diff -ru -x '*~' time-1.7-orig/time.c time-1.7/time.c
--- time-1.7-orig/time.c 1996-06-13 15:38:21.000000000 -0400
+++ time-1.7/time.c 2011-10-31 10:40:27.000000000 -0400
@@ -392,7 +392,7 @@
ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
break;
case 'M': /* Maximum resident set size. */
- fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
+ fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss);
break;
case 'O': /* Outputs. */
fprintf (fp, "%ld", resp->ru.ru_oublock);