GNU C Library master sources branch siddhesh/pthread_attr_default created. glibc-2.17-393-g5649d25

[siddhesh at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, siddhesh/pthread_attr_default has been created
        at  5649d25b7f53200664a7cb8852905ae3a24b265b (commit)

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5649d25b7f53200664a7cb8852905ae3a24b265b

commit 5649d25b7f53200664a7cb8852905ae3a24b265b
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Wed Mar 13 18:07:40 2013 +0530

    New API to set default thread attributes
    
    First draft.

diff --git a/Versions.def b/Versions.def
index 7c7d1f8..8210a75 100644
--- a/Versions.def
+++ b/Versions.def
@@ -101,6 +101,7 @@ libpthread {
   GLIBC_2.6
   GLIBC_2.11
   GLIBC_2.12
+  GLIBC_2.18
   GLIBC_PRIVATE
 }
 libresolv {
diff --git a/nptl/Makefile b/nptl/Makefile
index 6af4b37..e7e226a 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -125,7 +125,8 @@ libpthread-routines = nptl-init vars events version \
 		      pthread_mutexattr_setprioceiling tpp \
 		      pthread_mutex_getprioceiling \
 		      pthread_mutex_setprioceiling \
-		      pthread_setname pthread_getname
+		      pthread_setname pthread_getname \
+		      pthread_attr_set_default_np pthread_attr_get_default_np
 #		      pthread_setuid pthread_seteuid pthread_setreuid \
 #		      pthread_setresuid \
 #		      pthread_setgid pthread_setegid pthread_setregid \
@@ -201,7 +202,7 @@ CFLAGS-pt-system.c = -fexceptions
 
 
 tests = tst-typesizes \
-	tst-attr1 tst-attr2 tst-attr3 \
+	tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
 	tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \
 	tst-mutex7 tst-mutex8 tst-mutex9 tst-mutex5a tst-mutex7a \
 	tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 tst-mutexpi5 \
diff --git a/nptl/Versions b/nptl/Versions
index 6a10375..69092e4 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -252,6 +252,11 @@ libpthread {
     pthread_setname_np; pthread_getname_np;
   };
 
+  GLIBC_2.18 {
+    pthread_attr_get_default_np;
+    pthread_attr_set_default_np;
+  }
+
   GLIBC_PRIVATE {
     __pthread_initialize_minimal;
     __pthread_clock_gettime; __pthread_clock_settime;
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 23d3430..b18382a 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -424,6 +424,7 @@ __pthread_initialize_minimal_internal (void)
   /* Round the resource limit up to page size.  */
   limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz;
   default_attr.stacksize = limit.rlim_cur;
+  default_attr.guardsize = __getpagesize ();
 
 #ifdef SHARED
   /* Transfer the old value from the dynamic linker's internal location.  */
diff --git a/nptl/pthread_attr_get_default_np.c b/nptl/pthread_attr_get_default_np.c
new file mode 100644
index 0000000..0b2a81a
--- /dev/null
+++ b/nptl/pthread_attr_get_default_np.c
@@ -0,0 +1,35 @@
+/* Get the default attributes used by pthread_create in the process.
+   Copyright (C) 2013 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 <errno.h>
+#include <stdlib.h>
+#include <pthreadP.h>
+#include <assert.h>
+
+int
+pthread_attr_get_default_np (pthread_attr_t *out)
+{
+  struct pthread_attr *real_out;
+
+  assert (sizeof (*out) >= sizeof (struct pthread_attr));
+  real_out = (struct pthread_attr *) out;
+
+  *real_out = default_attr;
+
+  return 0;
+}
diff --git a/nptl/pthread_attr_set_default_np.c b/nptl/pthread_attr_set_default_np.c
new file mode 100644
index 0000000..686d9a2
--- /dev/null
+++ b/nptl/pthread_attr_set_default_np.c
@@ -0,0 +1,71 @@
+/* Set the default attributes to be used by pthread_create in the process.
+   Copyright (C) 2013 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 <errno.h>
+#include <stdlib.h>
+#include <pthreadP.h>
+#include <assert.h>
+
+int
+pthread_attr_set_default_np (const pthread_attr_t *in)
+{
+  struct pthread_attr *real_in;
+
+  assert (sizeof (*in) >= sizeof (struct pthread_attr));
+  real_in = (struct pthread_attr *) in;
+
+  /* Catch invalid values.  */
+  int policy = real_in->schedpolicy;
+
+  if (policy != SCHED_OTHER && policy != SCHED_FIFO && policy != SCHED_RR)
+    return EINVAL;
+
+  struct sched_param *param = &real_in->schedparam;
+
+  if (param->sched_priority > 0)
+    {
+      int min = sched_get_priority_min (policy);
+      int max = sched_get_priority_max (policy);
+
+      if (min == -1 || max == -1
+	  || param->sched_priority > max || param->sched_priority < min)
+	return EINVAL;
+    }
+
+  /* stacksize == 0 is fine.  It means that we don't change the current
+     value.  */
+  if (real_in->stacksize != 0 && real_in->stacksize < PTHREAD_STACK_MIN)
+    return EINVAL;
+
+  /* Everything is fine, so the values.  */
+  default_attr.schedparam = real_in->schedparam;
+  default_attr.schedpolicy = real_in->schedpolicy;
+  default_attr.flags = real_in->flags;
+  default_attr.guardsize = real_in->guardsize;
+  default_attr.stackaddr = real_in->stackaddr;
+  default_attr.cpuset = real_in->cpuset;
+  default_attr.cpusetsize = real_in->cpusetsize;
+
+  /* Mantain stacksize as a non-zero value.  This is a computed fallback that
+     we get on library initialization, so we don't want to overwrite it unless
+     there is a valid value to replace it.  */
+  if (real_in->stacksize > 0)
+    default_attr.stacksize = real_in->stacksize;
+
+  return 0;
+}
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index f81dcce..703cd62 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -507,8 +507,7 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
 #endif
 
   /* Determine scheduling parameters for the thread.  */
-  if (attr != NULL
-      && __builtin_expect ((iattr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0, 0)
+  if (__builtin_expect ((iattr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0, 0)
       && (iattr->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)) != 0)
     {
       INTERNAL_SYSCALL_DECL (scerr);
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 10bcb80..93a8b11 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -404,6 +404,14 @@ extern int pthread_attr_getaffinity_np (const pthread_attr_t *__attr,
 					cpu_set_t *__cpuset)
      __THROW __nonnull ((1, 3));
 
+/* Get the default attributes used by pthread_create in this process.  */
+extern int pthread_attr_get_default_np (pthread_attr_t *__attr)
+     __THROW __nonnull ((1));
+
+/* Set the default attributes to be used by pthread_create in this
+   process.  */
+extern int pthread_attr_set_default_np (const pthread_attr_t *__attr)
+     __THROW __nonnull ((1));
 
 /* Initialize thread attribute *ATTR with attributes corresponding to the
    already running thread TH.  It shall be called on uninitialized ATTR
diff --git a/nptl/tst-default-attr.c b/nptl/tst-default-attr.c
new file mode 100644
index 0000000..b02d812
--- /dev/null
+++ b/nptl/tst-default-attr.c
@@ -0,0 +1,159 @@
+/* Verify that pthread_attr_[gs]et_default work correctly.
+
+   Copyright (C) 2013 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 <pthread.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+static size_t stacksize = 1024 * 1024;
+
+void *
+verify_result (pthread_attr_t *attr, int adjust_guard)
+{
+  int ret;
+  size_t stack;
+
+  if ((ret = pthread_attr_getstacksize (attr, &stack)) != 0)
+    {
+      printf ("pthread_attr_getstacksize failed: %s\n", strerror (ret));
+      return (void *) (uintptr_t) 1;
+    }
+
+  /* FIXME Currently, glibc pthread stack size includes the guard size.  This
+     needs to be fixed eventually, but until then, adjust the stack size so
+     that this test does not fail.  */
+  if (adjust_guard)
+    {
+      size_t guard;
+      if ((ret = pthread_attr_getguardsize (attr, &guard)) != 0)
+	{
+	  printf ("pthread_attr_getguardsize failed: %s\n", strerror (ret));
+	  return (void *) (uintptr_t) 1;
+	}
+      stack -= guard;
+    }
+
+  if (stacksize != stack)
+    {
+      puts ("pthread_attr_set_default did not work for stacksize");
+      printf ("%zd, %zd\n", stacksize, stack);
+      return (void *) (uintptr_t) 1;
+    }
+
+  return NULL;
+}
+
+void *
+thr (void *unused)
+{
+  pthread_attr_t attr;
+  int ret;
+
+  /* To verify that the set_default_np worked.  */
+  puts ("verifying pthread_attr_get_default_np");
+  if ((ret = pthread_attr_get_default_np (&attr)) != 0)
+    {
+      printf ("pthread_attr_get_default_np failed: %s\n", strerror (ret));
+      return (void *) (uintptr_t) 1;
+    }
+
+  if (verify_result (&attr, 0))
+    return (void *) (uintptr_t) 1;
+
+  /* To verify that the attributes actually got applied.  */
+  puts ("verifying pthread_getattr_np");
+  if ((ret = pthread_getattr_np (pthread_self (), &attr)) != 0)
+    {
+      printf ("pthread_getattr_np failed: %s\n", strerror (ret));
+      return (void *) (uintptr_t) 1;
+    }
+
+  return verify_result (&attr, 1);
+}
+
+int
+run_threads (void)
+{
+  pthread_t t;
+  pthread_attr_t attr;
+  int ret, i;
+  void *tret;
+
+  if ((ret = pthread_attr_init (&attr)) != 0)
+    {
+      printf ("pthread_attr_init failed: %s\n", strerror (ret));
+      return 1;
+    }
+
+  if ((ret = pthread_attr_setstacksize (&attr, stacksize)) != 0)
+    {
+      printf ("pthread_attr_setstacksize failed: %s\n", strerror (ret));
+      return 1;
+    }
+
+  if ((ret = pthread_attr_set_default_np (&attr)) != 0)
+    {
+      printf ("pthread_attr_set_default_np failed: %s\n", strerror (ret));
+      return 1;
+    }
+
+  /* Run twice to ensure that the attributes do not get overwritten in the
+     first run somehow.  */
+  for (i = 0; i < 2; i++)
+    {
+      if ((ret = pthread_create (&t, NULL, thr, NULL)) != 0)
+	{
+	  printf ("pthread_create failed: %s\n", strerror (ret));
+	  return 1;
+	}
+
+      if ((ret = pthread_join (t, &tret)) != 0)
+	{
+	  printf ("pthread_join failed: %s\n", strerror (ret));
+	  return 1;
+	}
+
+      if (tret != NULL)
+	{
+	  puts ("Thread failed\n");
+	  return 1;
+	}
+    }
+
+  return 0;
+}
+
+int
+do_test (void)
+{
+  /* Run twice to ensure that we don't give a false positive.  */
+  puts ("First iteration");
+  int ret = run_threads ();
+
+  if (ret)
+    return 1;
+
+  puts ("Second iteration");
+  stacksize *= 2;
+  return run_threads ();
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/nptl/libpthread.abilist
index 7c33f35..8d3c68e 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/nptl/libpthread.abilist
@@ -8,6 +8,10 @@ GLIBC_2.12
  pthread_mutexattr_getrobust F
  pthread_mutexattr_setrobust F
  pthread_setname_np F
+GLIBC_2.18
+ GLIBC_2.18 A
+ pthread_attr_get_default_np F
+ pthread_attr_set_default_np F
 GLIBC_2.2.5
  GLIBC_2.2.5 A
  _IO_flockfile F

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2e948cacc84b893a1226b1814dc69c1024d88a00

commit 2e948cacc84b893a1226b1814dc69c1024d88a00
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Wed Mar 13 15:00:35 2013 +0530

    Use default_attr to store default pthread attributes

diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 31c8829..d617262 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -358,7 +358,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
 
   /* Get the stack size from the attribute if it is set.  Otherwise we
      use the default we determined at start time.  */
-  size = attr->stacksize ?: __default_stacksize;
+  size = attr->stacksize ?: default_attr.stacksize;
 
   /* Get memory for the stack.  */
   if (__builtin_expect (attr->flags & ATTR_FLAG_STACKADDR, 0))
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 19e6616..23d3430 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -423,7 +423,7 @@ __pthread_initialize_minimal_internal (void)
 
   /* Round the resource limit up to page size.  */
   limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz;
-  __default_stacksize = limit.rlim_cur;
+  default_attr.stacksize = limit.rlim_cur;
 
 #ifdef SHARED
   /* Transfer the old value from the dynamic linker's internal location.  */
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index d08b219..73dfba6 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -147,8 +147,9 @@ enum
 /* Internal variables.  */
 
 
-/* Default stack size.  */
-extern size_t __default_stacksize attribute_hidden;
+/* Default pthread attributes.  */
+extern struct pthread_attr default_attr;
+hidden_proto (default_attr);
 
 /* Size and alignment of static TLS block.  */
 extern size_t __static_tls_size attribute_hidden;
diff --git a/nptl/pthread_attr_getstacksize.c b/nptl/pthread_attr_getstacksize.c
index 6df7062..915cbb7 100644
--- a/nptl/pthread_attr_getstacksize.c
+++ b/nptl/pthread_attr_getstacksize.c
@@ -32,7 +32,7 @@ __pthread_attr_getstacksize (attr, stacksize)
 
   /* If the user has not set a stack size we return what the system
      will use as the default.  */
-  *stacksize = iattr->stacksize ?: __default_stacksize;
+  *stacksize = iattr->stacksize ?: default_attr.stacksize;
 
   return 0;
 }
diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c
index d5891fd..6d2910e 100644
--- a/nptl/pthread_barrier_init.c
+++ b/nptl/pthread_barrier_init.c
@@ -22,7 +22,7 @@
 #include <kernel-features.h>
 
 
-static const struct pthread_barrierattr default_attr =
+static const struct pthread_barrierattr default_barrierattr =
   {
     .pshared = PTHREAD_PROCESS_PRIVATE
   };
@@ -42,7 +42,7 @@ pthread_barrier_init (barrier, attr, count)
   const struct pthread_barrierattr *iattr
     = (attr != NULL
        ? iattr = (struct pthread_barrierattr *) attr
-       : &default_attr);
+       : &default_barrierattr);
 
   if (iattr->pshared != PTHREAD_PROCESS_PRIVATE
       && __builtin_expect (iattr->pshared != PTHREAD_PROCESS_SHARED, 0))
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index c6f2fdd..f81dcce 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -435,15 +435,6 @@ start_thread (void *arg)
 }
 
 
-/* Default thread attributes for the case when the user does not
-   provide any.  */
-static const struct pthread_attr default_attr =
-  {
-    /* Just some value > 0 which gets rounded to the nearest page size.  */
-    .guardsize = 1,
-  };
-
-
 int
 __pthread_create_2_1 (newthread, attr, start_routine, arg)
      pthread_t *newthread;
diff --git a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c
index 36da3f8..174d900 100644
--- a/nptl/pthread_mutex_init.c
+++ b/nptl/pthread_mutex_init.c
@@ -24,7 +24,7 @@
 
 #include <stap-probe.h>
 
-static const struct pthread_mutexattr default_attr =
+static const struct pthread_mutexattr default_mutexattr =
   {
     /* Default is a normal mutex, not shared between processes.  */
     .mutexkind = PTHREAD_MUTEX_NORMAL
@@ -45,7 +45,8 @@ __pthread_mutex_init (mutex, mutexattr)
 
   assert (sizeof (pthread_mutex_t) <= __SIZEOF_PTHREAD_MUTEX_T);
 
-  imutexattr = (const struct pthread_mutexattr *) mutexattr ?: &default_attr;
+  imutexattr = ((const struct pthread_mutexattr *) mutexattr
+		?: &default_mutexattr);
 
   /* Sanity checks.  */
   switch (__builtin_expect (imutexattr->mutexkind
diff --git a/nptl/pthread_rwlock_init.c b/nptl/pthread_rwlock_init.c
index 16bfe2d..29bef71 100644
--- a/nptl/pthread_rwlock_init.c
+++ b/nptl/pthread_rwlock_init.c
@@ -21,7 +21,7 @@
 #include <kernel-features.h>
 
 
-static const struct pthread_rwlockattr default_attr =
+static const struct pthread_rwlockattr default_rwlockattr =
   {
     .lockkind = PTHREAD_RWLOCK_DEFAULT_NP,
     .pshared = PTHREAD_PROCESS_PRIVATE
@@ -35,7 +35,7 @@ __pthread_rwlock_init (rwlock, attr)
 {
   const struct pthread_rwlockattr *iattr;
 
-  iattr = ((const struct pthread_rwlockattr *) attr) ?: &default_attr;
+  iattr = ((const struct pthread_rwlockattr *) attr) ?: &default_rwlockattr;
 
   memset (rwlock, '\0', sizeof (*rwlock));
 
diff --git a/nptl/vars.c b/nptl/vars.c
index 2bcd1f8..727c570 100644
--- a/nptl/vars.c
+++ b/nptl/vars.c
@@ -20,13 +20,17 @@
 #include <tls.h>
 #include <unistd.h>
 
-/* Default stack size.  */
-size_t __default_stacksize attribute_hidden
-#ifdef SHARED
-;
-#else
-  = PTHREAD_STACK_MIN;
+/* Default thread attributes for the case when the user does not
+   provide any.  */
+struct pthread_attr default_attr =
+  {
+    /* Just some value > 0 which gets rounded to the nearest page size.  */
+    .guardsize = 1,
+#ifndef SHARED
+    .stacksize = PTHREAD_STACK_MIN,
 #endif
+  };
+hidden_data_def (default_attr)
 
 /* Flag whether the machine is SMP or not.  */
 int __is_smp attribute_hidden;

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources