summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 21:32:59 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 21:32:59 +0000
commitafd7cd0b3df57dd6bef526408679b78ea38179ff (patch)
treeb683bcb2ae39f51086814a54f43aa9fef858ebf1 /sysdeps
parent0e019ac5cecf4e81beb9d7c5a8545e22334750f9 (diff)
parent24f3651607efe8b845f699378d2e8d231a6b6f4f (diff)
Merge commit 'refs/top-bases/tschwinge/Roger_Whittaker' into tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/htl/pt-getspecific.c1
-rw-r--r--sysdeps/htl/pt-setspecific.c1
-rw-r--r--sysdeps/htl/pthreadP.h2
-rw-r--r--sysdeps/mach/hurd/msync.c93
4 files changed, 97 insertions, 0 deletions
diff --git a/sysdeps/htl/pt-getspecific.c b/sysdeps/htl/pt-getspecific.c
index a0227a67f6..64ddf9551a 100644
--- a/sysdeps/htl/pt-getspecific.c
+++ b/sysdeps/htl/pt-getspecific.c
@@ -36,3 +36,4 @@ __pthread_getspecific (pthread_key_t key)
return self->thread_specifics[key];
}
strong_alias (__pthread_getspecific, pthread_getspecific);
+hidden_def (__pthread_getspecific)
diff --git a/sysdeps/htl/pt-setspecific.c b/sysdeps/htl/pt-setspecific.c
index a46a12f157..02aff417ef 100644
--- a/sysdeps/htl/pt-setspecific.c
+++ b/sysdeps/htl/pt-setspecific.c
@@ -48,3 +48,4 @@ __pthread_setspecific (pthread_key_t key, const void *value)
return 0;
}
strong_alias (__pthread_setspecific, pthread_setspecific);
+hidden_def (__pthread_setspecific)
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 132ac1718e..71c2fcd9c6 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -68,6 +68,8 @@ struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void) attri
#if IS_IN (libpthread)
hidden_proto (__pthread_key_create)
+hidden_proto (__pthread_getspecific)
+hidden_proto (__pthread_setspecific)
hidden_proto (_pthread_mutex_init)
#endif
diff --git a/sysdeps/mach/hurd/msync.c b/sysdeps/mach/hurd/msync.c
new file mode 100644
index 0000000000..3e41503ece
--- /dev/null
+++ b/sysdeps/mach/hurd/msync.c
@@ -0,0 +1,93 @@
+/* msync -- Synchronize mapped memory to external storage. Mach version.
+ Copyright (C) 2002-2018 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 Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <errno.h>
+
+#include <hurd/hurd.h>
+
+/* Synchronize the region starting at ADDR and extending LEN bytes with the
+ file it maps. Filesystem operations on a file being mapped are
+ unpredictable before this is done. */
+
+int
+msync (void *addr, size_t length, int flags)
+{
+ boolean_t should_flush = flags & MS_INVALIDATE ? 1 : 0;
+ boolean_t should_iosync = flags & MS_ASYNC ? 0 : 1;
+
+ vm_address_t cur = (vm_address_t) addr;
+ vm_address_t target = cur + length;
+
+ vm_size_t len;
+ vm_prot_t prot;
+ vm_prot_t max_prot;
+ vm_inherit_t inherit;
+ boolean_t shared;
+ memory_object_name_t obj;
+ vm_offset_t offset;
+
+ kern_return_t err;
+
+ if (flags & (MS_SYNC | MS_ASYNC) == (MS_SYNC | MS_ASYNC))
+ return __hurd_fail (EINVAL);
+
+ while (cur < target)
+ {
+ vm_address_t begin = cur;
+
+ err = __vm_region (__mach_task_self (),
+ &begin, &len, &prot, &max_prot, &inherit,
+ &shared, &obj, &offset)
+
+ if (err != KERN_SUCCESS)
+ return __hurd_fail (err);
+
+ if (begin > cur)
+ /* We were given an address before the first region,
+ or we found a hole. */
+ cur = begin;
+
+ if (cur >= target)
+ /* We were given an ending address within a hole. */
+ break;
+
+ if (MACH_PORT_VALID (obj))
+ {
+ vm_size_t sync_len;
+
+ if (begin + len > target)
+ sync_len = target - begin;
+ else
+ sync_len = len;
+
+ err = __vm_object_sync (obj, cur - begin + offset, sync_len,
+ should_flush, 1, should_iosync);
+ __mach_port_deallocate (__mach_task_self (), obj);
+
+ if (err)
+ return __hurd_fail (err);
+
+ }
+
+ cur = begin + len;
+ }
+
+ return 0;
+}