Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2e8ce9a

Browse files
committed
Remove some useless code in the configure script.
Almost ten years ago, commite48322a brokethe logic in ACX_PTHREAD by looping through all the possible flags ratherthan stopping with the first one that would work. This meant that$acx_pthread_ok was no longer meaningful after the loop; it would usuallybe "no", whether or not we'd found working thread flags. The reason nobodynoticed is that Postgres doesn't actually use any of the symbols set upby the code after the loop. Rather than complicate things some more tomake it work as designed, let's just remove all that dead code, and therebysave a few cycles in each configure run.
1 parentf23425f commit2e8ce9a

File tree

5 files changed

+16
-236
lines changed

5 files changed

+16
-236
lines changed

‎config/acx_pthread.m4

Lines changed: 10 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
dnl PGSGL: When updating, comment out port-specific part below;
2-
dnl see the comment below with the word "PostgreSQL".
3-
dnl
4-
dnl Available from the GNU Autoconf Macro Archive at:
1+
dnl This is based on an old macro from the GNU Autoconf Macro Archive at:
52
dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_pthread.html
3+
dnl but it's been rather heavily hacked --- beware of blindly dropping in
4+
dnl upstream changes!
65
dnl
76
AC_DEFUN([ACX_PTHREAD],[
87
AC_REQUIRE([AC_CANONICAL_HOST])
@@ -144,8 +143,9 @@ _ACEOF
144143
rm -f conftest.$ac_objext conftest$ac_exeext
145144
# Check both linking and compiling, because they might tolerate different options.
146145
if test "`(eval $ac_link 2>&1 1>&5)`" = "" && test "`(eval $ac_compile 2>&1 1>&5)`" = ""; then
147-
# we continue with more flags because Linux needs -lpthread
148-
# for libpq builds on PostgreSQL. The test above only
146+
# The original macro breaks out of the loop at this point,
147+
# but we continue trying flags because Linux needs -lpthread
148+
# too to build libpq successfully. The test above only
149149
# tests for building binaries, not shared libraries.
150150
PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"
151151
PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"
@@ -160,69 +160,12 @@ _ACEOF
160160
done
161161
fi
162162
163-
# Various other checks:
164-
if test "x$acx_pthread_ok" = xyes; then
165-
save_LIBS="$LIBS"
166-
LIBS="$PTHREAD_LIBS $LIBS"
167-
save_CFLAGS="$CFLAGS"
168-
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
169-
170-
# Detect AIX lossage: threads are created detached by default
171-
# and the JOINABLE attribute has a nonstandard name (UNDETACHED).
172-
AC_MSG_CHECKING([for joinable pthread attribute])
173-
AC_TRY_LINK([#include <pthread.h>],
174-
[int attr=PTHREAD_CREATE_JOINABLE;],
175-
ok=PTHREAD_CREATE_JOINABLE,ok=unknown)
176-
if test x"$ok" = xunknown; then
177-
AC_TRY_LINK([#include <pthread.h>],
178-
[int attr=PTHREAD_CREATE_UNDETACHED;],
179-
ok=PTHREAD_CREATE_UNDETACHED,ok=unknown)
180-
fi
181-
if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then
182-
AC_DEFINE(PTHREAD_CREATE_JOINABLE,$ok,
183-
[Define to the necessary symbol if this constant
184-
uses a non-standard name on your system.])
185-
fi
186-
AC_MSG_RESULT(${ok})
187-
if test x"$ok" = xunknown; then
188-
AC_MSG_WARN([we do not know how to create joinable pthreads])
189-
fi
190-
191-
AC_MSG_CHECKING([if more special flags are required for pthreads])
192-
flag=no
193-
# We always add these in PostgreSQL
194-
# case "${host_cpu}-${host_os}" in
195-
# *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
196-
# *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
197-
# esac
198-
AC_MSG_RESULT(${flag})
199-
if test "x$flag" != xno; then
200-
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
201-
fi
202-
203-
LIBS="$save_LIBS"
204-
CFLAGS="$save_CFLAGS"
205-
206-
# Supporting cc_r would require a special CC in all places that
207-
# use libpq, and that is ugly, so we don't do it. Users can still
208-
# define their compiler as cc_r to do thread builds of everything.
209-
# More AIX lossage: must compile with cc_r
210-
AC_CHECK_PROG(PTHREAD_CC,cc_r,cc_r,${CC})
211-
else
212-
PTHREAD_CC="$CC"
213-
fi
163+
# The original macro has a bunch of other tests here, which we have removed
164+
# because (a) Postgres doesn't need them, and (b) $acx_pthread_ok is not
165+
# meaningful at this point.
214166
215167
AC_SUBST(PTHREAD_LIBS)
216168
AC_SUBST(PTHREAD_CFLAGS)
217-
AC_SUBST(PTHREAD_CC)
218-
219-
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
220-
if test x"$acx_pthread_ok" = xyes; then
221-
ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
222-
:
223-
else
224-
acx_pthread_ok=no
225-
$2
226-
fi
169+
227170
AC_LANG_RESTORE
228171
])dnl ACX_PTHREAD

‎configure

Lines changed: 6 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,6 @@ LDAP_LIBS_BE
652652
LDAP_LIBS_FE
653653
PTHREAD_CFLAGS
654654
PTHREAD_LIBS
655-
PTHREAD_CC
656655
acx_pthread_config
657656
have_win32_dbghelp
658657
HAVE_IPV6
@@ -12437,8 +12436,9 @@ _ACEOF
1243712436
rm -f conftest.$ac_objext conftest$ac_exeext
1243812437
# Check both linking and compiling, because they might tolerate different options.
1243912438
iftest"`(eval$ac_link2>&11>&5)`" =""&&test"`(eval$ac_compile2>&11>&5)`" ="";then
12440-
# we continue with more flags because Linux needs -lpthread
12441-
# for libpq builds on PostgreSQL. The test above only
12439+
# The original macro breaks out of the loop at this point,
12440+
# but we continue trying flags because Linux needs -lpthread
12441+
# too to build libpq successfully. The test above only
1244212442
# tests for building binaries, not shared libraries.
1244312443
PTHREAD_LIBS="$tryPTHREAD_LIBS$PTHREAD_LIBS"
1244412444
PTHREAD_CFLAGS="$PTHREAD_CFLAGS$tryPTHREAD_CFLAGS"
@@ -12454,144 +12454,13 @@ $as_echo "$acx_pthread_ok" >&6; }
1245412454
done
1245512455
fi
1245612456

12457-
# Various other checks:
12458-
iftest"x$acx_pthread_ok" = xyes;then
12459-
save_LIBS="$LIBS"
12460-
LIBS="$PTHREAD_LIBS$LIBS"
12461-
save_CFLAGS="$CFLAGS"
12462-
CFLAGS="$CFLAGS$PTHREAD_CFLAGS"
12463-
12464-
# Detect AIX lossage: threads are created detached by default
12465-
# and the JOINABLE attribute has a nonstandard name (UNDETACHED).
12466-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute">&5
12467-
$as_echo_n"checking for joinable pthread attribute...">&6; }
12468-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
12469-
/* end confdefs.h. */
12470-
#include <pthread.h>
12471-
int
12472-
main ()
12473-
{
12474-
int attr=PTHREAD_CREATE_JOINABLE;
12475-
;
12476-
return 0;
12477-
}
12478-
_ACEOF
12479-
if ac_fn_c_try_link"$LINENO";then:
12480-
ok=PTHREAD_CREATE_JOINABLE
12481-
else
12482-
ok=unknown
12483-
fi
12484-
rm -f core conftest.err conftest.$ac_objext \
12485-
conftest$ac_exeext conftest.$ac_ext
12486-
iftest x"$ok" = xunknown;then
12487-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
12488-
/* end confdefs.h. */
12489-
#include <pthread.h>
12490-
int
12491-
main ()
12492-
{
12493-
int attr=PTHREAD_CREATE_UNDETACHED;
12494-
;
12495-
return 0;
12496-
}
12497-
_ACEOF
12498-
if ac_fn_c_try_link"$LINENO";then:
12499-
ok=PTHREAD_CREATE_UNDETACHED
12500-
else
12501-
ok=unknown
12502-
fi
12503-
rm -f core conftest.err conftest.$ac_objext \
12504-
conftest$ac_exeext conftest.$ac_ext
12505-
fi
12506-
iftest x"$ok"!= xPTHREAD_CREATE_JOINABLE;then
12507-
12508-
$as_echo"#define PTHREAD_CREATE_JOINABLE\$ok">>confdefs.h
12509-
12510-
fi
12511-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:${ok}">&5
12512-
$as_echo"${ok}">&6; }
12513-
iftest x"$ok" = xunknown;then
12514-
{$as_echo"$as_me:${as_lineno-$LINENO}: WARNING: we do not know how to create joinable pthreads">&5
12515-
$as_echo"$as_me: WARNING: we do not know how to create joinable pthreads">&2;}
12516-
fi
12517-
12518-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads">&5
12519-
$as_echo_n"checking if more special flags are required for pthreads...">&6; }
12520-
flag=no
12521-
# We always add these in PostgreSQL
12522-
# case "${host_cpu}-${host_os}" in
12523-
# *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
12524-
# *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
12525-
# esac
12526-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:${flag}">&5
12527-
$as_echo"${flag}">&6; }
12528-
iftest"x$flag"!= xno;then
12529-
PTHREAD_CFLAGS="$flag$PTHREAD_CFLAGS"
12530-
fi
12531-
12532-
LIBS="$save_LIBS"
12533-
CFLAGS="$save_CFLAGS"
12534-
12535-
# Supporting cc_r would require a special CC in all places that
12536-
# use libpq, and that is ugly, so we don't do it. Users can still
12537-
# define their compiler as cc_r to do thread builds of everything.
12538-
# More AIX lossage: must compile with cc_r
12539-
# Extract the first word of "cc_r", so it can be a program name with args.
12540-
set dummy cc_r; ac_word=$2
12541-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for$ac_word">&5
12542-
$as_echo_n"checking for$ac_word...">&6; }
12543-
if${ac_cv_prog_PTHREAD_CC+:}false;then:
12544-
$as_echo_n"(cached)">&6
12545-
else
12546-
iftest -n"$PTHREAD_CC";then
12547-
ac_cv_prog_PTHREAD_CC="$PTHREAD_CC"# Let the user override the test.
12548-
else
12549-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12550-
foras_dirin$PATH
12551-
do
12552-
IFS=$as_save_IFS
12553-
test -z"$as_dir"&& as_dir=.
12554-
forac_exec_extin''$ac_executable_extensions;do
12555-
if as_fn_executable_p"$as_dir/$ac_word$ac_exec_ext";then
12556-
ac_cv_prog_PTHREAD_CC="cc_r"
12557-
$as_echo"$as_me:${as_lineno-$LINENO}: found$as_dir/$ac_word$ac_exec_ext">&5
12558-
break 2
12559-
fi
12560-
done
12561-
done
12562-
IFS=$as_save_IFS
12563-
12564-
test -z"$ac_cv_prog_PTHREAD_CC"&& ac_cv_prog_PTHREAD_CC="${CC}"
12565-
fi
12566-
fi
12567-
PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
12568-
iftest -n"$PTHREAD_CC";then
12569-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$PTHREAD_CC">&5
12570-
$as_echo"$PTHREAD_CC">&6; }
12571-
else
12572-
{$as_echo"$as_me:${as_lineno-$LINENO}: result: no">&5
12573-
$as_echo"no">&6; }
12574-
fi
12575-
12576-
12577-
else
12578-
PTHREAD_CC="$CC"
12579-
fi
12457+
# The original macro has a bunch of other tests here, which we have removed
12458+
# because (a) Postgres doesn't need them, and (b) $acx_pthread_ok is not
12459+
# meaningful at this point.
1258012460

1258112461

1258212462

1258312463

12584-
12585-
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
12586-
iftest x"$acx_pthread_ok" = xyes;then
12587-
12588-
$as_echo"#define HAVE_PTHREAD 1">>confdefs.h
12589-
12590-
:
12591-
else
12592-
acx_pthread_ok=no
12593-
12594-
fi
1259512464
ac_ext=c
1259612465
ac_cpp='$CPP $CPPFLAGS'
1259712466
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12605,15 +12474,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
1260512474
# enables 5-arg getpwuid_r, among other things.
1260612475
PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEMANTICS"
1260712476

12608-
12609-
# At this point, we don't want to muck with the compiler name for threading.
12610-
# Let's see who fails, perhaps AIX. 2004-04-23
12611-
iftest"$PTHREAD_CC"!="$CC";then
12612-
as_fn_error$?"
12613-
PostgreSQL does not support platforms that require a special compiler
12614-
for thread safety; use --disable-thread-safety to disable thread safety.""$LINENO" 5
12615-
fi
12616-
1261712477
# Check for *_r functions
1261812478
_CFLAGS="$CFLAGS"
1261912479
_LIBS="$LIBS"

‎configure.in

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,15 +1502,6 @@ ACX_PTHREAD# set thread flags
15021502
# enables 5-arg getpwuid_r, among other things.
15031503
PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEMANTICS"
15041504

1505-
1506-
# At this point, we don't want to muck with the compiler name for threading.
1507-
# Let's see who fails, perhaps AIX. 2004-04-23
1508-
if test "$PTHREAD_CC" != "$CC"; then
1509-
AC_MSG_ERROR([
1510-
PostgreSQL does not support platforms that require a special compiler
1511-
for thread safety; use --disable-thread-safety to disable thread safety.])
1512-
fi
1513-
15141505
# Check for *_r functions
15151506
_CFLAGS="$CFLAGS"
15161507
_LIBS="$LIBS"

‎src/include/pg_config.h.in

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,6 @@
369369
/* Define to 1 if the PS_STRINGS thing exists. */
370370
#undef HAVE_PS_STRINGS
371371

372-
/* Define if you have POSIX threads libraries and header files. */
373-
#undef HAVE_PTHREAD
374-
375372
/* Define to 1 if you have the <pwd.h> header file. */
376373
#undef HAVE_PWD_H
377374

@@ -710,10 +707,6 @@
710707
process. */
711708
#undef PROFILE_PID_DIR
712709

713-
/* Define to the necessary symbol if this constant uses a non-standard name on
714-
your system. */
715-
#undef PTHREAD_CREATE_JOINABLE
716-
717710
/* RELSEG_SIZE is the maximum number of blocks allowed in one disk file. Thus,
718711
the maximum size of a single file is RELSEG_SIZE * BLCKSZ; relations bigger
719712
than that are divided into multiple files. RELSEG_SIZE * BLCKSZ must be

‎src/include/pg_config.h.win32

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,6 @@
276276
/* Define to 1 if the PS_STRINGS thing exists. */
277277
/* #undef HAVE_PS_STRINGS */
278278

279-
/* Define if you have POSIX threads libraries and header files. */
280-
/* #undef HAVE_PTHREAD */
281-
282279
/* Define to 1 if you have the <pwd.h> header file. */
283280
#define HAVE_PWD_H 1
284281

@@ -578,10 +575,6 @@
578575
/* A string containing the version number, platform, and C compiler */
579576
#define PG_VERSION_STR "Uninitialized version string (win32)"
580577

581-
/* Define to the necessary symbol if this constant uses a non-standard name on
582-
your system. */
583-
/* #undef PTHREAD_CREATE_JOINABLE */
584-
585578
/* The size of `long', as computed by sizeof. */
586579
#define SIZEOF_LONG 4
587580

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp