Threading fix for AIX - Mailing list pgsql-patches

Zeugswetter Andreas DAZ SD wrote:
>
> >> However, one thing we can do is to try this in Makefile.aix:
> >>     # AIX needs threads for everything that uses libpq
> >>     LIBS += $(PTHREAD_LIBS)
> >> That is going to enable thread libs for all linking including the
> >> backend, but it might work.
>
> > That is certainly wrong.  The correct thing is to add PTHREAD_LIBS to
> > all and only those links that include libpq.  I suspect that the cc_r
>
> You mean like attached patch ? That is safe and can be applied.
> My machine has problems with two configure tests with --enable-thread-safety.
>
> 1. the snprintf long long int check that uses int64 as variable name which is
>     a typedef in sys/inttypes.h

I changed it to ac_int64.  Does that help?

> 2. whether strerror_r returns int check fails with a redefine of named function
>     from string.h

I see.  Our test is:

    int strerror_r(int, char *, size_t);

but AIX is:

    int  strerror_r(int, char *, int);

OK, I added an #ifndef _AIX to use 'int' for the 3rd arg for AIX.

> No idea how to fix those, but workaround is easy :-(
>
> -lpthread can be removed from PTHREAD_LIBS, the lib is a compat symlink to
> -lpthreads, I guess it does not hurt eighter.

Yea, that is an effect of the tests we use and accumulate flags rather
than taking the first one that works.  The test tests compiling but
creating libraries that use threads actually needs more than one flag on
some platforms so we just take all flags we can.

It would be nice if your fix also helped unixware but that needs
compilere flags for any thread library usage and we don't have
centralized libpq-specific compiler flags like we have library flags.

Please test this patch and report back.  Thanks.

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073
Index: configure
===================================================================
RCS file: /cvsroot/pgsql/configure,v
retrieving revision 1.413
diff -c -c -r1.413 configure
*** configure    3 Dec 2004 22:24:53 -0000    1.413
--- configure    14 Dec 2004 12:37:08 -0000
***************
*** 14608,14614 ****
--- 14608,14617 ----
  int
  main ()
  {
+ ifndef _AIX
  int strerror_r(int, char *, size_t);
+ #else
+ int strerror_r(int, char *, int);
    ;
    return 0;
  }
***************
*** 14758,14777 ****
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
! typedef long int int64;

  /*
   * These are globals to discourage the compiler from folding all the
   * arithmetic tests down to compile-time constants.
   */
! int64 a = 20000001;
! int64 b = 40000005;

  int does_int64_work()
  {
!   int64 c,d;

!   if (sizeof(int64) != 8)
      return 0;            /* definitely not the right size */

    /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
--- 14761,14780 ----
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
! typedef long int ac_int64;

  /*
   * These are globals to discourage the compiler from folding all the
   * arithmetic tests down to compile-time constants.
   */
! ac_int64 a = 20000001;
! ac_int64 b = 40000005;

  int does_int64_work()
  {
!   ac_int64 c,d;

!   if (sizeof(ac_int64) != 8)
      return 0;            /* definitely not the right size */

    /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
***************
*** 14872,14891 ****
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
! typedef long long int int64;

  /*
   * These are globals to discourage the compiler from folding all the
   * arithmetic tests down to compile-time constants.
   */
! int64 a = 20000001;
! int64 b = 40000005;

  int does_int64_work()
  {
!   int64 c,d;

!   if (sizeof(int64) != 8)
      return 0;            /* definitely not the right size */

    /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
--- 14875,14894 ----
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
! typedef long long int ac_int64;

  /*
   * These are globals to discourage the compiler from folding all the
   * arithmetic tests down to compile-time constants.
   */
! ac_int64 a = 20000001;
! ac_int64 b = 40000005;

  int does_int64_work()
  {
!   ac_int64 c,d;

!   if (sizeof(ac_int64) != 8)
      return 0;            /* definitely not the right size */

    /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
Index: config/c-compiler.m4
===================================================================
RCS file: /cvsroot/pgsql/config/c-compiler.m4,v
retrieving revision 1.13
diff -c -c -r1.13 c-compiler.m4
*** config/c-compiler.m4    20 Oct 2004 02:12:07 -0000    1.13
--- config/c-compiler.m4    14 Dec 2004 12:37:09 -0000
***************
*** 26,45 ****
  define([Ac_cachevar], [translit([pgac_cv_type_$1_64], [ *], [_p])])dnl
  AC_CACHE_CHECK([whether $1 is 64 bits], [Ac_cachevar],
  [AC_TRY_RUN(
! [typedef $1 int64;

  /*
   * These are globals to discourage the compiler from folding all the
   * arithmetic tests down to compile-time constants.
   */
! int64 a = 20000001;
! int64 b = 40000005;

  int does_int64_work()
  {
!   int64 c,d;

!   if (sizeof(int64) != 8)
      return 0;            /* definitely not the right size */

    /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
--- 26,45 ----
  define([Ac_cachevar], [translit([pgac_cv_type_$1_64], [ *], [_p])])dnl
  AC_CACHE_CHECK([whether $1 is 64 bits], [Ac_cachevar],
  [AC_TRY_RUN(
! [typedef $1 ac_int64;

  /*
   * These are globals to discourage the compiler from folding all the
   * arithmetic tests down to compile-time constants.
   */
! ac_int64 a = 20000001;
! ac_int64 b = 40000005;

  int does_int64_work()
  {
!   ac_int64 c,d;

!   if (sizeof(ac_int64) != 8)
      return 0;            /* definitely not the right size */

    /* Do perfunctory checks to see if 64-bit arithmetic seems to work */
Index: config/c-library.m4
===================================================================
RCS file: /cvsroot/pgsql/config/c-library.m4,v
retrieving revision 1.28
diff -c -c -r1.28 c-library.m4
*** config/c-library.m4    4 Oct 2004 18:14:18 -0000    1.28
--- config/c-library.m4    14 Dec 2004 12:37:09 -0000
***************
*** 108,114 ****
  [AC_CACHE_CHECK(whether strerror_r returns int,
  pgac_func_strerror_r_int,
  [AC_TRY_COMPILE([#include <string.h>],
! [int strerror_r(int, char *, size_t);],
  [pgac_func_strerror_r_int=yes],
  [pgac_func_strerror_r_int=no])])
  if test x"$pgac_func_strerror_r_int" = xyes ; then
--- 108,117 ----
  [AC_CACHE_CHECK(whether strerror_r returns int,
  pgac_func_strerror_r_int,
  [AC_TRY_COMPILE([#include <string.h>],
! [ifndef _AIX
! int strerror_r(int, char *, size_t);
! #else
! int strerror_r(int, char *, int);],
  [pgac_func_strerror_r_int=yes],
  [pgac_func_strerror_r_int=no])])
  if test x"$pgac_func_strerror_r_int" = xyes ; then
Index: src/Makefile.global.in
===================================================================
RCS file: /cvsroot/pgsql/src/Makefile.global.in,v
retrieving revision 1.205
diff -c -c -r1.205 Makefile.global.in
*** src/Makefile.global.in    19 Nov 2004 00:41:38 -0000    1.205
--- src/Makefile.global.in    14 Dec 2004 12:37:14 -0000
***************
*** 308,313 ****
--- 308,319 ----

  libpq = -L$(libpq_builddir) -lpq

+ # AIX libraries do not remember their required libs so we have to force
+ # thread dependent libraires in the link
+ ifeq ($(PORTNAME), aix)
+ libpq += $(PTHREAD_LIBS)
+ endif
+
  submake-libpq:
      $(MAKE) -C $(libpq_builddir) all

Index: src/makefiles/Makefile.unixware
===================================================================
RCS file: /cvsroot/pgsql/src/makefiles/Makefile.unixware,v
retrieving revision 1.20
diff -c -c -r1.20 Makefile.unixware
*** src/makefiles/Makefile.unixware    19 Nov 2004 00:41:39 -0000    1.20
--- src/makefiles/Makefile.unixware    14 Dec 2004 12:37:21 -0000
***************
*** 33,37 ****

  # Unixware needs threads for everything that uses libpq
  CFLAGS += $(PTHREAD_CFLAGS)
-
-
--- 33,35 ----