AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/mach/hurd/mlock.c: New file.

Browse Source 
* sysdeps/mach/hurd/munlock.c: New file.
	* sysdeps/mach/hurd/bits/posix_opt.h (_POSIX_MEMLOCK_RANGE): Define it.

	* misc/Makefile (routines): Add mlock munlock mlockall munlockall.
	* sysdeps/generic/mlock.c: New file.
	* sysdeps/generic/munlock.c: New file.
	* sysdeps/generic/mlockall.c: New file.
	* sysdeps/generic/munlockall.c: New file.
	* sysdeps/generic/bits/mman.h (MCL_CURRENT, MCL_FUTURE): New macros.
	* sysdeps/unix/sysv/linux/syscalls.list (mlock, munlock,
	mlockall, munlockall): Change caller field to - from EXTRA.
	Don't use __ names; not used (and not declared in include/sys/mman.h).
This commit is contained in:
Roland McGrath 2001-04-19 23:25:40 +00:00
parent 5017b2c845
commit d81b986bea
12 changed files with 270 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,5 +1,19 @@
2001-04-19 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/mlock.c: New file.
* sysdeps/mach/hurd/munlock.c: New file.
* sysdeps/mach/hurd/bits/posix_opt.h (_POSIX_MEMLOCK_RANGE): Define it.
* misc/Makefile (routines): Add mlock munlock mlockall munlockall.
* sysdeps/generic/mlock.c: New file.
* sysdeps/generic/munlock.c: New file.
* sysdeps/generic/mlockall.c: New file.
* sysdeps/generic/munlockall.c: New file.
* sysdeps/generic/bits/mman.h (MCL_CURRENT, MCL_FUTURE): New macros.
* sysdeps/unix/sysv/linux/syscalls.list (mlock, munlock,
mlockall, munlockall): Change caller field to - from EXTRA.
Don't use __ names; not used (and not declared in include/sys/mman.h).
* hurd/privports.c (__get_privileged_ports): Renamed with __.
Use __ names for calls we make.
(get_privileged_ports): Add alias.

8
bits/mman.h
View File

@ -1,5 +1,5 @@
/* Definitions for BSD-style memory management.
Copyright (C) 1994-1998, 2000 Free Software Foundation, Inc.
Copyright (C) 1994-1998,2000,01 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
@ -79,3 +79,9 @@
# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */
# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */
#endif
/* Flags for `mlockall' (can be OR'd together). */
#define MCL_CURRENT 1 /* Lock all currently mapped pages. */
#define MCL_FUTURE 2 /* Lock all additions to address
space. */

5
misc/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
# Copyright (C) 1991-1999,2000,01 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
@ -52,7 +52,8 @@ routines := brk sbrk sstk ioctl \
chflags fchflags \
insremque getttyent getusershell getpass ttyslot \
syslog syscall daemon \
mmap munmap mprotect msync madvise mmap64 mincore \
mmap mmap64 munmap mprotect msync madvise mincore \
mlock munlock mlockall munlockall \
efgcvt efgcvt_r qefgcvt qefgcvt_r \
hsearch hsearch_r tsearch lsearch \
err error ustat \

8
sysdeps/generic/bits/mman.h
View File

@ -1,5 +1,5 @@
/* Definitions for BSD-style memory management.
Copyright (C) 1994-1998, 2000 Free Software Foundation, Inc.
Copyright (C) 1994-1998,2000,01 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
@ -79,3 +79,9 @@
# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */
# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */
#endif
/* Flags for `mlockall' (can be OR'd together). */
#define MCL_CURRENT 1 /* Lock all currently mapped pages. */
#define MCL_FUTURE 2 /* Lock all additions to address
space. */

35
sysdeps/generic/mlock.c Normal file
View File

@ -0,0 +1,35 @@
/* mlock -- guarantee pages are resident in memory. Stub version.
Copyright (C) 2001 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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
/* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to
be memory resident. */
int
mlock (const void *addr, size_t len)
{
__set_errno (ENOSYS);
return -1;
}
stub_warning (mlock)
#include <stub-tag.h>

36
sysdeps/generic/mlockall.c Normal file
View File

@ -0,0 +1,36 @@
/* mlockall -- lock in core all the pages in this process. Stub version.
Copyright (C) 2001 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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
/* Cause all currently mapped pages of the process to be memory resident
until unlocked by a call to the `munlockall', until the process exits,
or until the process calls `execve'. */
int
mlockall (int flags)
{
__set_errno (ENOSYS);
return -1;
}
stub_warning (mlockall)
#include <stub-tag.h>

34
sysdeps/generic/munlock.c Normal file
View File

@ -0,0 +1,34 @@
/* munlock -- undo the effects of prior mlock calls. Stub version.
Copyright (C) 2001 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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
/* Undo the effects on these whole pages of any prior mlock calls. */
int
munlock (const void *addr, size_t len)
{
__set_errno (ENOSYS);
return -1;
}
stub_warning (munlock)
#include <stub-tag.h>

34
sysdeps/generic/munlockall.c Normal file
View File

@ -0,0 +1,34 @@
/* munlockall -- undo the effects of all prior mlock calls. Stub version.
Copyright (C) 2001 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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
/* Undo the effects of all prior mlock calls in this process. */
int
munlockall (void)
{
__set_errno (ENOSYS);
return -1;
}
stub_warning (munlockall)
#include <stub-tag.h>

5
sysdeps/mach/hurd/bits/posix_opt.h
View File

@ -1,5 +1,5 @@
/* Define POSIX options for GNU/Hurd.
Copyright (C) 1998, 2000 Free Software Foundation, Inc.
Copyright (C) 1998,2000,01 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
@ -40,6 +40,9 @@
/* Mapping of files to memory is supported. */
#define _POSIX_MAPPED_FILES 1
/* Locking of ranges of memory is supported. */
#define _POSIX_MEMLOCK_RANGE 1
/* Setting of memory protections is supported. */
#define _POSIX_MEMORY_PROTECTION 1

47
sysdeps/mach/hurd/mlock.c Normal file
View File

@ -0,0 +1,47 @@
/* mlock -- guarantee pages are resident in memory. Mach/Hurd version.
Copyright (C) 2001 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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
#include <hurd.h>
#include <mach/mach_host.h>
/* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to
be memory resident. */
int
mlock (const void *addr, size_t len)
{
mach_port_t hostpriv;
vm_address_t page;
error_t err;
err = __get_privileged_ports (&hostpriv, NULL);
if (err)
return __hurd_fail (EPERM);
page = trunc_page ((vm_address_t) addr);
len = round_page ((vm_address_t) addr + len) - page;
err = __vm_wire (hostpriv, __mach_task_self (), page, len,
VM_PROT_ALL); /* XXX ? */
__mach_port_deallocate (__mach_task_self (), hostpriv);
return err ? __hurd_fail (err) : 0;
}

45
sysdeps/mach/hurd/munlock.c Normal file
View File

@ -0,0 +1,45 @@
/* munlock -- undo the effects of prior mlock calls. Mach/Hurd version.
Copyright (C) 2001 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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
#include <hurd.h>
#include <mach/mach_host.h>
/* Undo the effects on these whole pages of any prior mlock calls. */
int
munlock (const void *addr, size_t len)
{
mach_port_t hostpriv;
vm_address_t page;
error_t err;
err = __get_privileged_ports (&hostpriv, NULL);
if (err)
return __hurd_fail (EPERM);
page = trunc_page ((vm_address_t) addr);
len = round_page ((vm_address_t) addr + len) - page;
err = __vm_wire (hostpriv, __mach_task_self (), page, len, VM_PROT_NONE);
__mach_port_deallocate (__mach_task_self (), hostpriv);
return err ? __hurd_fail (err) : 0;
}

8
sysdeps/unix/sysv/linux/syscalls.list
View File

@ -23,13 +23,13 @@ klogctl EXTRA syslog i:isi klogctl
lchown - lchown i:sii __lchown lchown
madvise - madvise i:pii posix_madvise madvise
mincore - mincore i:anV mincore
mlock EXTRA mlock i:bn __mlock mlock
mlockall EXTRA mlockall i:i __mlockall mlockall
mlock - mlock i:bn mlock
mlockall - mlockall i:i mlockall
mmap - mmap b:aniiii __mmap mmap
mount EXTRA mount i:sssip __mount mount
mremap EXTRA mremap b:aini __mremap mremap
munlock EXTRA munlock i:ai __munlock munlock
munlockall EXTRA munlockall i: __munlockall munlockall
munlock - munlock i:ai munlock
munlockall - munlockall i: munlockall
nanosleep - nanosleep i:pp __libc_nanosleep __nanosleep nanosleep
nfsservctl EXTRA nfsservctl i:ipp nfsservctl
pause - pause i: __libc_pause pause