aboutsummaryrefslogtreecommitdiff
path: root/gmon
diff options
context:
space:
mode:
Diffstat (limited to 'gmon')
-rw-r--r--gmon/bb_exit_func.c6
-rw-r--r--gmon/gmon.c26
-rw-r--r--gmon/sys/gmon.h5
-rw-r--r--gmon/sys/gmon_out.h2
4 files changed, 23 insertions, 16 deletions
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 <sys/gmon_out.h>
#include <sys/types.h>
@@ -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 <sys/gmon_out.h>
#include <sys/uio.h>
+#include <errno.h>
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
@@ -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