diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-08-28 00:26:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-08-28 00:26:07 +0000 |
| commit | b236e99d90748f6caf77994e96dc5aaa48ce2993 (patch) | |
| tree | 8cbcae49b6ae6a59e7e59784b3c7b750b76a5f37 /sysdeps/posix/profil.c | |
| parent | 0b72c47ecf998030603fa0140225b9a5fe36473c (diff) | |
| download | glibc-b236e99d90748f6caf77994e96dc5aaa48ce2993.tar.gz glibc-b236e99d90748f6caf77994e96dc5aaa48ce2993.tar.xz glibc-b236e99d90748f6caf77994e96dc5aaa48ce2993.zip | |
Upadte. cvs/libc-ud-960827 cvs/libc-960828
Tue Aug 27 17:45:21 1996 Ulrich Drepper <drepper@cygnus.com> * Makerules: Add some test for correct version of GNU Make. * io/fcntl.h: Undo change from Mon Aug 26 22:22:17 1996. * sysdeps/unix/sysv/linux/fcntlbits.h: Place macros here instead. * sysdeps/generic/dl-sysdep.c: Initialize break address to avoid overwriting last page (OK, Roland). Tue Aug 27 16:20:37 1996 Ulrich Drepper <drepper@cygnus.com> * resolv/resolv.h: Update from BIND-4.9.5-T3A. * resolv/arpa/nameser.h: Likewise. * resolv/res_init.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/res_mkquery.c: Likewise. Tue Aug 27 15:47:04 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dl-error.c (catch): Define errstring element not as const. (_dl_catch_error): ERRSTRING argument is not const pointer. Initialize *ERRSTRING and *OBJNAME separately. * elf/link.h: Change prototype for `_dl_catch_error'. * elf/dl-load.c (_dl_map_object): Use separate variable for copied NAME to avoid `const' warning. * elf/dlerror.c: Make `last_errstring' variable not const pointer. * elf/rtld.c: Implement reading of /etc/ld.so.preload. This provides preloading even for SUID binaries. Add some more casts to avoid signed<->unsigned warnings. Tue Aug 27 15:40:28 1996 NIIBE Yutaka <gniibe@mri.co.jp> * posix/sys/types.h: Define loff_t. * sysdeps/unix/sysv/linux/gnu/types.h: Define __loff_t. Mon Aug 26 16:31:33 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/setitimer.c (setitimer_locked): Tolerate NEW being null; in that case don't touch the timer at all (but do return something in OLD if necessary). Mon Aug 26 13:35:16 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/i386/init-first.c (__libc_multiple_libcs): New variable. * sysdeps/i386/init-first.c: Likewise. * sysdeps/stub/init-first.c: Likewise.
Diffstat (limited to 'sysdeps/posix/profil.c')
| -rw-r--r-- | sysdeps/posix/profil.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c index 8e34b3564f..a6786b1a13 100644 --- a/sysdeps/posix/profil.c +++ b/sysdeps/posix/profil.c @@ -37,7 +37,13 @@ static u_int pc_scale; static inline void profil_count (void *pc) { - size_t i = ((pc - pc_offset - (void *) 0) / 2) * pc_scale / 65536; + size_t i = (pc - pc_offset - (void *) 0) / 2; + + if (sizeof (unsigned long long int) > sizeof (size_t)) + i = (unsigned long long int) i * pc_scale / 65536; + else + i = i / 65536 * pc_scale + i % 65536 * pc_scale / 65536; + if (i < nsamples) ++samples[i]; } @@ -65,11 +71,11 @@ profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale) if (samples == NULL) /* Wasn't turned on. */ return 0; - samples = NULL; - if (sigaction (SIGPROF, &oact, NULL) < 0) + if (setitimer (ITIMER_PROF, &otimer, NULL) < 0) return -1; - return setitimer (ITIMER_PROF, &otimer, NULL); + samples = NULL; + return sigaction (SIGPROF, &oact, NULL); } samples = sample_buffer; |