bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increased field width for ulimit values from 16 to 24 digits

Browse source
This commit is contained in:
Gerhard Rieger 2014-02-03 11:04:09 +01:00
parent 5e63eff878
commit 1898116eca
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -16,6 +16,10 @@ corrections:
Probably no impact. Probably no impact.
Thanks to David Binderman for reproting this issue. Thanks to David Binderman for reproting this issue.
procan could not cleanly format ulimit values longer than 16 decimal
digits. Thanks to Frank Dana for providing a patch that increases field
width to 24 digits.
porting: porting:
Performed changes for Fedora release 19 Performed changes for Fedora release 19

24
procan.c
View file

@ -1,5 +1,5 @@
/* source: procan.c */ /* source: procan.c */
/* Copyright Gerhard Rieger 2001-2006 */ /* Copyright Gerhard Rieger */
/* Published under the GNU General Public License V.2, see file COPYING */ /* Published under the GNU General Public License V.2, see file COPYING */
/* the subroutine procan makes a "PROCess ANalysis". It gathers information /* the subroutine procan makes a "PROCess ANalysis". It gathers information
@ -78,40 +78,40 @@ int procan(FILE *outfile) {
struct rlimit rlim; struct rlimit rlim;
fprintf(outfile, "\nRESOURCE LIMITS\n"); fprintf(outfile, "\nRESOURCE LIMITS\n");
fprintf(outfile, "resource current maximum\n"); fprintf(outfile, "resource current maximum\n");
if (getrlimit(RLIMIT_CPU, &rlim) < 0) { if (getrlimit(RLIMIT_CPU, &rlim) < 0) {
Warn2("getrlimit(RLIMIT_CPU, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_CPU, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"cpu time (seconds) %16"F_rlim_max"%16"F_rlim_max"\n", "cpu time (seconds) %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
if (getrlimit(RLIMIT_FSIZE, &rlim) < 0) { if (getrlimit(RLIMIT_FSIZE, &rlim) < 0) {
Warn2("getrlimit(RLIMIT_FSIZE, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_FSIZE, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"file size (blocks) %16"F_rlim_max"%16"F_rlim_max"\n", "file size (blocks) %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
if (getrlimit(RLIMIT_DATA, &rlim) < 0) { if (getrlimit(RLIMIT_DATA, &rlim) < 0) {
Warn2("getrlimit(RLIMIT_DATA, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_DATA, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"data seg size (kbytes) %16"F_rlim_max"%16"F_rlim_max"\n", "data seg size (kbytes) %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
if (getrlimit(RLIMIT_STACK, &rlim) < 0) { if (getrlimit(RLIMIT_STACK, &rlim) < 0) {
Warn2("getrlimit(RLIMIT_STACK, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_STACK, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"stack size (blocks) %16"F_rlim_max"%16"F_rlim_max"\n", "stack size (blocks) %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
if (getrlimit(RLIMIT_CORE, &rlim) < 0) { if (getrlimit(RLIMIT_CORE, &rlim) < 0) {
Warn2("getrlimit(RLIMIT_CORE, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_CORE, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"core file size (blocks) %16"F_rlim_max"%16"F_rlim_max"\n", "core file size (blocks) %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
#ifdef RLIMIT_RSS /* Linux, AIX; not Cygwin */ #ifdef RLIMIT_RSS /* Linux, AIX; not Cygwin */
@ -119,7 +119,7 @@ int procan(FILE *outfile) {
Warn2("getrlimit(RLIMIT_RSS, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_RSS, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"max resident set size %16"F_rlim_max"%16"F_rlim_max"\n", "max resident set size %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
#endif #endif
@ -128,7 +128,7 @@ int procan(FILE *outfile) {
Warn2("getrlimit(RLIMIT_NPROC, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_NPROC, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"max user processes %16"F_rlim_max"%16"F_rlim_max"\n", "max user processes %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
#endif #endif
@ -137,7 +137,7 @@ int procan(FILE *outfile) {
Warn2("getrlimit(RLIMIT_NOFILE, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_NOFILE, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"open files %16"F_rlim_max"%16"F_rlim_max"\n", "open files %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
#endif #endif
@ -146,7 +146,7 @@ int procan(FILE *outfile) {
Warn2("getrlimit(RLIMIT_MEMLOCK, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_MEMLOCK, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"max locked-in-memory address space %16"F_rlim_max"%16"F_rlim_max"\n", "max locked-in-memory\n address space %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
#endif #endif
@ -155,7 +155,7 @@ int procan(FILE *outfile) {
Warn2("getrlimit(RLIMIT_AS, %p): %s", &rlim, strerror(errno)); Warn2("getrlimit(RLIMIT_AS, %p): %s", &rlim, strerror(errno));
} else { } else {
fprintf(outfile, fprintf(outfile,
"virtual memory (kbytes) %16"F_rlim_max"%16"F_rlim_max"\n", "virtual memory (kbytes) %24"F_rlim_max"%24"F_rlim_max"\n",
rlim.rlim_cur, rlim.rlim_max); rlim.rlim_cur, rlim.rlim_max);
} }
#endif #endif