aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/mach
diff options
context:
space:
mode:
authorThomas Bushnell, BSG <thomas@gnu.org>1996-09-06 00:08:55 +0000
committerThomas Bushnell, BSG <thomas@gnu.org>1996-09-06 00:08:55 +0000
commitacf51e02617b9b8da57b0ee982f96080ee954a38 (patch)
treea656620596b189465593e06b89fb31478dbcf2f3 /sysdeps/mach
parent57ba7bb47152ed3e50805db2bca137cb866a9a71 (diff)
downloadglibc-acf51e02617b9b8da57b0ee982f96080ee954a38.zip
glibc-acf51e02617b9b8da57b0ee982f96080ee954a38.tar.gz
glibc-acf51e02617b9b8da57b0ee982f96080ee954a38.tar.bz2
*** empty log message ***cvs/libc-960906
Thu Sep 5 13:18:25 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/i386/init-first.c (__libc_argc, __libc_argv): New variables. (init1): Initialize them. * hurd/hurdinit.c (_hurd_setproc): Now that happens to be available, pass __libc_argv in call to __proc_set_arg_locations. * gmon/gmon.c (write_hist): Call __profile_frequency instead of hertz. (hertz): Delete function. * gmon/Makefile (routines): Add `prof-freq'. * sysdeps/generic/prof-freq.c: New file. * sysdeps/mach/hurd/prof-freq.c: New (stubby) file. * sysdeps/mach/hurd/profil.c (profile_tick): New variable. (update_waiter): Store frequency in profile_tick. (__profile_frequency): New function. * sysdeps/mach/hurd/sendto.c (sendto): Use prototype definition syntax. * Rules (generated): Restore reference to $(generated). * mach/Machrules (mig.uh, mig.__h): Don't include $(user-MIGFLAGS) here. * malloc/free.c (free): __lib_malloc_lock -> __libc_malloc_lock. * malloc/free.c: Provide extern decl of __libc_malloc_lock. * malloc/realloc.c: Likewise. * malloc/malloc-find.c: Likewise. * malloc/malloc-size.c: Likewise. * malloc/malloc-walk.c: Likewise. * malloc/memalign.c: Likewise. * mach/Machrules (mig.uh, mig.__h): Include $(user-MIGFLAGS) and
Diffstat (limited to 'sysdeps/mach')
-rw-r--r--sysdeps/mach/hurd/i386/init-first.c7
-rw-r--r--sysdeps/mach/hurd/prof-freq.c2
-rw-r--r--sysdeps/mach/hurd/profil.c12
-rw-r--r--sysdeps/mach/hurd/sendto.c13
4 files changed, 22 insertions, 12 deletions
diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
index d095580..5203b4c 100644
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -31,15 +31,16 @@ extern void __libc_global_ctors (void);
int __libc_multiple_libcs = 1;
+int __libc_argc;
+char **__libc_argv;
+
void *(*_cthread_init_routine) (void); /* Returns new SP to use. */
void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__));
-
/* Things that want to be run before _hurd_init or much anything else.
Importantly, these are called before anything tries to use malloc. */
DEFINE_HOOK (_hurd_preinit_hook, (void));
-
static void
init1 (int argc, char *arg0, ...)
{
@@ -47,6 +48,8 @@ init1 (int argc, char *arg0, ...)
char **envp = &argv[argc + 1];
struct hurd_startup_data *d;
+ __libc_argc = argc;
+ __libc_argv = argv;
__environ = envp;
while (*envp)
++envp;
diff --git a/sysdeps/mach/hurd/prof-freq.c b/sysdeps/mach/hurd/prof-freq.c
new file mode 100644
index 0000000..a370703
--- /dev/null
+++ b/sysdeps/mach/hurd/prof-freq.c
@@ -0,0 +1,2 @@
+/* __profile_frequency is in sysdeps/mach/hurd/profil.c. This file
+is here as a place-holder to prevent the use of sysdeps/generic/prof-freq.c. */
diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c
index 431982e..41c7c4b 100644
--- a/sysdeps/mach/hurd/profil.c
+++ b/sysdeps/mach/hurd/profil.c
@@ -36,6 +36,7 @@ static size_t sample_scale;
static sampled_pc_seqno_t seqno;
static struct mutex lock = MUTEX_INITIALIZER;
static mach_msg_timeout_t collector_timeout; /* ms between collections. */
+static int profile_tick;
/* Enable statistical profiling, writing samples of the PC into at most
SIZE bytes of SAMPLE_BUFFER; every processor clock tick while profiling
@@ -62,8 +63,7 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
if (! err)
{
- int tick; /* Microseconds per sample. */
- err = __task_enable_pc_sampling (__mach_task_self (), &tick,
+ err = __task_enable_pc_sampling (__mach_task_self (), &profile_tick,
SAMPLED_PC_PERIODIC);
if (!err && sample_scale == 0)
/* Profiling was not turned on, so the collector thread was
@@ -79,7 +79,7 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
and the kernel buffer size we get the length of time it takes
to fill the buffer; translate that to milliseconds for
mach_msg, and chop it in half for general lag factor. */
- collector_timeout = MAX_PC_SAMPLES * tick / 1000 / 2;
+ collector_timeout = MAX_PC_SAMPLES * profile_tick / 1000 / 2;
}
}
@@ -87,6 +87,12 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
}
int
+__profile_frequency ()
+{
+ return profile_tick;
+}
+
+int
profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
{
error_t err;
diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c
index 88026b8..1be2cbb 100644
--- a/sysdeps/mach/hurd/sendto.c
+++ b/sysdeps/mach/hurd/sendto.c
@@ -27,13 +27,12 @@ Cambridge, MA 02139, USA. */
/* Send N bytes of BUF on socket FD to peer at address ADDR (which is
ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */
int
-sendto (fd, buf, n, flags, addr, addr_len)
- int fd;
- const void *buf;
- size_t n;
- int flags;
- const struct sockaddr_un *addr;
- size_t addr_len;
+sendto (int fd,
+ const void *buf,
+ size_t n,
+ int flags,
+ const struct sockaddr_un *addr,
+ size_t addr_len)
{
addr_port_t aport;
error_t err;