1999-10-04 04:37:58 +00:00
|
|
|
/* Generate graphic from memory profiling data.
|
2018-01-01 00:32:25 +00:00
|
|
|
Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
1999-10-04 04:37:58 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
2007-07-16 00:56:07 +00:00
|
|
|
it under the terms of the GNU General Public License as published
|
|
|
|
by the Free Software Foundation; version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
1999-10-04 04:37:58 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is distributed in the hope that it will be useful,
|
1999-10-04 04:37:58 +00:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2005-12-07 05:49:17 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
1999-10-04 04:37:58 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
2012-02-09 23:18:22 +00:00
|
|
|
along with this program; if not, see <http://www.gnu.org/licenses/>. */
|
1999-10-04 04:37:58 +00:00
|
|
|
|
2004-08-10 04:18:14 +00:00
|
|
|
#define _FILE_OFFSET_BITS 64
|
|
|
|
|
1999-10-04 04:37:58 +00:00
|
|
|
#include <argp.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <error.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <getopt.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <libintl.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
2013-05-01 15:46:34 +00:00
|
|
|
#include <stdint.h>
|
1999-10-04 04:37:58 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
|
|
#include <gd.h>
|
|
|
|
#include <gdfontl.h>
|
|
|
|
#include <gdfonts.h>
|
|
|
|
|
2009-02-06 20:13:07 +00:00
|
|
|
#include "../version.h"
|
|
|
|
#define PACKAGE _libc_intl_domainname
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
/* Default size of the generated image. */
|
|
|
|
#define XSIZE 800
|
|
|
|
#define YSIZE 600
|
|
|
|
|
|
|
|
#ifndef N_
|
|
|
|
# define N_(Arg) Arg
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
|
|
static const struct argp_option options[] =
|
|
|
|
{
|
2014-01-02 08:38:18 +00:00
|
|
|
{ "output", 'o', N_ ("FILE"), 0, N_ ("Name output file") },
|
|
|
|
{ "string", 's', N_ ("STRING"), 0, N_ ("Title string used in output graphic") },
|
2014-01-05 07:39:45 +00:00
|
|
|
{ "time", 't', NULL, 0, N_ ("\
|
2013-03-18 21:18:53 +00:00
|
|
|
Generate output linear to time (default is linear to number of function calls)\
|
|
|
|
") },
|
1999-10-04 04:37:58 +00:00
|
|
|
{ "total", 'T', NULL, 0,
|
2014-01-02 08:38:18 +00:00
|
|
|
N_ ("Also draw graph for total memory consumption") },
|
|
|
|
{ "x-size", 'x', N_ ("VALUE"), 0,
|
|
|
|
N_ ("Make output graphic VALUE pixels wide") },
|
|
|
|
{ "y-size", 'y', "VALUE", 0, N_ ("Make output graphic VALUE pixels high") },
|
1999-10-04 04:37:58 +00:00
|
|
|
{ NULL, 0, NULL, 0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Short description of program. */
|
2014-01-02 08:38:18 +00:00
|
|
|
static const char doc[] = N_ ("Generate graphic from memory profiling data");
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
/* Strings for arguments in help texts. */
|
2014-01-02 08:38:18 +00:00
|
|
|
static const char args_doc[] = N_ ("DATAFILE [OUTFILE]");
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
/* Prototype for option handler. */
|
|
|
|
static error_t parse_opt (int key, char *arg, struct argp_state *state);
|
|
|
|
|
|
|
|
/* Function to print some extra text in the help message. */
|
|
|
|
static char *more_help (int key, const char *text, void *input);
|
|
|
|
|
2009-02-06 20:13:07 +00:00
|
|
|
/* Name and version of program. */
|
|
|
|
static void print_version (FILE *stream, struct argp_state *state);
|
|
|
|
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
|
|
|
|
|
1999-10-04 04:37:58 +00:00
|
|
|
/* Data structure to communicate with argp functions. */
|
|
|
|
static struct argp argp =
|
|
|
|
{
|
|
|
|
options, parse_opt, args_doc, doc, NULL, more_help
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct entry
|
|
|
|
{
|
[BZ #2510, BZ #2830, BZ #3137, BZ #3313, BZ #3426, BZ #3465, BZ #3480, BZ #3483, BZ #3493, BZ #3514, BZ #3515, BZ #3664, BZ #3673, BZ #3674]
2007-01-11 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/soft-fp/sfp-machine.h: Remove.
* sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise.
2007-01-10 Ulrich Drepper <drepper@redhat.com>
* io/fts.c: Make sure fts_cur is always valid after return from
fts_read.
Patch by Miloslav Trmac <mitr@redhat.com>.
2006-10-27 Richard Sandiford <richard@codesourcery.com>
* elf/elf.h (R_MIPS_GLOB_DAT): Define.
(R_MIPS_NUM): Bump by 1.
2007-01-03 Jakub Jelinek <jakub@redhat.com>
* posix/execvp.c: Include alloca.h.
(allocate_scripts_argv): Renamed to...
(scripts_argv): ... this. Don't allocate buffer here nor count
arguments.
(execvp): Use alloca if possible.
* posix/Makefile: Add rules to build and run tst-vfork3 test.
* posix/tst-vfork3.c: New test.
* stdlib/Makefile (tst-strtod3-ENV): Define.
2007-01-02 Ulrich Drepper <drepper@redhat.com>
* posix/getconf.c: Update copyright year.
* nss/getent.c: Likewise.
* iconv/iconvconfig.c: Likewise.
* iconv/iconv_prog.c: Likewise.
* elf/ldconfig.c: Likewise.
* catgets/gencat.c: Likewise.
* csu/version.c: Likewise.
* elf/ldd.bash.in: Likewise.
* elf/sprof.c (print_version): Likewise.
* locale/programs/locale.c: Likewise.
* locale/programs/localedef.c: Likewise.
* nscd/nscd.c (print_version): Likewise.
* debug/xtrace.sh: Likewise.
* malloc/memusage.sh: Likewise.
* malloc/mtrace.pl: Likewise.
* debug/catchsegv.sh: Likewise.
2006-12-24 Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment
attempts.
2006-12-23 Ulrich Drepper <drepper@redhat.com>
* posix/wordexp.c: Remove some unnecessary tests.
2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp>
* sysdeps/unix/sysv/linux/sh/bits/shm.h: New file.
* nss/getXXbyYY_r.c: Include atomic.h.
(INTERNAL (REENTRANT_NAME)): Write startp after start_fct,
add atomic_write_barrier () in between.
2006-11-28 Jakub Jelinek <jakub@redhat.com>
* elf/dl-support.c: Include dl-procinfo.h.
* sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4,
PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS,
PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X):
Define.
(_dl_string_platform): Use PPC_PLATFORM_* macros instead of
hardcoded constants.
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use
PPC_PLATFORM_* macros for array designators.
2006-11-11 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap
names to the beginning.
(_dl_powerpc_platforms): Add "power6x".
* sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease.
(HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP.
(_DL_PLATFORMS_COUNT): Increase.
(_dl_string_platform): Handle power6x case.
* sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP,
PPC_FEATURE_POWER6_EXT): Define.
(PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment.
[-2^31 .. 2^31) range.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME.
* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
Handle relatime mount option.
2006-12-13 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include
kernel-features.h.
2006-12-11 Ulrich Drepper <drepper@redhat.com>
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
[BZ #3664]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize
empty parsed strings.
* stdlib/Makefile (tests): Add tst-strtod2.
* stdlib/tst-strtod2.c: New file.
[BZ #3673]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit
computation.
* stdlib/Makefile (tests): Add tst-atof2.
* stdlib/tst-atof2.c: New file.
[BZ #3674]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value
correctly if removing trailing zero of hex-float.
* stdlib/Makefile (tests): Add tst-atof1.
* stdlib/tst-atof1.c: New file.
* misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest.
Start searching for next comma at p rather than rest.
* misc/Makefile (tests): Add tst-mntent2.
* misc/tst-mntent2.c: New test.
2006-12-08 Ulrich Drepper <drepper@redhat.com>
* malloc/memusage.c: Handle realloc with new size of zero and
non-NULL pointer correctly.
(me): Really write first record twice.
(struct entry): Make format bi-arch safe.
(dest): Write out more realloc statistics.
* malloc/memusagestat.c (struct entry): Make format bi-arch safe.
2006-12-05 Jakub Jelinek <jakub@redhat.com>
* nis/nis_subr.c (nis_getnames): Revert last change.
2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/sys/io.h: Removed.
2006-11-30 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/i386/i686/memcmp.S: Use jump table as the base of
jump table entries.
2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost
`clone' function to ensure proper unwinding stop of gdb.
* sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise.
2006-12-01 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd.init: Remove obsolete and commented-out -S option
handling.
2006-11-23 Jakub Jelinek <jakub@redhat.com>
[BZ #3514]
* manual/string.texi (strncmp): Fix pastos from wcscmp description.
[BZ #3515]
* manual/string.texi (strtok): Remove duplicate paragraph.
2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with
libgcc not supporting `rflags' unwinding (register # >= 17).
2006-11-30 Jakub Jelinek <jakub@redhat.com>
* sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc
succeeded.
2006-11-29 Daniel Jacobowitz <dan@codesourcery.com>
Jakub Jelinek <jakub@redhat.com>
Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct
unwind information.
* sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for
'restore_rt' even in the 'signal' directory.
* sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list.
malloc crashed. Don't allocate memory unnecessarily in each
loop.
2006-10-21 Jakub Jelinek <jakub@redhat.com>
* resolv/mapv4v6addr.h (map_v4v6_address): Fix last change.
2006-11-20 Ulrich Drepper <drepper@redhat.com>
* resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit.
2006-11-18 Bruno Haible <bruno@clisp.org>
* sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke
__sysconf only after having tried to call getgroups32.
2006-11-19 Ulrich Drepper <drepper@redhat.com>
* nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style
addresses for IPv4 queries if they can be mapped.
2006-11-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text.
* sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise.
(signmask): Add .size directive.
(othermask): Add .type directive.
2006-11-14 Ulrich Drepper <drepper@redhat.com>
* po/nl.po: Update from translation team.
* timezone/zdump.c: Redo fix for BZ #3137.
2006-11-14 Jakub Jelinek <jakub@redhat.com>
* nss/nss_files/files-alias.c (get_next_alias): Set line back
to first_unused after parsing :include: file.
* timezone/africa: Update from tzdata2006o.
* timezone/antarctica: Likewise.
* timezone/asia: Likewise.
* timezone/australasia: Likewise.
* timezone/backward: Likewise.
* timezone/europe: Likewise.
* timezone/iso3166.tab: Likewise.
* timezone/northamerica: Likewise.
* timezone/southamerica: Likewise.
* timezone/zone.tab: Likewise.
* time/tzfile.c (__tzfile_read): Extend to handle new file format
on machines with 64-bit time_t.
* timezone/checktab.awk: Update from tzcode2006o.
* timezone/ialloc.c: Likewise.
* timezone/private.h: Likewise.
* timezone/scheck.c: Likewise.
* timezone/tzfile.h: Likewise.
* timezone/tzselect.ksh: Likewise.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.
[BZ #3483]
* elf/ldconfig.c (main): Call setlocale and textdomain.
Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
[BZ #3480]
* manual/argp.texi: Fix typos.
* manual/charset.texi: Likewise.
* manual/errno.texi: Likewise.
* manual/filesys.texi: Likewise.
* manual/lang.texi: Likewise.
* manual/maint.texi: Likewise.
* manual/memory.texi: Likewise.
* manual/message.texi: Likewise.
* manual/resource.texi: Likewise.
* manual/search.texi: Likewise.
* manual/signal.texi: Likewise.
* manual/startup.texi: Likewise.
* manual/stdio.texi: Likewise.
* manual/sysinfo.texi: Likewise.
* manual/syslog.texi: Likewise.
* manual/time.texi: Likewise.
Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
[BZ #3465]
* sunrpc/clnt_raw.c: Minimal message improvements.
* sunrpc/pm_getmaps.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/nis_print_group_entry.c: Likewise.
* locale/programs/repertoire.c: Likewise.
* locale/programs/charmap.c: Likewise.
* malloc/memusage.sh: Likewise.
* elf/dl-deps.c: Likewise.
* locale/programs/ld-collate.c: Likewise.
* libio/vswprintf.c: Likewise.
* malloc/memusagestat.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/rpc_main.c: Likewise.
* nscd/cache.c: Likewise.
* locale/programs/repertoire.c: Unify output messages.
* locale/programs/charmap.c: Likewise.
* locale/programs/ld-ctype.c: Likewise.
* locale/programs/ld-monetary.c: Likewise.
* locale/programs/ld-numeric.c: Likewise.
* locale/programs/ld-time.c: Likewise.
* elf/ldconfig.c: Likewise.
* nscd/selinux.c: Likewise.
* elf/cache.c: Likewise.
Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
2006-11-10 Jakub Jelinek <jakub@redhat.com>
* string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization
if N is one bigger than return value.
* string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1
and l1 last arguments, if buf is defined, verify the return value
equals to strlen (buf) and verify no byte beyond passed length
is modified.
2006-11-10 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
* sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev):
Use __new_sys_siglist instead of _sys_siglist_internal as
second macro argument.
(_old_sys_siglist): Use declare_symbol_alias macro instead of
strong_alias.
2006-11-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3493]
* posix/unistd.h (sysconf): Remove const attribute.
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for
temporary or deprecated addresses.
Patch by Sridhar Samudrala <sri@us.ibm.com>.
* string/Makefile (tests): Add tst-strxfrm2.
* string/tst-strxfrm2.c: New file.
2006-10-09 Jakub Jelinek <jakub@redhat.com>
* elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0
rather than r->r_brk.
* string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal
optimization even if needed > n.
2006-11-07 Jakub Jelinek <jakub@redhat.com>
* include/libc-symbols.h (declare_symbol): Rename to...
(declare_symbol_alias): ... this. Add ORIGINAL argument, imply
strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes
.size directive.
* sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias
changes.
* sysdeps/gnu/siglist.c: Likewise.
2006-11-03 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/fpu/bits/mathinline.h
[__LIBC_INTERNAL_MATH_INLINES]: Moved to ...
* sysdeps/powerpc/fpu/math_private.h: ...here. New file.
2006-11-05 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word):
Update handling of cache descriptor 0x49 for new models.
* sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word):
Likewise.
2006-11-02 Ulrich Drepper <drepper@redhat.com>
* configure.in: Work around ld --help change and avoid -z relro
test completely if the architecture doesn't care about security.
2006-11-01 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
2006-10-31 Ulrich Drepper <drepper@redhat.com>
* stdlib/atexit.c (atexit): Don't mark as hidden when used to
generate compatibility version.
2006-10-29 Ulrich Drepper <drepper@redhat.com>
* configure.in: Relax -z relro requirement a bit.
* po/sv.po: Update from translation team.
2006-10-29 Jakub Jelinek <jakub@redhat.com>
* elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise.
* elf/dl-close.c (_dl_close_worker): Likewise.
* elf/dl-open.c (_dl_open_worker): Likewise.
* sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define.
* configure.in: Require assembler support for visibility, compiler
support for visibility and aliases, linker support for various -z
options.
* Makeconfig: Remove conditional code which now is unnecessary.
* config.h.in: Likewise.
* config.make.in: Likewise.
* dlfcn/Makefile: Likewise.
* elf/Makefile: Likewise.
* elf/dl-load.c: Likewise.
* elf/rtld.c: Likewise.
* include/libc-symbols.h: Likewise.
* include/stdio.h: Likewise.
* io/Makefile: Likewise.
* io/fstat.c: Likewise.
* io/fstat64.c: Likewise.
* io/fstatat.c: Likewise.
* io/fstatat64.c: Likewise.
* io/lstat.c: Likewise.
* io/lstat64.c: Likewise.
* io/mknod.c: Likewise.
* io/mknodat.c: Likewise.
* io/stat.c: Likewise.
* io/stat64.c: Likewise.
* libio/stdio.c: Likewise.
* nscd/Makefile: Likewise.
* stdlib/Makefile: Likewise.
* stdlib/atexit.c: Likewise.
* sysdeps/generic/ldsodefs.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/i386/sysdep.h: Likewise.
* sysdeps/i386/i686/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise.
* Makerules: USE_TLS support is now default.
* tls.make.c: Likewise.
* csu/Versions: Likewise.
* csu/libc-start.c: Likewise.
* csu/libc-tls.c: Likewise.
* csu/version.c: Likewise.
* dlfcn/dlinfo.c: Likewise.
* elf/dl-addr.c: Likewise.
* elf/dl-cache.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-iteratephdr.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-sysdep.c: Likewise.
* elf/dl-tls.c: Likewise.
* elf/ldconfig.c: Likewise.
* elf/rtld.c: Likewise.
* elf/tst-tls-dlinfo.c: Likewise.
* elf/tst-tls1.c: Likewise.
* elf/tst-tls10.h: Likewise.
* elf/tst-tls14.c: Likewise.
* elf/tst-tls2.c: Likewise.
* elf/tst-tls3.c: Likewise.
* elf/tst-tls4.c: Likewise.
* elf/tst-tls5.c: Likewise.
* elf/tst-tls6.c: Likewise.
* elf/tst-tls7.c: Likewise.
* elf/tst-tls8.c: Likewise.
* elf/tst-tls9.c: Likewise.
* elf/tst-tlsmod1.c: Likewise.
* elf/tst-tlsmod13.c: Likewise.
* elf/tst-tlsmod13a.c: Likewise.
* elf/tst-tlsmod14a.c: Likewise.
* elf/tst-tlsmod2.c: Likewise.
* elf/tst-tlsmod3.c: Likewise.
* elf/tst-tlsmod4.c: Likewise.
* elf/tst-tlsmod5.c: Likewise.
* elf/tst-tlsmod6.c: Likewise.
* include/errno.h: Likewise.
* include/link.h: Likewise.
* include/tls.h: Likewise.
* locale/global-locale.c: Likewise.
* locale/localeinfo.h: Likewise.
* malloc/arena.c: Likewise.
* malloc/hooks.c: Likewise.
* malloc/malloc.c: Likewise.
* resolv/Versions: Likewise.
* sysdeps/alpha/dl-machine.h: Likewise.
* sysdeps/alpha/libc-tls.c: Likewise.
* sysdeps/generic/ldsodefs.h: Likewise.
* sysdeps/generic/tls.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/ia64/dl-machine.h: Likewise.
* sysdeps/ia64/libc-tls.c: Likewise.
* sysdeps/mach/hurd/fork.c: Likewise.
* sysdeps/mach/hurd/i386/tls.h: Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.c: Likwise.
* sysdeps/powerpc/powerpc32/dl-machine.h: Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h: Likewise.
* sysdeps/s390/libc-tls.c: Likewise.
* sysdeps/s390/s390-32/dl-machine.h: Likewise.
* sysdeps/s390/s390-64/dl-machine.h: Likewise.
* sysdeps/sh/dl-machine.h: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise.
* sysdeps/x86_64/dl-machine.h: Likewise.
[BZ #3426]
* stdlib/stdlib.h: Adjust comment for canonicalize_file_name to
reality.
2006-10-27 Jakub Jelinek <jakub@redhat.com>
* elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope
argument.
(_dl_lookup_symbol_x): Adjust caller.
* sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove
_ns_global_scope.
* elf/rtld.c (dl_main): Don't initialize _ns_global_scope.
* elf/dl-libc.c: Revert l_scope name changes.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* elf/dl-close.c (_dl_close): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P,
always use __rtld_mrlock_{change,done}. Always free old scope list
here if not l_scope_mem.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name
change. Never free scope list here. Just __rtld_mrlock_lock before
the lookup and __rtld_mrlock_unlock it after the lookup.
* elf/dl-sym.c: Likewise.
* include/link.h (struct r_scoperec): Remove.
(struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem
with l_scope_mem and l_scoperec_lock with l_scope_lock.
2006-10-25 Ulrich Drepper <drepper@redhat.com>
* sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* configure.in: Disable building profile libraries by default.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to
_dl_lookup_symbol_x code.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
* elf/dl-runtime.c: Include sysdep-cancel.h.
(_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and
scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_*
instead of catomic_* macros.
* elf/dl-sym.c: Include sysdep-cancel.h.
(do_sym): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
* elf/dl-close.c: Include sysdep-cancel.h.
(_dl_close): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
* elf/dl-open.c: Include sysdep-cancel.h.
(dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
[BZ #3313]
* malloc/malloc.c (malloc_consolidate): Set maxfb to address of last
fastbin rather than end of fastbin array.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct
body macro.
* sysdeps/x86_64/bits/atomic.h
(__arch_c_compare_and_exchange_val_64_acq): Add missing casts.
(catomic_decrement): Use correct body macro.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
* include/atomic.h: Add a unique prefix to all local variables
in macros.
* csu/tst-atomic.c (do_test): Test also catomic_* macros.
2006-10-14 Ulrich Drepper <drepper@redhat.com>
* resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated.
[BZ #3313]
* malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to
determine highest fast bin to consolidate, always look into all of
them.
(do_check_malloc_state): Only require for empty bins for large
sizes in main arena.
* libio/stdio.h: Add more __wur attributes.
2006-11-12 Andreas Jaeger <aj@suse.de>
[BZ #2510]
* manual/search.texi (Hash Search Function): Clarify.
(Array Search Function): Clarify.
2006-11-12 Joseph Myers <joseph@codesourcery.com>
[BZ #2830]
* math/atest-exp.c (main): Cast hex value to mp_limb_t before
shifting.
* math/atest-exp2.c (read_mpn_hex): Likewise.
* math/atest-sincos.c (main): Likewise.
* sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait.
* sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait.
* sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for
version GLIBC_2.6.
* Versions.def: Add GLIBC_2.6 for libc.
* sysdeps/i386/i486/bits/atomic.h: Add catomic_* support.
2006-10-11 Jakub Jelinek <jakub@redhat.com>
* malloc/malloc.c (_int_malloc): Remove unused any_larger variable.
* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice.
* nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv.
* sysdeps/generic/unsecvars.h: Add NIS_PATH.
2006-10-11 Ulrich Drepper <drepper@redhat.com>
* include/atomic.c: Define catomic_* operations.
* sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems.
* stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*.
* malloc/memusage.c: Likewise.
* gmon/mcount.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-profile.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-fptr.c: Likewise.
* resolv/res_libc.c: Likewise.
2006-10-10 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast.
* sysdeps/mach/hurd/futimes.c: Likewise.
* sysdeps/mach/hurd/lutimes.c: Likewise.
2006-10-09 Ulrich Drepper <drepper@redhat.com>
Jakub Jelinek <jakub@redhat.com>
Implement reference counting of scope records.
* elf/dl-close.c (_dl_close): Remove all scopes from removed objects
from the list in objects which remain. Always allocate new scope
record.
* elf/dl-open.c (dl_open_worker): When growing array for scopes,
don't resize, allocate a new one.
* elf/dl-runtime.c: Update reference counters before using a scope
array.
* elf/dl-sym.c: Likewise.
* elf/dl-libc.c: Adjust for l_scope name change.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* include/link.h: Include <rtld-lowlevel.h>. Define struct
r_scoperec. Replace r_scope with pointer to r_scoperec structure.
Add l_scoperec_lock.
* sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>.
* sysdeps/generic/rtld-lowlevel.h: New file.
* include/atomic.h: Rename atomic_and to atomic_and_val and
atomic_or to atomic_or_val. Define new macros atomic_and and
atomic_or which do not return values.
* sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or.
Various cleanups.
* sysdeps/i386/i486/bits/atomic.h: Likewise.
* po/sv.po: Update from translation team.
2006-10-07 Ulrich Drepper <drepper@redhat.com>
* Versions.def: Add GLIBC_2.6 to libpthread.
* include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use.
(versioned_symbol): Likewise.
(compat_symbol): Likewise.
* po/tr.po: Update from translation team.
* nis/Banner: Removed. It's been integral part forever and the
author info is incomplete anyway.
* libio/Banner: Likewise.
2006-10-06 Ulrich Drepper <drepper@redhat.com>
* version.h (VERSION): Bump to 2.5.90 for new development tree.
2007-01-11 21:51:07 +00:00
|
|
|
uint64_t heap;
|
|
|
|
uint64_t stack;
|
1999-10-04 04:37:58 +00:00
|
|
|
uint32_t time_low;
|
|
|
|
uint32_t time_high;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Size of the image. */
|
|
|
|
static size_t xsize;
|
|
|
|
static size_t ysize;
|
|
|
|
|
|
|
|
/* Name of the output file. */
|
|
|
|
static char *outname;
|
|
|
|
|
|
|
|
/* Title string for the graphic. */
|
|
|
|
static const char *string;
|
|
|
|
|
|
|
|
/* Nonzero if graph should be generated linear in time. */
|
|
|
|
static int time_based;
|
|
|
|
|
|
|
|
/* Nonzero if graph to display total use of memory should be drawn as well. */
|
|
|
|
static int also_total = 0;
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
main (int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int remaining;
|
|
|
|
const char *inname;
|
|
|
|
gdImagePtr im_out;
|
|
|
|
int grey, blue, red, green, yellow, black;
|
|
|
|
int fd;
|
|
|
|
struct stat st;
|
|
|
|
size_t maxsize_heap;
|
|
|
|
size_t maxsize_stack;
|
|
|
|
size_t maxsize_total;
|
|
|
|
uint64_t total;
|
|
|
|
uint64_t cnt, cnt2;
|
|
|
|
FILE *outfile;
|
|
|
|
char buf[30];
|
|
|
|
size_t last_heap;
|
|
|
|
size_t last_stack;
|
|
|
|
size_t last_total;
|
|
|
|
struct entry headent[2];
|
|
|
|
uint64_t start_time;
|
|
|
|
uint64_t end_time;
|
|
|
|
uint64_t total_time;
|
2004-08-10 04:18:14 +00:00
|
|
|
const char *heap_format, *stack_format;
|
|
|
|
int heap_scale, stack_scale, line;
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
outname = NULL;
|
|
|
|
xsize = XSIZE;
|
|
|
|
ysize = YSIZE;
|
|
|
|
string = NULL;
|
|
|
|
|
|
|
|
/* Parse and process arguments. */
|
|
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
|
|
|
|
if (remaining >= argc || remaining + 2 < argc)
|
|
|
|
{
|
|
|
|
argp_help (&argp, stdout, ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR,
|
2014-01-02 08:38:18 +00:00
|
|
|
program_invocation_short_name);
|
1999-10-04 04:37:58 +00:00
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
inname = argv[remaining++];
|
|
|
|
|
|
|
|
if (remaining < argc)
|
|
|
|
outname = argv[remaining];
|
|
|
|
else if (outname == NULL)
|
|
|
|
{
|
|
|
|
size_t len = strlen (inname);
|
|
|
|
outname = alloca (len + 5);
|
|
|
|
stpcpy (stpcpy (outname, inname), ".png");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open for read/write since we try to repair the file in case the
|
|
|
|
application hasn't terminated cleanly. */
|
|
|
|
fd = open (inname, O_RDWR);
|
|
|
|
if (fd == -1)
|
|
|
|
error (EXIT_FAILURE, errno, "cannot open input file");
|
|
|
|
if (fstat (fd, &st) != 0)
|
|
|
|
{
|
|
|
|
close (fd);
|
|
|
|
error (EXIT_FAILURE, errno, "cannot get size of input file");
|
|
|
|
}
|
|
|
|
/* Test whether the file contains only full records. */
|
|
|
|
if ((st.st_size % sizeof (struct entry)) != 0
|
|
|
|
/* The file must at least contain the two administrative records. */
|
|
|
|
|| st.st_size < 2 * sizeof (struct entry))
|
|
|
|
{
|
|
|
|
close (fd);
|
2009-11-06 17:32:06 +00:00
|
|
|
error (EXIT_FAILURE, 0, "input file has incorrect size");
|
1999-10-04 04:37:58 +00:00
|
|
|
}
|
|
|
|
/* Compute number of data entries. */
|
|
|
|
total = st.st_size / sizeof (struct entry) - 2;
|
|
|
|
|
|
|
|
/* Read the administrative information. */
|
|
|
|
read (fd, headent, sizeof (headent));
|
|
|
|
maxsize_heap = headent[1].heap;
|
|
|
|
maxsize_stack = headent[1].stack;
|
|
|
|
maxsize_total = headent[0].stack;
|
|
|
|
|
|
|
|
if (maxsize_heap == 0 && maxsize_stack == 0)
|
|
|
|
{
|
2000-06-20 04:46:22 +00:00
|
|
|
/* The program aborted before memusage was able to write the
|
2014-01-02 08:38:18 +00:00
|
|
|
information about the maximum heap and stack use. Repair
|
|
|
|
the file now. */
|
1999-10-04 04:37:58 +00:00
|
|
|
struct entry next;
|
|
|
|
|
|
|
|
while (1)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
if (read (fd, &next, sizeof (next)) == 0)
|
|
|
|
break;
|
|
|
|
if (next.heap > maxsize_heap)
|
|
|
|
maxsize_heap = next.heap;
|
|
|
|
if (next.stack > maxsize_stack)
|
|
|
|
maxsize_stack = next.stack;
|
|
|
|
if (maxsize_heap + maxsize_stack > maxsize_total)
|
|
|
|
maxsize_total = maxsize_heap + maxsize_stack;
|
|
|
|
}
|
1999-10-04 04:37:58 +00:00
|
|
|
|
2009-10-29 21:19:33 +00:00
|
|
|
headent[0].stack = maxsize_total;
|
|
|
|
headent[1].heap = maxsize_heap;
|
|
|
|
headent[1].stack = maxsize_stack;
|
1999-10-04 04:37:58 +00:00
|
|
|
headent[1].time_low = next.time_low;
|
|
|
|
headent[1].time_high = next.time_high;
|
|
|
|
|
|
|
|
/* Write the computed values in the file. */
|
2009-10-29 21:19:33 +00:00
|
|
|
lseek (fd, 0, SEEK_SET);
|
|
|
|
write (fd, headent, 2 * sizeof (struct entry));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (also_total)
|
|
|
|
{
|
|
|
|
/* We use one scale and since we also draw the total amount of
|
2014-01-02 08:38:18 +00:00
|
|
|
memory used we have to adapt the maximum. */
|
2009-10-29 21:19:33 +00:00
|
|
|
maxsize_heap = maxsize_total;
|
|
|
|
maxsize_stack = maxsize_total;
|
1999-10-04 04:37:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
start_time = ((uint64_t) headent[0].time_high) << 32 | headent[0].time_low;
|
|
|
|
end_time = ((uint64_t) headent[1].time_high) << 32 | headent[1].time_low;
|
|
|
|
total_time = end_time - start_time;
|
|
|
|
|
|
|
|
if (xsize < 100)
|
|
|
|
xsize = 100;
|
|
|
|
if (ysize < 80)
|
|
|
|
ysize = 80;
|
|
|
|
|
|
|
|
/* Create output image with the specified size. */
|
|
|
|
im_out = gdImageCreate (xsize, ysize);
|
|
|
|
|
|
|
|
/* First color allocated is background. */
|
|
|
|
grey = gdImageColorAllocate (im_out, 224, 224, 224);
|
|
|
|
|
|
|
|
/* Set transparent color. */
|
|
|
|
gdImageColorTransparent (im_out, grey);
|
|
|
|
|
|
|
|
/* These are all the other colors we need (in the moment). */
|
|
|
|
red = gdImageColorAllocate (im_out, 255, 0, 0);
|
|
|
|
green = gdImageColorAllocate (im_out, 0, 130, 0);
|
|
|
|
blue = gdImageColorAllocate (im_out, 0, 0, 255);
|
|
|
|
yellow = gdImageColorAllocate (im_out, 154, 205, 50);
|
|
|
|
black = gdImageColorAllocate (im_out, 0, 0, 0);
|
|
|
|
|
|
|
|
gdImageRectangle (im_out, 40, 20, xsize - 40, ysize - 20, blue);
|
|
|
|
|
2004-08-10 04:18:14 +00:00
|
|
|
if (maxsize_heap < 1024)
|
|
|
|
{
|
|
|
|
heap_format = "%Zu";
|
|
|
|
heap_scale = 1;
|
|
|
|
}
|
|
|
|
else if (maxsize_heap < 1024 * 1024 * 100)
|
|
|
|
{
|
|
|
|
heap_format = "%Zuk";
|
|
|
|
heap_scale = 1024;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
heap_format = "%ZuM";
|
|
|
|
heap_scale = 1024 * 1024;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxsize_stack < 1024)
|
|
|
|
{
|
|
|
|
stack_format = "%Zu";
|
|
|
|
stack_scale = 1;
|
|
|
|
}
|
|
|
|
else if (maxsize_stack < 1024 * 1024 * 100)
|
|
|
|
{
|
|
|
|
stack_format = "%Zuk";
|
|
|
|
stack_scale = 1024;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
stack_format = "%ZuM";
|
|
|
|
stack_scale = 1024 * 1024;
|
|
|
|
}
|
|
|
|
|
1999-10-04 04:37:58 +00:00
|
|
|
gdImageString (im_out, gdFontSmall, 38, ysize - 14, (unsigned char *) "0",
|
2014-01-02 08:38:18 +00:00
|
|
|
blue);
|
2006-08-09 22:21:20 +00:00
|
|
|
snprintf (buf, sizeof (buf), heap_format, 0);
|
1999-10-04 04:37:58 +00:00
|
|
|
gdImageString (im_out, gdFontSmall, maxsize_heap < 1024 ? 32 : 26,
|
2014-01-02 08:38:18 +00:00
|
|
|
ysize - 26, (unsigned char *) buf, red);
|
2006-08-09 22:21:20 +00:00
|
|
|
snprintf (buf, sizeof (buf), stack_format, 0);
|
1999-10-04 04:37:58 +00:00
|
|
|
gdImageString (im_out, gdFontSmall, xsize - 37, ysize - 26,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) buf, green);
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
if (string != NULL)
|
|
|
|
gdImageString (im_out, gdFontLarge, (xsize - strlen (string) * 8) / 2,
|
2014-01-02 08:38:18 +00:00
|
|
|
2, (unsigned char *) string, green);
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
gdImageStringUp (im_out, gdFontSmall, 1, ysize / 2 - 10,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) "allocated", red);
|
1999-10-04 04:37:58 +00:00
|
|
|
gdImageStringUp (im_out, gdFontSmall, 11, ysize / 2 - 10,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) "memory", red);
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
gdImageStringUp (im_out, gdFontSmall, xsize - 39, ysize / 2 - 10,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) "used", green);
|
1999-10-04 04:37:58 +00:00
|
|
|
gdImageStringUp (im_out, gdFontSmall, xsize - 27, ysize / 2 - 10,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) "stack", green);
|
1999-10-04 04:37:58 +00:00
|
|
|
|
2004-08-10 04:18:14 +00:00
|
|
|
snprintf (buf, sizeof (buf), heap_format, maxsize_heap / heap_scale);
|
2006-08-09 22:21:20 +00:00
|
|
|
gdImageString (im_out, gdFontSmall, 39 - strlen (buf) * 6, 14,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) buf, red);
|
2004-08-10 04:18:14 +00:00
|
|
|
snprintf (buf, sizeof (buf), stack_format, maxsize_stack / stack_scale);
|
2006-08-09 22:21:20 +00:00
|
|
|
gdImageString (im_out, gdFontSmall, xsize - 37, 14,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) buf, green);
|
1999-10-04 04:37:58 +00:00
|
|
|
|
2004-08-10 04:18:14 +00:00
|
|
|
for (line = 1; line <= 3; ++line)
|
1999-10-04 04:37:58 +00:00
|
|
|
{
|
2013-02-26 08:54:40 +00:00
|
|
|
if (maxsize_heap > 0)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
cnt = (((ysize - 40) * (maxsize_heap / 4 * line / heap_scale))
|
|
|
|
/ (maxsize_heap / heap_scale));
|
|
|
|
gdImageDashedLine (im_out, 40, ysize - 20 - cnt, xsize - 40,
|
|
|
|
ysize - 20 - cnt, red);
|
|
|
|
snprintf (buf, sizeof (buf), heap_format,
|
|
|
|
maxsize_heap / 4 * line / heap_scale);
|
|
|
|
gdImageString (im_out, gdFontSmall, 39 - strlen (buf) * 6,
|
|
|
|
ysize - 26 - cnt, (unsigned char *) buf, red);
|
|
|
|
}
|
2013-02-26 08:54:40 +00:00
|
|
|
else
|
2014-01-02 08:38:18 +00:00
|
|
|
cnt = 0;
|
2013-02-26 08:54:40 +00:00
|
|
|
|
|
|
|
if (maxsize_stack > 0)
|
2014-01-02 08:38:18 +00:00
|
|
|
cnt2 = (((ysize - 40) * (maxsize_stack / 4 * line / stack_scale))
|
|
|
|
/ (maxsize_stack / stack_scale));
|
2013-02-26 08:54:40 +00:00
|
|
|
else
|
2014-01-02 08:38:18 +00:00
|
|
|
cnt2 = 0;
|
2013-02-26 08:54:40 +00:00
|
|
|
|
1999-10-04 04:37:58 +00:00
|
|
|
if (cnt != cnt2)
|
2014-01-02 08:38:18 +00:00
|
|
|
gdImageDashedLine (im_out, 40, ysize - 20 - cnt2, xsize - 40,
|
|
|
|
ysize - 20 - cnt2, green);
|
2004-08-10 04:18:14 +00:00
|
|
|
snprintf (buf, sizeof (buf), stack_format, maxsize_stack / 4 * line /
|
2014-01-02 08:38:18 +00:00
|
|
|
stack_scale);
|
1999-10-04 04:37:58 +00:00
|
|
|
gdImageString (im_out, gdFontSmall, xsize - 37, ysize - 26 - cnt2,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) buf, green);
|
1999-10-04 04:37:58 +00:00
|
|
|
}
|
|
|
|
|
2003-03-22 23:01:01 +00:00
|
|
|
snprintf (buf, sizeof (buf), "%llu", (unsigned long long) total);
|
2006-08-09 22:21:20 +00:00
|
|
|
gdImageString (im_out, gdFontSmall, xsize - 50, ysize - 14,
|
2014-01-02 08:38:18 +00:00
|
|
|
(unsigned char *) buf, blue);
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
if (!time_based)
|
|
|
|
{
|
|
|
|
uint64_t previously = start_time;
|
|
|
|
|
|
|
|
gdImageString (im_out, gdFontSmall, 40 + (xsize - 32 * 6 - 80) / 2,
|
2014-01-02 08:38:18 +00:00
|
|
|
ysize - 12,
|
|
|
|
(unsigned char *) "# memory handling function calls",
|
|
|
|
blue);
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
|
|
|
|
last_stack = last_heap = last_total = ysize - 20;
|
|
|
|
for (cnt = 1; cnt <= total; ++cnt)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
struct entry entry;
|
|
|
|
size_t new[2];
|
|
|
|
uint64_t now;
|
|
|
|
|
|
|
|
read (fd, &entry, sizeof (entry));
|
|
|
|
|
|
|
|
now = ((uint64_t) entry.time_high) << 32 | entry.time_low;
|
|
|
|
|
|
|
|
if ((((previously - start_time) * 100) / total_time) % 10 < 5)
|
|
|
|
gdImageFilledRectangle (im_out,
|
|
|
|
40 + ((cnt - 1) * (xsize - 80)) / total,
|
|
|
|
ysize - 19,
|
|
|
|
39 + (cnt * (xsize - 80)) / total,
|
|
|
|
ysize - 14, yellow);
|
|
|
|
previously = now;
|
|
|
|
|
|
|
|
if (also_total && maxsize_heap > 0)
|
|
|
|
{
|
|
|
|
size_t new3;
|
|
|
|
|
|
|
|
new3 = (ysize - 20) - ((((unsigned long long int) (ysize - 40))
|
|
|
|
* (entry.heap + entry.stack))
|
|
|
|
/ maxsize_heap);
|
|
|
|
gdImageLine (im_out, 40 + ((xsize - 80) * (cnt - 1)) / total,
|
|
|
|
last_total,
|
|
|
|
40 + ((xsize - 80) * cnt) / total, new3,
|
|
|
|
black);
|
|
|
|
last_total = new3;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxsize_heap > 0)
|
|
|
|
{
|
|
|
|
new[0] = ((ysize - 20)
|
|
|
|
- ((((unsigned long long int) (ysize - 40))
|
|
|
|
* entry.heap) / maxsize_heap));
|
|
|
|
gdImageLine (im_out, 40 + ((xsize - 80) * (cnt - 1)) / total,
|
|
|
|
last_heap, 40 + ((xsize - 80) * cnt) / total,
|
|
|
|
new[0], red);
|
|
|
|
last_heap = new[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxsize_stack > 0)
|
|
|
|
{
|
|
|
|
new[1] = ((ysize - 20)
|
|
|
|
- ((((unsigned long long int) (ysize - 40))
|
|
|
|
* entry.stack) / maxsize_stack));
|
|
|
|
gdImageLine (im_out, 40 + ((xsize - 80) * (cnt - 1)) / total,
|
|
|
|
last_stack, 40 + ((xsize - 80) * cnt) / total,
|
|
|
|
new[1], green);
|
|
|
|
last_stack = new[1];
|
|
|
|
}
|
|
|
|
}
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
cnt = 0;
|
|
|
|
while (cnt < total)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
gdImageLine (im_out, 40 + ((xsize - 80) * cnt) / total, ysize - 20,
|
|
|
|
40 + ((xsize - 80) * cnt) / total, ysize - 15, blue);
|
|
|
|
cnt += MAX (1, total / 20);
|
|
|
|
}
|
1999-10-04 04:37:58 +00:00
|
|
|
gdImageLine (im_out, xsize - 40, ysize - 20, xsize - 40, ysize - 15,
|
2014-01-02 08:38:18 +00:00
|
|
|
blue);
|
1999-10-04 04:37:58 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
uint64_t next_tick = MAX (1, total / 20);
|
|
|
|
size_t last_xpos = 40;
|
|
|
|
|
|
|
|
gdImageString (im_out, gdFontSmall, 40 + (xsize - 39 * 6 - 80) / 2,
|
2014-01-02 08:38:18 +00:00
|
|
|
ysize - 12,
|
|
|
|
(unsigned char *) " \
|
1999-10-04 04:37:58 +00:00
|
|
|
# memory handling function calls / time", blue);
|
|
|
|
|
|
|
|
for (cnt = 0; cnt < 20; cnt += 2)
|
2014-01-02 08:38:18 +00:00
|
|
|
gdImageFilledRectangle (im_out,
|
|
|
|
40 + (cnt * (xsize - 80)) / 20, ysize - 19,
|
|
|
|
39 + ((cnt + 1) * (xsize - 80)) / 20,
|
|
|
|
ysize - 14, yellow);
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
last_stack = last_heap = last_total = ysize - 20;
|
|
|
|
for (cnt = 1; cnt <= total; ++cnt)
|
2014-01-02 08:38:18 +00:00
|
|
|
{
|
|
|
|
struct entry entry;
|
|
|
|
size_t new[2];
|
|
|
|
size_t xpos;
|
|
|
|
uint64_t now;
|
|
|
|
|
|
|
|
read (fd, &entry, sizeof (entry));
|
|
|
|
|
|
|
|
now = ((uint64_t) entry.time_high) << 32 | entry.time_low;
|
|
|
|
xpos = 40 + ((xsize - 80) * (now - start_time)) / total_time;
|
|
|
|
|
|
|
|
if (cnt == next_tick)
|
|
|
|
{
|
|
|
|
gdImageLine (im_out, xpos, ysize - 20, xpos, ysize - 15, blue);
|
|
|
|
next_tick += MAX (1, total / 20);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (also_total && maxsize_heap > 0)
|
|
|
|
{
|
|
|
|
size_t new3;
|
|
|
|
|
|
|
|
new3 = (ysize - 20) - ((((unsigned long long int) (ysize - 40))
|
|
|
|
* (entry.heap + entry.stack))
|
|
|
|
/ maxsize_heap);
|
|
|
|
gdImageLine (im_out, last_xpos, last_total, xpos, new3, black);
|
|
|
|
last_total = new3;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxsize_heap > 0)
|
|
|
|
{
|
|
|
|
new[0] = ((ysize - 20)
|
|
|
|
- ((((unsigned long long int) (ysize - 40))
|
|
|
|
* entry.heap) / maxsize_heap));
|
|
|
|
gdImageLine (im_out, last_xpos, last_heap, xpos, new[0], red);
|
|
|
|
last_heap = new[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxsize_stack > 0)
|
|
|
|
{
|
|
|
|
new[1] = ((ysize - 20)
|
|
|
|
- ((((unsigned long long int) (ysize - 40))
|
|
|
|
* entry.stack) / maxsize_stack));
|
|
|
|
gdImageLine (im_out, last_xpos, last_stack, xpos, new[1],
|
|
|
|
green);
|
|
|
|
last_stack = new[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
last_xpos = xpos;
|
|
|
|
}
|
1999-10-04 04:37:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Write out the result. */
|
|
|
|
outfile = fopen (outname, "w");
|
|
|
|
if (outfile == NULL)
|
|
|
|
error (EXIT_FAILURE, errno, "cannot open output file");
|
|
|
|
|
|
|
|
gdImagePng (im_out, outfile);
|
|
|
|
|
|
|
|
fclose (outfile);
|
|
|
|
|
|
|
|
gdImageDestroy (im_out);
|
|
|
|
|
2000-12-31 10:52:32 +00:00
|
|
|
return 0;
|
1999-10-04 04:37:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Handle program arguments. */
|
|
|
|
static error_t
|
|
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
|
|
{
|
|
|
|
switch (key)
|
|
|
|
{
|
|
|
|
case 'o':
|
|
|
|
outname = arg;
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
string = arg;
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
time_based = 1;
|
|
|
|
break;
|
|
|
|
case 'T':
|
|
|
|
also_total = 1;
|
|
|
|
break;
|
|
|
|
case 'x':
|
|
|
|
xsize = atoi (arg);
|
|
|
|
if (xsize == 0)
|
2014-01-02 08:38:18 +00:00
|
|
|
xsize = XSIZE;
|
1999-10-04 04:37:58 +00:00
|
|
|
break;
|
|
|
|
case 'y':
|
|
|
|
ysize = atoi (arg);
|
|
|
|
if (ysize == 0)
|
2014-01-02 08:38:18 +00:00
|
|
|
ysize = XSIZE;
|
1999-10-04 04:37:58 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return ARGP_ERR_UNKNOWN;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
more_help (int key, const char *text, void *input)
|
|
|
|
{
|
2012-11-09 22:13:45 +00:00
|
|
|
char *tp;
|
1999-10-04 04:37:58 +00:00
|
|
|
|
|
|
|
switch (key)
|
|
|
|
{
|
|
|
|
case ARGP_KEY_HELP_EXTRA:
|
|
|
|
/* We print some extra information. */
|
2012-11-09 22:13:45 +00:00
|
|
|
if (asprintf (&tp, gettext ("\
|
2004-05-17 18:59:35 +00:00
|
|
|
For bug reporting instructions, please see:\n\
|
2012-11-09 22:13:45 +00:00
|
|
|
%s.\n"), REPORT_BUGS_TO) < 0)
|
2014-01-02 08:38:18 +00:00
|
|
|
return NULL;
|
|
|
|
|
2012-11-09 22:13:45 +00:00
|
|
|
return tp;
|
2014-01-02 08:38:18 +00:00
|
|
|
|
1999-10-04 04:37:58 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return (char *) text;
|
|
|
|
}
|
2009-02-06 20:13:07 +00:00
|
|
|
|
|
|
|
/* Print the version information. */
|
|
|
|
static void
|
|
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
|
|
{
|
2012-11-09 22:13:45 +00:00
|
|
|
fprintf (stream, "memusagestat %s%s\n", PKGVERSION, VERSION);
|
2009-02-06 20:13:07 +00:00
|
|
|
fprintf (stream, gettext ("\
|
|
|
|
Copyright (C) %s Free Software Foundation, Inc.\n\
|
|
|
|
This is free software; see the source for copying conditions. There is NO\n\
|
|
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
|
2018-01-01 00:41:16 +00:00
|
|
|
"), "2018");
|
2009-02-06 20:13:07 +00:00
|
|
|
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
|
|
|
|
}
|