Some platforms, like MacOS X 10.5, have a working posix_spawn facility, but
without POSIX scheduling support. Gnulib currently fails to provide replacements
for these functions in this case. This fixes it.
2010-03-07 Bruno Haible <br...@clisp.org>
Ensure posix_spawnattr_{get,set}sched{policy,param} are defined.
* lib/spawn.in.h (POSIX_SPAWN_SETSCHEDPARAM): Define fallback.
(POSIX_SPAWN_SETSCHEDULER): Likewise.
(POSIX_SPAWN_USEVFORK): Define in a way that works when
POSIX_SPAWN_SETSCHEDPARAM and POSIX_SPAWN_SETSCHEDULER are zero.
(posix_spawnattr_getschedpolicy, posix_spawnattr_setschedpolicy): Also
declare when POSIX_SPAWN_SETSCHEDULER is zero.
(posix_spawnattr_getschedparam, posix_spawnattr_setschedparam): Also
declare when POSIX_SPAWN_SETSCHEDPARAM is zero.
* m4/posix_spawn.m4 (gl_POSIX_SPAWN_BODY): Test whether
POSIX_SPAWN_SETSCHEDULER or POSIX_SPAWN_SETSCHEDPARAM are zero.
* modules/posix_spawnattr_getschedparam (configure.ac): Enable the
replacement also when POSIX_SPAWN_SETSCHEDPARAM is zero.
* modules/posix_spawnattr_setschedparam (configure.ac): Likewise.
* modules/posix_spawnattr_getschedpolicy (configure.ac): Enable the
replacement also when POSIX_SPAWN_SETSCHEDULER is zero.
* modules/posix_spawnattr_setschedpolicy (configure.ac): Likewise.
* lib/spawnattr_getschedparam.c (posix_spawnattr_getschedparam): Do
nothing if POSIX_SPAWN_SETSCHEDPARAM is zero.
* lib/spawnattr_setschedparam.c (posix_spawnattr_setschedparam):
Likewise.
* lib/spawnattr_getschedpolicy.c (posix_spawnattr_getschedpolicy): Do
nothing if POSIX_SPAWN_SETSCHEDULER is zero.
* lib/spawnattr_setschedpolicy.c (posix_spawnattr_setschedpolicy):
Likewise.
* tests/test-spawn.c (main): Make it work when
POSIX_SPAWN_SETSCHEDPARAM and POSIX_SPAWN_SETSCHEDULER are zero.
--- lib/spawn.in.h.orig Sun Mar 7 16:02:25 2010
+++ lib/spawn.in.h Sun Mar 7 15:54:34 2010
@@ -110,7 +110,15 @@
/* Flags to be set in the `posix_spawnattr_t'. */
-#if !...@have_posix_spawn@
+#if @HAVE_POSIX_SPAWN@
+/* Use the values from the system, but provide the missing ones. */
+# ifndef POSIX_SPAWN_SETSCHEDPARAM
+# define POSIX_SPAWN_SETSCHEDPARAM 0
+# endif
+# ifndef POSIX_SPAWN_SETSCHEDULER
+# define POSIX_SPAWN_SETSCHEDULER 0
+# endif
+#else
# if @REPLACE_POSIX_SPAWN@
/* Use the values from the system, for better compatibility. */
/* But this implementation does not support AIX extensions. */
@@ -126,12 +134,14 @@
#endif
/* A GNU extension. Use the next free bit position. */
#define POSIX_SPAWN_USEVFORK \
- ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1) \
- | POSIX_SPAWN_SETPGROUP | (POSIX_SPAWN_SETPGROUP - 1) \
- | POSIX_SPAWN_SETSIGDEF | (POSIX_SPAWN_SETSIGDEF - 1) \
- | POSIX_SPAWN_SETSIGMASK | (POSIX_SPAWN_SETSIGMASK - 1) \
- | POSIX_SPAWN_SETSCHEDPARAM | (POSIX_SPAWN_SETSCHEDPARAM - 1) \
- | POSIX_SPAWN_SETSCHEDULER | (POSIX_SPAWN_SETSCHEDULER - 1)) \
+ ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1) \
+ | POSIX_SPAWN_SETPGROUP | (POSIX_SPAWN_SETPGROUP - 1) \
+ | POSIX_SPAWN_SETSIGDEF | (POSIX_SPAWN_SETSIGDEF - 1) \
+ | POSIX_SPAWN_SETSIGMASK | (POSIX_SPAWN_SETSIGMASK - 1) \
+ | POSIX_SPAWN_SETSCHEDPARAM \
+ | (POSIX_SPAWN_SETSCHEDPARAM > 0 ? POSIX_SPAWN_SETSCHEDPARAM - 1 : 0) \
+ | POSIX_SPAWN_SETSCHEDULER \
+ | (POSIX_SPAWN_SETSCHEDULER > 0 ? POSIX_SPAWN_SETSCHEDULER - 1 : 0)) \
+ 1)
typedef int verify_POSIX_SPAWN_USEVFORK_no_overlap
[2 * (((POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP
@@ -379,7 +389,7 @@
# if @REPLACE_POSIX_SPAWN@
# define posix_spawnattr_getschedpolicy rpl_posix_spawnattr_getschedpolicy
# endif
-# if !...@have_posix_spawn@ || @REPLACE_POSIX_SPAWN@
+# if !...@have_posix_spawn@ || @REPLACE_POSIX_SPAWN@ ||
POSIX_SPAWN_SETSCHEDULER == 0
extern int posix_spawnattr_getschedpolicy (const posix_spawnattr_t *_Restrict_
__attr,
int *_Restrict_ __schedpolicy)
__THROW _GL_ARG_NONNULL ((1, 2));
@@ -397,7 +407,7 @@
# if @REPLACE_POSIX_SPAWN@
# define posix_spawnattr_setschedpolicy rpl_posix_spawnattr_setschedpolicy
# endif
-# if !...@have_posix_spawn@ || @REPLACE_POSIX_SPAWN@
+# if !...@have_posix_spawn@ || @REPLACE_POSIX_SPAWN@ ||
POSIX_SPAWN_SETSCHEDULER == 0
extern int posix_spawnattr_setschedpolicy (posix_spawnattr_t *__attr,
int __schedpolicy)
__THROW _GL_ARG_NONNULL ((1));
@@ -415,7 +425,7 @@
# if @REPLACE_POSIX_SPAWN@
# define posix_spawnattr_getschedparam rpl_posix_spawnattr_getschedparam
# endif
-# if !...@have_posix_spawn@ || @REPLACE_POSIX_SPAWN@
+# if !...@have_posix_spawn@ || @REPLACE_POSIX_SPAWN@ ||
POSIX_SPAWN_SETSCHEDPARAM == 0
extern int posix_spawnattr_getschedparam (const posix_spawnattr_t *_Restrict_
__attr,
struct sched_param *_Restrict_
__schedparam)
__THROW _GL_ARG_NONNULL ((1, 2));
@@ -433,7 +443,7 @@
# if @REPLACE_POSIX_SPAWN@
# define posix_spawnattr_setschedparam rpl_posix_spawnattr_setschedparam
# endif
-# if !...@have_posix_spawn@ || @REPLACE_POSIX_SPAWN@
+# if !...@have_posix_spawn@ || @REPLACE_POSIX_SPAWN@ ||
POSIX_SPAWN_SETSCHEDPARAM == 0
extern int posix_spawnattr_setschedparam (posix_spawnattr_t *_Restrict_ __attr,
const struct sched_param *_Restrict_
__schedparam)
__THROW _GL_ARG_NONNULL ((1, 2));
--- lib/spawnattr_getschedparam.c.orig Sun Mar 7 16:02:26 2010
+++ lib/spawnattr_getschedparam.c Sun Mar 7 15:25:59 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2008-2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@ -24,8 +24,11 @@
posix_spawnattr_getschedparam (const posix_spawnattr_t *attr,
struct sched_param *schedparam)
{
+ /* Do nothing if POSIX_SPAWN_SETSCHEDPARAM is unsupported. */
+#if POSIX_SPAWN_SETSCHEDPARAM != 0
/* Copy the scheduling parameters. */
*schedparam = attr->_sp;
+#endif
return 0;
}
--- lib/spawnattr_getschedpolicy.c.orig Sun Mar 7 16:02:26 2010
+++ lib/spawnattr_getschedpolicy.c Sun Mar 7 15:26:00 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@ -26,8 +26,11 @@
posix_spawnattr_getschedpolicy (const posix_spawnattr_t *attr,
int *schedpolicy)
{
+ /* Do nothing if POSIX_SPAWN_SETSCHEDULER is unsupported. */
+#if POSIX_SPAWN_SETSCHEDULER != 0
/* Copy the scheduling policy. */
*schedpolicy = attr->_policy;
+#endif
return 0;
}
--- lib/spawnattr_setschedparam.c.orig Sun Mar 7 16:02:26 2010
+++ lib/spawnattr_setschedparam.c Sun Mar 7 15:26:00 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@ -24,8 +24,11 @@
posix_spawnattr_setschedparam (posix_spawnattr_t *attr,
const struct sched_param *schedparam)
{
+ /* Do nothing if POSIX_SPAWN_SETSCHEDPARAM is unsupported. */
+#if POSIX_SPAWN_SETSCHEDPARAM != 0
/* Store the scheduling parameters. */
attr->_sp = *schedparam;
+#endif
return 0;
}
--- lib/spawnattr_setschedpolicy.c.orig Sun Mar 7 16:02:26 2010
+++ lib/spawnattr_setschedpolicy.c Sun Mar 7 15:26:01 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@ -25,12 +25,15 @@
int
posix_spawnattr_setschedpolicy (posix_spawnattr_t *attr, int schedpolicy)
{
+ /* Do nothing if POSIX_SPAWN_SETSCHEDULER is unsupported. */
+#if POSIX_SPAWN_SETSCHEDULER != 0
if (schedpolicy != SCHED_OTHER && schedpolicy != SCHED_FIFO
&& schedpolicy != SCHED_RR)
return EINVAL;
/* Store the policy. */
attr->_policy = schedpolicy;
+#endif
return 0;
}
--- m4/posix_spawn.m4.orig Sun Mar 7 16:02:26 2010
+++ m4/posix_spawn.m4 Sun Mar 7 15:50:54 2010
@@ -1,5 +1,5 @@
-# posix_spawn.m4 serial 4
-dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# posix_spawn.m4 serial 5
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,8 @@
[
AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
AC_CHECK_FUNCS_ONCE([posix_spawn])
- dnl Assume that when the main function exists, all the others are
- dnl available as well.
+ dnl Assume that when the main function exists, all the others,
+ dnl except posix_spawnattr_{get,set}sched*, are available as well.
dnl AC_CHECK_FUNCS_ONCE([posix_spawnp])
dnl AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_init])
dnl AC_CHECK_FUNCS_ONCE([posix_spawn_file_actions_addclose])
@@ -27,10 +27,6 @@
dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setflags])
dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getpgroup])
dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setpgroup])
- dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedparam])
- dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedparam])
- dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedpolicy])
- dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedpolicy])
dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getsigdefault])
dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setsigdefault])
dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getsigmask])
@@ -39,7 +35,38 @@
if test $ac_cv_func_posix_spawn = yes; then
gl_POSIX_SPAWN_WORKS
case "$gl_cv_func_posix_spawn_works" in
- *yes) ;;
+ *yes)
+ dnl Assume that these functions are available if
POSIX_SPAWN_SETSCHEDULER
+ dnl evaluates to nonzero.
+ dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedpolicy])
+ dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedpolicy])
+ AC_CACHE_CHECK([whether posix_spawnattr_setschedpolicy is supported],
+ [gl_cv_func_spawnattr_setschedpolicy],
+ [AC_EGREP_CPP([POSIX scheduling supported], [
+#include <spawn.h>
+#if POSIX_SPAWN_SETSCHEDULER
+ POSIX scheduling supported
+#endif
+],
+ [gl_cv_func_spawnattr_setschedpolicy=yes],
+ [gl_cv_func_spawnattr_setschedpolicy=no])
+ ])
+ dnl Assume that these functions are available if
POSIX_SPAWN_SETSCHEDPARAM
+ dnl evaluates to nonzero.
+ dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_getschedparam])
+ dnl AC_CHECK_FUNCS_ONCE([posix_spawnattr_setschedparam])
+ AC_CACHE_CHECK([whether posix_spawnattr_setschedparam is supported],
+ [gl_cv_func_spawnattr_setschedparam],
+ [AC_EGREP_CPP([POSIX scheduling supported], [
+#include <spawn.h>
+#if POSIX_SPAWN_SETSCHEDPARAM
+ POSIX scheduling supported
+#endif
+],
+ [gl_cv_func_spawnattr_setschedparam=yes],
+ [gl_cv_func_spawnattr_setschedparam=no])
+ ])
+ ;;
*) REPLACE_POSIX_SPAWN=1 ;;
esac
else
--- modules/posix_spawnattr_getschedparam.orig Sun Mar 7 16:02:26 2010
+++ modules/posix_spawnattr_getschedparam Sun Mar 7 15:52:26 2010
@@ -11,7 +11,9 @@
configure.ac:
gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+if test $HAVE_POSIX_SPAWN = 0 \
+ || test $REPLACE_POSIX_SPAWN = 1 \
+ || test $gl_cv_func_spawnattr_setschedparam = no; then
gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getschedparam])
fi
--- modules/posix_spawnattr_getschedpolicy.orig Sun Mar 7 16:02:26 2010
+++ modules/posix_spawnattr_getschedpolicy Sun Mar 7 15:52:25 2010
@@ -11,7 +11,9 @@
configure.ac:
gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+if test $HAVE_POSIX_SPAWN = 0 \
+ || test $REPLACE_POSIX_SPAWN = 1 \
+ || test $gl_cv_func_spawnattr_setschedpolicy = no; then
gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getschedpolicy])
fi
--- modules/posix_spawnattr_setschedparam.orig Sun Mar 7 16:02:26 2010
+++ modules/posix_spawnattr_setschedparam Sun Mar 7 15:52:26 2010
@@ -11,7 +11,9 @@
configure.ac:
gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+if test $HAVE_POSIX_SPAWN = 0 \
+ || test $REPLACE_POSIX_SPAWN = 1 \
+ || test $gl_cv_func_spawnattr_setschedparam = no; then
gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setschedparam])
fi
--- modules/posix_spawnattr_setschedpolicy.orig Sun Mar 7 16:02:26 2010
+++ modules/posix_spawnattr_setschedpolicy Sun Mar 7 15:52:26 2010
@@ -11,7 +11,9 @@
configure.ac:
gl_POSIX_SPAWN
-if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+if test $HAVE_POSIX_SPAWN = 0 \
+ || test $REPLACE_POSIX_SPAWN = 1 \
+ || test $gl_cv_func_spawnattr_setschedpolicy = no; then
gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setschedpolicy])
fi
--- tests/test-spawn.c.orig Sun Mar 7 16:02:26 2010
+++ tests/test-spawn.c Sun Mar 7 16:01:21 2010
@@ -1,5 +1,5 @@
/* Test of <spawn.h> substitute.
- Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2009-2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -46,8 +46,8 @@
case POSIX_SPAWN_SETPGROUP:
case POSIX_SPAWN_SETSIGDEF:
case POSIX_SPAWN_SETSIGMASK:
- case POSIX_SPAWN_SETSCHEDPARAM:
- case POSIX_SPAWN_SETSCHEDULER:
+ case (POSIX_SPAWN_SETSCHEDPARAM != 0 ? POSIX_SPAWN_SETSCHEDPARAM : -1):
+ case (POSIX_SPAWN_SETSCHEDULER != 0 ? POSIX_SPAWN_SETSCHEDULER : -2):
;
}
return s.c + s.d;
