From 3996f34b46043ed8ea8fdc6f44377d969d64396b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 28 Jul 1997 22:35:20 +0000 Subject: Update. 1997-07-28 23:35 Ulrich Drepper * csu/gmon-start.c (__gmon_start__): Call __monstartup not monstartup. * gmon/gmon.c: Rename moncontrol to __moncontrol and monstartup to __monstartup. * gmon/sys/gmon.h: Fix prototypes. * gmon/sys/gmon_out.h: Pretty print. * gmon/bb_exit_func.c (__bb_exit_func): Use memcpy instead of bcopy. * gmon/gmon.c (__monstartup): Likewise. (write_hist): Remove dependency on 32 int. (_mcleanup): Don't call perror, use fprintf. * elf/dl-load.c: Fix handling of current directory in search path. * elf/Makefile (dl-routines): Add dl-profile. * elf/dl-profile.c: New file. * elf/dl-runtime.c (fixup): Add new parameter with address to store relocation result in to elf_machine_relplt. (profile_fixup): New function. * elf/do-rel.h (elf_dynamic_do_rel): Add new parameter with address to store relocation result in to elf_machine_relplt. * elf/dl-support.c: Define _dl_profile and _dl_profile_map. * elf/dynamic-link.h (ELF_DYNAMIC_RELOCATE): Add new parameter and call elf_machine_runtime_setup with extra argument. * elf/dl-reloc.c (_dl_relocate_object): Add new argument to ELF_DYNAMIC_RELOCATE. * elf/link.h: Add prototypes for new functions and variables. * elf/rtld.c: Parse LD_PROFILE and LD_PROFILE_OUTPUT environment variables and call _dl_start_profile if necessary. * include/sys/gmon_out.h: New file. * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Add new parameter to enable profiling. (elf_machine_rela): Add new parameter to specify place to store result in. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * sysdeps/mips/mips64/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. * sysdeps/sparc/dl-machine.h: Likewise. * sysdeps/sparc64/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. (elf_machine_runtime_setup): Setup got[2] to _dl_runtime_resolve if we do profiling. (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add code for _dl_runtime_profile. * nis/nss_compat/compat-grp.c (internal_setgrent): Set FD_CLOEXEC for stream on input file. * nis/nss_compat/compat-pwd.c (internal_setpwent): Likewise. * nis/nss_compat/compat-spwd.c (internal_setspent): Likewise. * nss/nss_db/db-XXX.c (internal_setent): Likewise. * nss/nss_db/db-alias.c (internal_setent): Likewise. * nss/nss_db/db-netgrp.c (internal_setent): Likewise. * nss/nss_files/files-XXX.c (internal_setent): Likewise. * nss/nss_files/files-alias.c (internal_setent): Likewise. * nss/nss_files/files-netgrp.c (internal_setent): Likewise. * string/string.h: Pretty print. * sysdeps/i386/fpu/bits/mathinline.h: Major update by John Bowman. Add float and long double versions. 1997-07-27 Andreas Schwab * elf/rtld.c (print_unresolved): Replace empty object name by main program name. 1997-07-27 Andreas Schwab * sysdeps/generic/htons.c (htons): Renamed from __htons. 1997-07-27 Andreas Schwab * sysdeps/m68k/bits/byteswap.h: New file. 1997-07-27 23:50 Philip Blundell * inet/netinet/icmp6.h: Update for new drafts of POSIX.1g and IPv6 advanced API. * inet/netinet/in.h: Likewise. * inet/netinet/ip6.h: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * posix/sys/types.h: Add socklen_t. * manual/socket.texi: Document some more IPv6 things. * manual/libc.texinfo: Likewise. 1997-07-26 Andreas Jaeger * libc.map: Define missing symbol. 1997-07-27 14:31 Thorsten Kukuk * nis/Makefile: Add nis_findserv. * nis/lckcache.c: Fix typo. * nis/nis_call.c: Fix problems with multihomed servers. * nis/nis_findserv.c: New file. * nis/nis_intern.h: Add more prototypes. * nis/nis_lookup.c (nis_lookup): Don't try the next server if network is unreachable. * nis/nis_table.c (nis_list): Likewise. * nis/nis_ping.c (nis_ping): Use MASTER_ONLY, don't call abort() in error case. * nis/nis_util.c (__nis_finddirectory): Give the right error code back. * nis/ypclnt.c: Make sure, that all sockets are closed. --- gmon/bb_exit_func.c | 6 +++--- gmon/gmon.c | 26 ++++++++++++++++---------- gmon/sys/gmon.h | 5 +++-- gmon/sys/gmon_out.h | 2 +- 4 files changed, 23 insertions(+), 16 deletions(-) (limited to 'gmon') diff --git a/gmon/bb_exit_func.c b/gmon/bb_exit_func.c index dc9def2bb5..53ddbfdbe9 100644 --- a/gmon/bb_exit_func.c +++ b/gmon/bb_exit_func.c @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ /* __bb_exit_func() dumps all the basic-block statistics linked into - the bb_head chain to .d files. */ + the __bb_head chain to .d files. */ #include #include @@ -55,8 +55,8 @@ __bb_exit_func (void) perror (OUT_NAME); return; } - bcopy (GMON_MAGIC, &ghdr.cookie[0], 4); - bcopy (&version, &ghdr.version, sizeof (version)); + memcpy (&ghdr.cookie[0], GMON_MAGIC, 4); + memcpy (&ghdr.version, &version, sizeof (version)); fwrite (&ghdr, sizeof (ghdr), 1, fp); for (ptr = __bb_head; ptr != 0; ptr = ptr->next) diff --git a/gmon/gmon.c b/gmon/gmon.c index d484ec2c9e..6b7ef81d93 100644 --- a/gmon/gmon.c +++ b/gmon/gmon.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -60,6 +61,7 @@ static int s_scale; #define ERR(s) write(2, s, sizeof(s) - 1) void moncontrol __P ((int mode)); +void __moncontrol __P ((int mode)); static void write_hist __P ((int fd)); static void write_call_graph __P ((int fd)); static void write_bb_counts __P ((int fd)); @@ -70,7 +72,7 @@ static void write_bb_counts __P ((int fd)); * all the data structures are ready. */ void -moncontrol (mode) +__moncontrol (mode) int mode; { struct gmonparam *p = &_gmonparam; @@ -91,7 +93,7 @@ moncontrol (mode) void -monstartup (lowpc, highpc) +__monstartup (lowpc, highpc) u_long lowpc; u_long highpc; { @@ -128,7 +130,7 @@ monstartup (lowpc, highpc) ERR(_("monstartup: out of memory\n")); return; } - bzero(cp, p->kcountsize + p->fromssize + p->tossize); + memset (cp, '\0', p->kcountsize + p->fromssize + p->tossize); p->tos = (struct tostruct *)cp; cp += p->tossize; p->kcount = (u_short *)cp; @@ -158,7 +160,7 @@ monstartup (lowpc, highpc) } else s_scale = SCALE_1_TO_1; - moncontrol(1); + __moncontrol(1); } @@ -180,8 +182,9 @@ write_hist (fd) *(char **) thdr.low_pc = (char *) _gmonparam.lowpc; *(char **) thdr.high_pc = (char *) _gmonparam.highpc; - *(int *) thdr.hist_size = _gmonparam.kcountsize / sizeof (HISTCOUNTER); - *(int *) thdr.prof_rate = __profile_frequency (); + *(int32_t *) thdr.hist_size = (_gmonparam.kcountsize + / sizeof (HISTCOUNTER)); + *(int32_t *) thdr.prof_rate = __profile_frequency (); strncpy (thdr.dimen, "seconds", sizeof (thdr.dimen)); thdr.dimen_abbrev = 's'; @@ -296,18 +299,21 @@ _mcleanup () struct gmon_hdr ghdr __attribute__ ((aligned (__alignof__ (int)))); int fd; - moncontrol (0); + __moncontrol (0); fd = __open ("gmon.out", O_CREAT|O_TRUNC|O_WRONLY, 0666); if (fd < 0) { - perror ("_mcleanup: gmon.out"); + char buf[300]; + int errnum = errno; + fprintf (stderr, "_mcleanup: gmon.out: %s\n", + _strerror_internal (errnum, buf, sizeof buf)); return; } /* write gmon.out header: */ - memset (&ghdr, 0, sizeof (struct gmon_hdr)); + memset (&ghdr, '\0', sizeof (struct gmon_hdr)); memcpy (&ghdr.cookie[0], GMON_MAGIC, sizeof (ghdr.cookie)); - *(int *) ghdr.version = GMON_VERSION; + *(int32_t *) ghdr.version = GMON_VERSION; __write (fd, &ghdr, sizeof (struct gmon_hdr)); /* write PC histogram: */ diff --git a/gmon/sys/gmon.h b/gmon/sys/gmon.h index 2eff69b01c..8368ca1ce3 100644 --- a/gmon/sys/gmon.h +++ b/gmon/sys/gmon.h @@ -169,10 +169,11 @@ extern struct gmonparam _gmonparam; __BEGIN_DECLS /* Set up data structures and start profiling. */ -void monstartup __P ((u_long lowpc, u_long highpc)); +extern void __monstartup __P ((u_long __lowpc, u_long __highpc)); +extern void monstartup __P ((u_long __lowpc, u_long __highpc)); /* Clean up profiling and write out gmon.out. */ -void _mcleanup __P ((void)); +extern void _mcleanup __P ((void)); __END_DECLS diff --git a/gmon/sys/gmon_out.h b/gmon/sys/gmon_out.h index bb80a1a16f..c84f945ce8 100644 --- a/gmon/sys/gmon_out.h +++ b/gmon/sys/gmon_out.h @@ -70,7 +70,7 @@ struct gmon_cg_arc_record char from_pc[sizeof (char *)]; /* address within caller's body */ char self_pc[sizeof (char *)]; /* address within callee's body */ char count[4]; /* number of arc traversals */ -}; + }; __END_DECLS -- cgit v1.2.3