[Glibc-bsd-commits] r5834 - in trunk/glibc-ports: fbtl fbtl/sysdeps/pthread fbtl/sysdeps/pthread/bits kfreebsd kfreebsd/i386 kfreebsd/x86_64
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Fri Nov 20 21:53:49 UTC 2015
Author: aurel32
Date: 2015-11-20 21:53:49 +0000 (Fri, 20 Nov 2015)
New Revision: 5834
Added:
trunk/glibc-ports/fbtl/sysdeps/pthread/shm-directory.h
trunk/glibc-ports/kfreebsd/shm-directory.c
Modified:
trunk/glibc-ports/fbtl/Makefile
trunk/glibc-ports/fbtl/Versions
trunk/glibc-ports/fbtl/sem_open.c
trunk/glibc-ports/fbtl/sem_unlink.c
trunk/glibc-ports/fbtl/semaphoreP.h
trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h
trunk/glibc-ports/kfreebsd/Versions
trunk/glibc-ports/kfreebsd/i386/libc.abilist
trunk/glibc-ports/kfreebsd/x86_64/libc.abilist
Log:
Merge from upstream:
commit 78e21c5df674e037d06e86c5d4cb95818c8f6b8c
Author: Roland McGrath <roland at hack.frob.com>
Date: Thu Dec 11 14:15:51 2014 -0800
Refactor shm_{open,unlink} code to separate Linux-specific directory choice from POSIX-generic code.
commit e4f639e4a106d90c6f3159230788653fd6e40a26
Author: Roland McGrath <roland at hack.frob.com>
Date: Fri Dec 12 13:17:21 2014 -0800
NPTL: Refactor named semaphore code to use shm-directory.h
Modified: trunk/glibc-ports/fbtl/Makefile
===================================================================
--- trunk/glibc-ports/fbtl/Makefile 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/fbtl/Makefile 2015-11-20 21:53:49 UTC (rev 5834)
@@ -92,6 +92,7 @@
old_pthread_atfork pthread_atfork \
pthread_getcpuclockid \
pthread_clock_gettime pthread_clock_settime \
+ shm-directory \
sem_init sem_destroy \
sem_open sem_close sem_unlink \
sem_getvalue \
Modified: trunk/glibc-ports/fbtl/Versions
===================================================================
--- trunk/glibc-ports/fbtl/Versions 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/fbtl/Versions 2015-11-20 21:53:49 UTC (rev 5834)
@@ -246,5 +246,6 @@
__pthread_initialize_minimal;
__pthread_clock_gettime; __pthread_clock_settime;
__pthread_unwind; __pthread_get_minstack;
+ __shm_directory;
}
}
Modified: trunk/glibc-ports/fbtl/sem_open.c
===================================================================
--- trunk/glibc-ports/fbtl/sem_open.c 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/fbtl/sem_open.c 2015-11-20 21:53:49 UTC (rev 5834)
@@ -18,8 +18,6 @@
#include <errno.h>
#include <fcntl.h>
-#include <mntent.h>
-#include <paths.h>
#include <pthread.h>
#include <search.h>
#include <semaphore.h>
@@ -30,141 +28,10 @@
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/statfs.h>
-#if 0
-#include <linux_fsinfo.h>
-#endif
#include "semaphoreP.h"
+#include <shm-directory.h>
-
-/* Information about the mount point. */
-struct mountpoint_info mountpoint attribute_hidden;
-
-/* This is the default mount point. */
-static const char defaultmount[] = "/dev/shm";
-/* This is the default directory. */
-static const char defaultdir[] = "/dev/shm/sem.";
-
-/* Protect the `mountpoint' variable above. */
-pthread_once_t __namedsem_once attribute_hidden = PTHREAD_ONCE_INIT;
-
-#if 1
-
-/* This is the alternate debian mount point. */
-static const char alternatemount[] = "/run/shm";
-/* This is the alternate debian directory. */
-static const char alternatedir[] = "/run/shm/sem.";
-
-/* Determine where the shmfs is mounted (if at all). */
-void
-attribute_hidden
-__where_is_shmfs (void)
-{
- struct statfs f;
-
- /* The canonical place is /dev/shm. This is at least what the
- documentation tells everybody to do. */
- if (statfs (defaultmount, &f) == 0)
- {
- /* It is in the normal place. */
- mountpoint.dir = (char *) defaultdir;
- mountpoint.dirlen = sizeof (defaultdir) - 1;
-
- return;
- }
-
- /* The alternate place is /run/shm. */
- if (statfs (alternatemount, &f) == 0)
- {
- /* It is in the normal place. */
- mountpoint.dir = (char *) alternatedir;
- mountpoint.dirlen = sizeof (alternatedir) - 1;
-
- return;
- }
-
- /* Not configured => not supported */
-}
-
-#else
-
-
-/* Determine where the shmfs is mounted (if at all). */
-void
-attribute_hidden
-__where_is_shmfs (void)
-{
- char buf[512];
- struct statfs f;
- struct mntent resmem;
- struct mntent *mp;
- FILE *fp;
-
- /* The canonical place is /dev/shm. This is at least what the
- documentation tells everybody to do. */
- if (__statfs (defaultmount, &f) == 0 && f.f_type == SHMFS_SUPER_MAGIC)
- {
- /* It is in the normal place. */
- mountpoint.dir = (char *) defaultdir;
- mountpoint.dirlen = sizeof (defaultdir) - 1;
-
- return;
- }
-
- /* OK, do it the hard way. Look through the /proc/mounts file and if
- this does not exist through /etc/fstab to find the mount point. */
- fp = __setmntent ("/proc/mounts", "r");
- if (__builtin_expect (fp == NULL, 0))
- {
- fp = __setmntent (_PATH_MNTTAB, "r");
- if (__builtin_expect (fp == NULL, 0))
- /* There is nothing we can do. Blind guesses are not helpful. */
- return;
- }
-
- /* Now read the entries. */
- while ((mp = __getmntent_r (fp, &resmem, buf, sizeof buf)) != NULL)
- /* The original name is "shm" but this got changed in early Linux
- 2.4.x to "tmpfs". */
- if (strcmp (mp->mnt_type, "tmpfs") == 0
- || strcmp (mp->mnt_type, "shm") == 0)
- {
- /* Found it. There might be more than one place where the
- filesystem is mounted but one is enough for us. */
- size_t namelen;
-
- /* First make sure this really is the correct entry. At least
- some versions of the kernel give wrong information because
- of the implicit mount of the shmfs for SysV IPC. */
- if (__statfs (mp->mnt_dir, &f) != 0 || f.f_type != SHMFS_SUPER_MAGIC)
- continue;
-
- namelen = strlen (mp->mnt_dir);
-
- if (namelen == 0)
- /* Hum, maybe some crippled entry. Keep on searching. */
- continue;
-
- mountpoint.dir = (char *) malloc (namelen + 4 + 2);
- if (mountpoint.dir != NULL)
- {
- char *cp = __mempcpy (mountpoint.dir, mp->mnt_dir, namelen);
- if (cp[-1] != '/')
- *cp++ = '/';
- cp = stpcpy (cp, "sem.");
- mountpoint.dirlen = cp - mountpoint.dir;
- }
-
- break;
- }
-
- /* Close the stream. */
- __endmntent (fp);
-}
-
-#endif
-
/* Comparison function for search of existing mapping. */
int
attribute_hidden
@@ -258,14 +125,9 @@
if (result != existing && existing != SEM_FAILED && existing != MAP_FAILED)
{
/* Do not disturb errno. */
-#if 1
int saved_errno = errno;
munmap(existing, sizeof (sem_t));
errno = saved_errno;
-#else
- INTERNAL_SYSCALL_DECL (err);
- INTERNAL_SYSCALL (munmap, err, 2, existing, sizeof (sem_t));
-#endif
}
return result;
@@ -275,42 +137,17 @@
sem_t *
sem_open (const char *name, int oflag, ...)
{
- char *finalname;
- sem_t *result = SEM_FAILED;
int fd;
+ sem_t *result;
- /* Determine where the shmfs is mounted. */
- __pthread_once (&__namedsem_once, __where_is_shmfs);
+ /* Create the name of the final file in local variable SHM_NAME. */
+ SHM_GET_NAME (EINVAL, SEM_FAILED, SEM_SHM_PREFIX);
- /* If we don't know the mount points there is nothing we can do. Ever. */
- if (mountpoint.dir == NULL)
- {
- __set_errno (ENOSYS);
- return SEM_FAILED;
- }
-
- /* Construct the filename. */
- while (name[0] == '/')
- ++name;
-
- if (name[0] == '\0')
- {
- /* The name "/" is not supported. */
- __set_errno (EINVAL);
- return SEM_FAILED;
- }
- size_t namelen = strlen (name) + 1;
-
- /* Create the name of the final file. */
- finalname = (char *) alloca (mountpoint.dirlen + namelen);
- __mempcpy (__mempcpy (finalname, mountpoint.dir, mountpoint.dirlen),
- name, namelen);
-
/* If the semaphore object has to exist simply open it. */
if ((oflag & O_CREAT) == 0 || (oflag & O_EXCL) == 0)
{
try_again:
- fd = __libc_open (finalname,
+ fd = __libc_open (shm_name,
(oflag & ~(O_CREAT|O_ACCMODE)) | O_NOFOLLOW | O_RDWR);
if (fd == -1)
@@ -368,8 +205,8 @@
memset ((char *) &sem.initsem + sizeof (struct new_sem), '\0',
sizeof (sem_t) - sizeof (struct new_sem));
- tmpfname = (char *) alloca (mountpoint.dirlen + 6 + 1);
- char *xxxxxx = __mempcpy (tmpfname, mountpoint.dir, mountpoint.dirlen);
+ tmpfname = (char *) alloca (shm_dirlen + sizeof SEM_SHM_PREFIX + 6);
+ char *xxxxxx = __mempcpy (tmpfname, shm_dir, shm_dirlen);
int retries = 0;
#define NRETRIES 50
@@ -412,7 +249,7 @@
fd, 0)) != MAP_FAILED)
{
/* Create the file. Don't overwrite an existing file. */
- if (link (tmpfname, finalname) != 0)
+ if (link (tmpfname, shm_name) != 0)
{
/* Undo the mapping. */
(void) munmap (result, sizeof (sem_t));
@@ -453,8 +290,9 @@
if (fd != -1)
{
/* Do not disturb errno. */
- INTERNAL_SYSCALL_DECL (err);
- INTERNAL_SYSCALL (close, err, 1, fd);
+ int save = errno;
+ __libc_close (fd);
+ errno = save;
}
return result;
Modified: trunk/glibc-ports/fbtl/sem_unlink.c
===================================================================
--- trunk/glibc-ports/fbtl/sem_unlink.c 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/fbtl/sem_unlink.c 2015-11-20 21:53:49 UTC (rev 5834)
@@ -22,44 +22,16 @@
#include <string.h>
#include <unistd.h>
#include "semaphoreP.h"
+#include <shm-directory.h>
-
int
-sem_unlink (name)
- const char *name;
+sem_unlink (const char *name)
{
- char *fname;
- size_t namelen;
-
- /* Determine where the shmfs is mounted. */
- __pthread_once (&__namedsem_once, __where_is_shmfs);
-
- /* If we don't know the mount points there is nothing we can do. Ever. */
- if (mountpoint.dir == NULL)
- {
- __set_errno (ENOSYS);
- return -1;
- }
-
/* Construct the filename. */
- while (name[0] == '/')
- ++name;
+ SHM_GET_NAME (ENOENT, -1, SEM_SHM_PREFIX);
- if (name[0] == '\0')
- {
- /* The name "/" is not supported. */
- __set_errno (ENOENT);
- return -1;
- }
- namelen = strlen (name);
-
- /* Create the name of the file. */
- fname = (char *) alloca (mountpoint.dirlen + namelen + 1);
- __mempcpy (__mempcpy (fname, mountpoint.dir, mountpoint.dirlen),
- name, namelen + 1);
-
/* Now try removing it. */
- int ret = unlink (fname);
+ int ret = unlink (shm_name);
if (ret < 0 && errno == EPERM)
__set_errno (EACCES);
return ret;
Modified: trunk/glibc-ports/fbtl/semaphoreP.h
===================================================================
--- trunk/glibc-ports/fbtl/semaphoreP.h 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/fbtl/semaphoreP.h 2015-11-20 21:53:49 UTC (rev 5834)
@@ -19,14 +19,8 @@
#include <semaphore.h>
#include "pthreadP.h"
+#define SEM_SHM_PREFIX "sem."
-/* Mount point of the shared memory filesystem. */
-struct mountpoint_info
-{
- char *dir;
- size_t dirlen;
-};
-
/* Keeping track of currently used mappings. */
struct inuse_sem
{
@@ -38,11 +32,6 @@
};
-/* Variables used in multiple interfaces. */
-extern struct mountpoint_info mountpoint attribute_hidden;
-
-extern pthread_once_t __namedsem_once attribute_hidden;
-
/* The search tree for existing mappings. */
extern void *__sem_mappings attribute_hidden;
@@ -50,9 +39,6 @@
extern int __sem_mappings_lock attribute_hidden;
-/* Initializer for mountpoint. */
-extern void __where_is_shmfs (void) attribute_hidden;
-
/* Comparison function for search in tree with existing mappings. */
extern int __sem_search (const void *a, const void *b) attribute_hidden;
Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h 2015-11-20 21:53:49 UTC (rev 5834)
@@ -34,6 +34,12 @@
#include <tls.h>
#include <pthread-functions.h>
+#if IS_IN (libpthread)
+/* This gets us the declarations of the __pthread_* internal names,
+ and hidden_proto for them. */
+# include <fbtl/pthreadP.h>
+#endif
+
/* Mutex type. */
#if !IS_IN (libc) && !IS_IN (libpthread)
typedef pthread_mutex_t __libc_lock_t;
@@ -114,6 +120,12 @@
(__libc_pthread_functions_init ? PTHFCT_CALL (ptr_##FUNC, ARGS) : ELSE)
# define __libc_ptf_call_always(FUNC, ARGS) \
PTHFCT_CALL (ptr_##FUNC, ARGS)
+#elif IS_IN (libpthread)
+# define PTFAVAIL(NAME) 1
+# define __libc_ptf_call(FUNC, ARGS, ELSE) \
+ FUNC ARGS
+# define __libc_ptf_call_always(FUNC, ARGS) \
+ FUNC ARGS
#else
# define PTFAVAIL(NAME) (NAME != NULL)
# define __libc_ptf_call(FUNC, ARGS, ELSE) \
Added: trunk/glibc-ports/fbtl/sysdeps/pthread/shm-directory.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/shm-directory.h (rev 0)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/shm-directory.h 2015-11-20 21:53:49 UTC (rev 5834)
@@ -0,0 +1,31 @@
+/* Header for directory for shm/sem files. NPTL version.
+ Copyright (C) 2014-2015 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/>. */
+
+#ifndef _SHM_DIRECTORY_H
+
+#include <sysdeps/posix/shm-directory.h>
+
+/* For NPTL the __shm_directory function lives in libpthread.
+ We don't want PLT calls from there. But it's also used from
+ librt, so it cannot just be declared hidden. */
+
+#if IS_IN (libpthread)
+hidden_proto (__shm_directory)
+#endif
+
+#endif /* shm-directory.h */
Modified: trunk/glibc-ports/kfreebsd/Versions
===================================================================
--- trunk/glibc-ports/kfreebsd/Versions 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/kfreebsd/Versions 2015-11-20 21:53:49 UTC (rev 5834)
@@ -106,6 +106,9 @@
#errlist-compat 97
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
+ GLIBC_2.21 {
+ __statfs;
+ }
GLIBC_PRIVATE {
# needed by libpthread.
__clone; __libc_fork; __libc_sigaction; __kernel_getosreldate;
Modified: trunk/glibc-ports/kfreebsd/i386/libc.abilist
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/libc.abilist 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/kfreebsd/i386/libc.abilist 2015-11-20 21:53:49 UTC (rev 5834)
@@ -92,6 +92,9 @@
sys_errlist D 0x184
sys_nerr D 0x4
waitid F
+GLIBC_2.21
+ GLIBC_2.21 A
+ __statfs F
GLIBC_2.3
GLIBC_2.3 A
_Exit F
Added: trunk/glibc-ports/kfreebsd/shm-directory.c
===================================================================
--- trunk/glibc-ports/kfreebsd/shm-directory.c (rev 0)
+++ trunk/glibc-ports/kfreebsd/shm-directory.c 2015-11-20 21:53:49 UTC (rev 5834)
@@ -0,0 +1,102 @@
+/* Determine directory for shm/sem files. GNU/kFreeBSD version.
+ Copyright (C) 2000-2015 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 "shm-directory.h"
+
+#include <errno.h>
+#include <mntent.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/statfs.h>
+#include <bits/libc-lock.h>
+
+/* Mount point of the shared memory filesystem. */
+static struct
+{
+ char *dir;
+ size_t dirlen;
+} mountpoint;
+
+/* This is the default directory. */
+static const char defaultdir[] = "/dev/shm/";
+
+/* This is the alternate debian directory. */
+static const char alternatedir[] = "/run/shm";
+
+/* Protect the `mountpoint' variable above. */
+__libc_once_define (static, once);
+
+
+/* Determine where the shmfs is mounted (if at all). */
+static void
+where_is_shmfs (void)
+{
+ struct statfs f;
+
+ /* The canonical place is /dev/shm. This is at least what the
+ documentation tells everybody to do. */
+ if (__statfs (defaultdir, &f) == 0)
+ {
+ /* It is in the normal place. */
+ mountpoint.dir = (char *) defaultdir;
+ mountpoint.dirlen = sizeof (defaultdir) - 1;
+
+ return;
+ }
+
+ /* The alternate place is /run/shm. */
+ if (__statfs (alternatedir, &f) == 0)
+ {
+ /* It is in the normal place. */
+ mountpoint.dir = (char *) alternatedir;
+ mountpoint.dirlen = sizeof (alternatedir) - 1;
+
+ return;
+ }
+}
+
+
+const char *
+__shm_directory (size_t *len)
+{
+ /* Determine where the shmfs is mounted. */
+ __libc_once (once, where_is_shmfs);
+
+ /* If we don't know the mount points there is nothing we can do. Ever. */
+ if (__glibc_unlikely (mountpoint.dir == NULL))
+ {
+ __set_errno (ENOSYS);
+ return NULL;
+ }
+
+ *len = mountpoint.dirlen;
+ return mountpoint.dir;
+}
+#if IS_IN (libpthread)
+hidden_def (__shm_directory)
+#endif
+
+
+/* Make sure the table is freed if we want to free everything before
+ exiting. */
+libc_freeres_fn (freeit)
+{
+ if (mountpoint.dir != defaultdir)
+ free (mountpoint.dir);
+}
Modified: trunk/glibc-ports/kfreebsd/x86_64/libc.abilist
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/libc.abilist 2015-11-19 21:24:04 UTC (rev 5833)
+++ trunk/glibc-ports/kfreebsd/x86_64/libc.abilist 2015-11-20 21:53:49 UTC (rev 5834)
@@ -94,6 +94,9 @@
sys_errlist D 0x308
sys_nerr D 0x4
waitid F
+GLIBC_2.21
+ GLIBC_2.21 A
+ __statfs F
GLIBC_2.3
GLIBC_2.3 A
_Exit F
More information about the Glibc-bsd-commits
mailing list