summaryrefslogtreecommitdiff
path: root/hurd/hurdmalloc.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-04-01 05:04:31 +0000
committerRoland McGrath <roland@gnu.org>2001-04-01 05:04:31 +0000
commit8a0746ae74914cbdf02fc609e15d267692695792 (patch)
treeff39d2bacaa6ecc8896a8a42918443d4f0824f7d /hurd/hurdmalloc.c
parent24cf21d780e14d5a7e04257afdf67f6c7ca90f83 (diff)
* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't append
options after $(build-module), which is no longer a single command. (LDFLAGS-link-rpcuserlibs): New variable to hold those options. (LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New variables using it. Reported by Mark Kettenis <kettenis@gnu.org>. 2001-03-11 Roland McGrath <roland@frob.com> * elf/rtld.c (dl_main): Add cast to quiet warning. * elf/dl-load.c (_dl_map_object_from_fd): Likewise. * iconv/gconv_conf.c (__gconv_get_path): Likewise. (__gconv_read_conf): Likewise. * iconv/gconv_db.c (gen_steps): Likewise. (__gconv_find_transform): Likewise. * locale/programs/charmap-dir.c (fopen_uncompressed): Likewise. (fopen_uncompressed): Use const in second argument's type. 2001-03-11 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/dl-sysdep.c (__writev): New function. * mach/mach_error.h: Fix ancient #endif syntax. * hurd/hurdmalloc.c: Likewise. * sysdeps/generic/atomicity.h (exchange_and_add, atomic_add, compare_and_swap): Add volatile qualifier to first arg, to bring these prototypes in line with all the other implementations. Add a #warning to remind the builder that these are not atomic. 2001-03-04 Roland McGrath <roland@frob.com> * hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first member of TEMP_F so its type is _IO_FILE * as expected. * hurd/fopenport.c (seekio): Conditionalize type of POS argument on [USE_IN_LIBIO]. Check the value for overflow, since for libio it might exceed off_t's range. 2001-02-25 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype. * sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise. * sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a macro instead of an inline function, (MSG_EXAMINE): Likewise. * hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##. * hurd/get-host.c: Include <string.h> for decls of built-ins. * hurd/hurdchdir.c: Likewise. * sysdeps/mach/hurd/i386/sigreturn.c: Likweise. * sysdeps/mach/hurd/opendir.c: Likewise. * mach/mach_init.c: Include <unistd.h> for _exit decl. * mach/errsystems.awk: Give output file a trailing newline. * mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that the script will use our compiler for the cpp stage. With --enable-all-warnings we get a whole bunch of warnings, and these are just a few fixes; there are more needed to silence it. * mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern decls before extern inline defns to quiet gcc warning. * hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise. * sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.
Diffstat (limited to 'hurd/hurdmalloc.c')
-rw-r--r--hurd/hurdmalloc.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c
index cabcdcf0da..25bf876aa2 100644
--- a/hurd/hurdmalloc.c
+++ b/hurd/hurdmalloc.c
@@ -9,34 +9,40 @@
#define vm_allocate __vm_allocate
#define vm_page_size __vm_page_size
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
/*
* HISTORY
* $Log$
+ * Revision 1.14 2001/04/01 05:03:14 roland
+ * 2001-03-11 Roland McGrath <roland@frob.com>
+ *
+ * * mach/mach_error.h: Fix ancient #endif syntax.
+ * * hurd/hurdmalloc.c: Likewise.
+ *
* Revision 1.13 1996/12/20 01:32:01 drepper
* Update from main archive 961219
*
@@ -178,7 +184,7 @@ typedef struct free_list {
header_t head; /* head of free list for this size */
#ifdef DEBUG
int in_use; /* # mallocs - # frees */
-#endif DEBUG
+#endif /* DEBUG */
} *free_list_t;
/*
@@ -301,7 +307,7 @@ malloc(size)
#ifdef DEBUG
fl->in_use += 1;
-#endif DEBUG
+#endif /* DEBUG */
spin_unlock(&fl->lock);
/*
* Store free list pointer in block header
@@ -359,7 +365,7 @@ free(base)
fl->head = h;
#ifdef DEBUG
fl->in_use -= 1;
-#endif DEBUG
+#endif /* DEBUG */
spin_unlock(&fl->lock);
return;
}
@@ -455,7 +461,7 @@ print_malloc_free_list()
fprintf(stderr, " all sizes %10d %10d %10d\n",
total_used, total_free, total_used + total_free);
}
-#endif DEBUG
+#endif /* DEBUG */
static void
malloc_fork_prepare(void)