mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
* sysdeps/mach/hurd/brk.c (DATA_SIZE): Bump to 128MB.
(_hurd_set_brk): Try to allocate more space when we run out. * sysdeps/generic/sbrk.c: If __curbrk is zero, call __brk with zero and examine it again. * sysdeps/unix/sysv/linux/i386/brk.c: New file. * sysdeps/unix/sysv/linux/i386/brk.S: File removed. * sysdeps/unix/sysv/linux/i386/sbrk.S: File removed. * sysdeps/unix/sysv/linux/dl-sysdep.c: New file.
This commit is contained in:
Roland McGrath
parent
0fe4e55291
commit
683158e0c4
@ -1,7 +1,14 @@
|
||||
Sat Dec 2 03:47:27 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
|
||||
|
||||
* sysdeps/unix/sysv/linux/i386/sbrk.S: File removed.
|
||||
* sysdeps/mach/hurd/brk.c (DATA_SIZE): Bump to 128MB.
|
||||
(_hurd_set_brk): Try to allocate more space when we run out.
|
||||
|
||||
* sysdeps/generic/sbrk.c: If __curbrk is zero, call __brk with
|
||||
zero and examine it again.
|
||||
* sysdeps/unix/sysv/linux/i386/brk.c: New file.
|
||||
* sysdeps/unix/sysv/linux/i386/brk.S: File removed.
|
||||
* sysdeps/unix/sysv/linux/i386/sbrk.S: File removed.
|
||||
* sysdeps/unix/sysv/linux/dl-sysdep.c: New file.
|
||||
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start) [DL_SYSDEP_INIT]:
|
||||
Invoke this macro before calling DL_MAIN.
|
||||
|
||||
|
||||
@ -15,26 +15,30 @@ You should have received a copy of the GNU General Public License
|
||||
along with the GNU C Library; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
#include <ansidecl.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
|
||||
/* Defined in brk.c. */
|
||||
extern PTR __curbrk;
|
||||
extern int EXFUN(__brk, (PTR addr));
|
||||
extern void *__curbrk;
|
||||
extern int __brk (void *addr);
|
||||
|
||||
/* Extend the process's data space by INCREMENT.
|
||||
If INCREMENT is negative, shrink data space by - INCREMENT.
|
||||
Return start of new space allocated, or -1 for errors. */
|
||||
PTR
|
||||
DEFUN(__sbrk, (increment), int increment)
|
||||
void *
|
||||
__sbrk (int increment)
|
||||
{
|
||||
char *oldbrk;
|
||||
void *oldbrk;
|
||||
|
||||
if (__curbrk == 0 && __brk (0) < 0)
|
||||
return (void *) -1;
|
||||
|
||||
if (increment == 0)
|
||||
return __curbrk;
|
||||
|
||||
oldbrk = __curbrk;
|
||||
if (__brk(oldbrk + increment) < 0)
|
||||
return (PTR) -1;
|
||||
if (__brk (oldbrk + increment) < 0)
|
||||
return (void *) -1;
|
||||
|
||||
return oldbrk;
|
||||
}
|
||||
|
||||
@ -23,8 +23,8 @@ Cambridge, MA 02139, USA. */
|
||||
#include <cthreads.h> /* For `struct mutex'. */
|
||||
|
||||
|
||||
/* Initial maximum size of the data segment (32MB, which is arbitrary). */
|
||||
#define DATA_SIZE (32 * 1024 * 1024)
|
||||
/* Initial maximum size of the data segment (this is arbitrary). */
|
||||
#define DATA_SIZE (128 * 1024 * 1024)
|
||||
|
||||
|
||||
/* Up to the page including this address is allocated from the kernel.
|
||||
@ -85,13 +85,20 @@ _hurd_set_brk (vm_address_t addr)
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Make the memory accessible. */
|
||||
if (err = __vm_protect (__mach_task_self (), pagebrk, pagend - pagebrk,
|
||||
0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE))
|
||||
if (pagend > _hurd_data_end)
|
||||
{
|
||||
errno = err;
|
||||
return -1;
|
||||
/* We didn't allocate enough space! Hopefully we can get some more! */
|
||||
err = __vm_allocate (__mach_task_self (), &pagebrk, pagend - pagebrk, 0);
|
||||
if (! err)
|
||||
_hurd_data_end = pagend;
|
||||
}
|
||||
else
|
||||
/* Make the memory accessible. */
|
||||
err = __vm_protect (__mach_task_self (), pagebrk, pagend - pagebrk,
|
||||
0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
|
||||
|
||||
if (err)
|
||||
return __hurd_fail (err);
|
||||
|
||||
_hurd_brk = addr;
|
||||
return 0;
|
||||
@ -112,7 +119,7 @@ init_brk (void)
|
||||
|
||||
pagend = round_page (_hurd_brk);
|
||||
|
||||
_hurd_data_end = (vm_address_t) &__data_start + DATA_SIZE;
|
||||
_hurd_data_end = round_page ((vm_address_t) &__data_start + DATA_SIZE);
|
||||
|
||||
if (pagend < _hurd_data_end)
|
||||
{
|
||||
|
||||
44
sysdeps/unix/sysv/linux/dl-sysdep.c
Normal file
44
sysdeps/unix/sysv/linux/dl-sysdep.c
Normal file
@ -0,0 +1,44 @@
|
||||
/* Dynamic linker system dependencies for Linux.
|
||||
Copyright (C) 1995 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If
|
||||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||||
Cambridge, MA 02139, USA. */
|
||||
|
||||
/* Linux needs some special initialization, but otherwise uses
|
||||
the generic dynamic linker system interface code. */
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
#define DL_SYSDEP_INIT frob_brk ()
|
||||
|
||||
static inline void
|
||||
frob_brk (void)
|
||||
{
|
||||
extern void _end;
|
||||
__brk (0); /* Initialize the break. */
|
||||
if (__sbrk (0) == &_end)
|
||||
{
|
||||
/* The dynamic linker was run as a program, and so the initial break
|
||||
starts just after our bss, at &_end. The malloc in dl-minimal.c
|
||||
will consume the rest of this page, so tell the kernel to move the
|
||||
break up that far. When the user program examines its break, it
|
||||
will see this new value and not clobber our data. */
|
||||
size_t pg = __getpagesize ();
|
||||
__sbrk (pg - ((&_end - (void *) 0) & pg));
|
||||
}
|
||||
}
|
||||
|
||||
#include <sysdeps/generic/dl-sysdep.c>
|
||||
49
sysdeps/unix/sysv/linux/i386/brk.c
Normal file
49
sysdeps/unix/sysv/linux/i386/brk.c
Normal file
@ -0,0 +1,49 @@
|
||||
/* brk system call for Linux/i386.
|
||||
Copyright (C) 1995 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If
|
||||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||||
Cambridge, MA 02139, USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <sysdep.h>
|
||||
|
||||
void *__curbrk;
|
||||
|
||||
int
|
||||
__brk (void *addr)
|
||||
{
|
||||
void *newbrk, *scratch;
|
||||
|
||||
asm ("movl %%ebx, %1\n" /* Save %ebx in scratch register. */
|
||||
"movl %3, %%ebx\n" /* Put ADDR in %ebx to be syscall arg. */
|
||||
"int $0x80 # %2\n" /* Perform the system call. */
|
||||
"movl %1, %%ebx\n" /* Restore %ebx from scratch register. */
|
||||
: "=a" (newbrk), "=r" (scratch)
|
||||
: "0" (SYS_ify (brk)), "g" (addr));
|
||||
|
||||
__curbrk = newbrk;
|
||||
|
||||
if (newbrk < addr)
|
||||
{
|
||||
errno = ENOMEM;
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
weak_alias (__brk, brk)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user