Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 95d035e

Browse files
tglsfdctglsfdc
committed
Autoconfiscate selection of 64-bit int type for 64-bit large object API.
Get rid of the fundamentally indefensible assumption that "long long int" exists and is exactly 64 bits wide on every platform Postgres runs on. Instead let the configure script select the type to use for "pg_int64". This is a bit of a pain in the rear since we do not want to pollute client namespace with all the random symbols that pg_config.h defines; instead we have to create a separate generated header file, "pg_config_ext.h". But now that the infrastructure is there, we might have the ability to add some other stuff that's long been wanting in this area.
1 parent ea72bb8 commit 95d035e

22 files changed

+130
-66
lines changed

‎configure

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24238,7 +24238,9 @@ _ACEOF
2423824238
fi
2423924239

2424024240

24241-
if test x"$HAVE_LONG_INT_64" = x"no" ; then
24241+
if test x"$HAVE_LONG_INT_64" = x"yes" ; then
24242+
pg_int64_type="long int"
24243+
else
2424224244
{ $as_echo "$as_me:$LINENO: checking whether long long int is 64 bits" >&5
2424324245
$as_echo_n "checking whether long long int is 64 bits... " >&6; }
2424424246
if test "${pgac_cv_type_long_long_int_64+set}" = set; then
@@ -24374,14 +24376,21 @@ _ACEOF
2437424376

2437524377
fi
2437624378

24377-
if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then
24379+
if test x"$HAVE_LONG_LONG_INT_64" = x"yes" ; then
24380+
pg_int64_type="long long int"
24381+
else
2437824382
{ { $as_echo "$as_me:$LINENO: error: Cannot find a working 64-bit integer type." >&5
2437924383
$as_echo "$as_me: error: Cannot find a working 64-bit integer type." >&2;}
2438024384
{ (exit 1); exit 1; }; }
2438124385
fi
2438224386
fi
2438324387

2438424388

24389+
cat >>confdefs.h <<_ACEOF
24390+
#define PG_INT64_TYPE $pg_int64_type
24391+
_ACEOF
24392+
24393+
2438524394

2438624395
if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
2438724396
cat >conftest.$ac_ext <<_ACEOF
@@ -29930,6 +29939,9 @@ fi
2993029939
ac_config_headers="$ac_config_headers src/include/pg_config.h"
2993129940

2993229941

29942+
ac_config_headers="$ac_config_headers src/include/pg_config_ext.h"
29943+
29944+
2993329945
ac_config_headers="$ac_config_headers src/interfaces/ecpg/include/ecpg_config.h"
2993429946

2993529947

@@ -30550,6 +30562,7 @@ do
3055030562
"src/Makefile.port") CONFIG_LINKS="$CONFIG_LINKS src/Makefile.port:src/makefiles/Makefile.${template}" ;;
3055130563
"check_win32_symlinks") CONFIG_COMMANDS="$CONFIG_COMMANDS check_win32_symlinks" ;;
3055230564
"src/include/pg_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config.h" ;;
30565+
"src/include/pg_config_ext.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config_ext.h" ;;
3055330566
"src/interfaces/ecpg/include/ecpg_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/interfaces/ecpg/include/ecpg_config.h" ;;
3055430567

3055530568
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -31220,6 +31233,10 @@ $as_echo "$as_me: WARNING: *** link for $FILE -- please fix by hand" >&2;}
3122031233
"src/include/pg_config.h":H)
3122131234
# Update timestamp for pg_config.h (see Makefile.global)
3122231235
echo >src/include/stamp-h
31236+
;;
31237+
"src/include/pg_config_ext.h":H)
31238+
# Update timestamp for pg_config_ext.h (see Makefile.global)
31239+
echo >src/include/stamp-ext-h
3122331240
;;
3122431241
"src/interfaces/ecpg/include/ecpg_config.h":H) echo >src/interfaces/ecpg/include/stamp-h ;;
3122531242

‎configure.in

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,13 +1580,19 @@ dnl 64-bit type. But we still handle the case of snprintf being broken.
15801580

15811581
PGAC_TYPE_64BIT_INT([long int])
15821582

1583-
if test x"$HAVE_LONG_INT_64" = x"no" ; then
1583+
if test x"$HAVE_LONG_INT_64" = x"yes" ; then
1584+
pg_int64_type="long int"
1585+
else
15841586
PGAC_TYPE_64BIT_INT([long long int])
1585-
if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then
1587+
if test x"$HAVE_LONG_LONG_INT_64" = x"yes" ; then
1588+
pg_int64_type="long long int"
1589+
else
15861590
AC_MSG_ERROR([Cannot find a working 64-bit integer type.])
15871591
fi
15881592
fi
15891593

1594+
AC_DEFINE_UNQUOTED(PG_INT64_TYPE, $pg_int64_type,
1595+
[Define to the name of a signed 64-bit integer type.])
15901596

15911597
dnl If we need to use "long long int", figure out whether nnnLL notation works.
15921598

@@ -1935,6 +1941,12 @@ AC_CONFIG_HEADERS([src/include/pg_config.h],
19351941
echo >src/include/stamp-h
19361942
])
19371943

1944+
AC_CONFIG_HEADERS([src/include/pg_config_ext.h],
1945+
[
1946+
# Update timestamp for pg_config_ext.h (see Makefile.global)
1947+
echo >src/include/stamp-ext-h
1948+
])
1949+
19381950
AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h],
19391951
[echo >src/interfaces/ecpg/include/stamp-h])
19401952

‎src/Makefile.global.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,12 @@ $(top_builddir)/src/include/pg_config.h: $(top_builddir)/src/include/stamp-h ;
539539
$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/pg_config.h.in $(top_builddir)/config.status
540540
cd $(top_builddir) && ./config.status src/include/pg_config.h
541541

542+
# Also remake pg_config_ext.h from pg_config_ext.h.in, same logic as above.
543+
$(top_builddir)/src/include/pg_config_ext.h: $(top_builddir)/src/include/stamp-ext-h ;
544+
545+
$(top_builddir)/src/include/stamp-ext-h: $(top_srcdir)/src/include/pg_config_ext.h.in $(top_builddir)/config.status
546+
cd $(top_builddir) && ./config.status src/include/pg_config_ext.h
547+
542548
# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed, same
543549
# logic as above.
544550
$(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h: $(top_builddir)/src/interfaces/ecpg/include/stamp-h ;

‎src/bcc32.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ NULL=nul
2626
ALL:
2727
cd include
2828
if not exist pg_config.h copy pg_config.h.win32 pg_config.h
29+
if not exist pg_config_ext.h copy pg_config_ext.h.win32 pg_config_ext.h
2930
if not exist pg_config_os.h copy port\win32.h pg_config_os.h
3031
cd ..
3132
cd interfaces\libpq
@@ -42,5 +43,5 @@ CLEAN:
4243

4344
DISTCLEAN: CLEAN
4445
cd include
45-
del pg_config.h pg_config_os.h
46+
del pg_config.h pg_config_ext.h pg_config_os.h
4647
cd ..

‎src/include/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/stamp-h
2+
/stamp-ext-h
23
/pg_config.h
4+
/pg_config_ext.h
35
/pg_config_os.h
46
/dynloader.h
5-

‎src/include/Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ top_builddir = ../..
1313
include $(top_builddir)/src/Makefile.global
1414

1515

16-
all: pg_config.h pg_config_os.h
16+
all: pg_config.h pg_config_ext.h pg_config_os.h
1717

1818

1919
# Subdirectories containing headers for server-side dev
@@ -29,17 +29,19 @@ install: all installdirs
2929
# These headers are needed by the public headers of the interfaces.
3030
$(INSTALL_DATA) $(srcdir)/postgres_ext.h '$(DESTDIR)$(includedir)'
3131
$(INSTALL_DATA) $(srcdir)/libpq/libpq-fs.h '$(DESTDIR)$(includedir)/libpq'
32-
$(INSTALL_DATA) pg_config.h '$(DESTDIR)$(includedir)'
33-
$(INSTALL_DATA) pg_config_os.h '$(DESTDIR)$(includedir)'
32+
$(INSTALL_DATA) pg_config.h '$(DESTDIR)$(includedir)'
33+
$(INSTALL_DATA) pg_config_ext.h '$(DESTDIR)$(includedir)'
34+
$(INSTALL_DATA) pg_config_os.h '$(DESTDIR)$(includedir)'
3435
$(INSTALL_DATA) $(srcdir)/pg_config_manual.h '$(DESTDIR)$(includedir)'
3536
# These headers are needed by the not-so-public headers of the interfaces.
3637
$(INSTALL_DATA) $(srcdir)/c.h '$(DESTDIR)$(includedir_internal)'
3738
$(INSTALL_DATA) $(srcdir)/port.h '$(DESTDIR)$(includedir_internal)'
3839
$(INSTALL_DATA) $(srcdir)/postgres_fe.h '$(DESTDIR)$(includedir_internal)'
3940
$(INSTALL_DATA) $(srcdir)/libpq/pqcomm.h '$(DESTDIR)$(includedir_internal)/libpq'
4041
# These headers are needed for server-side development
41-
$(INSTALL_DATA) pg_config.h '$(DESTDIR)$(includedir_server)'
42-
$(INSTALL_DATA) pg_config_os.h '$(DESTDIR)$(includedir_server)'
42+
$(INSTALL_DATA) pg_config.h '$(DESTDIR)$(includedir_server)'
43+
$(INSTALL_DATA) pg_config_ext.h '$(DESTDIR)$(includedir_server)'
44+
$(INSTALL_DATA) pg_config_os.h '$(DESTDIR)$(includedir_server)'
4345
$(INSTALL_DATA) utils/errcodes.h '$(DESTDIR)$(includedir_server)/utils'
4446
$(INSTALL_DATA) utils/fmgroids.h '$(DESTDIR)$(includedir_server)/utils'
4547
# We don't use INSTALL_DATA for performance reasons --- there are a lot of files
@@ -62,7 +64,7 @@ installdirs:
6264

6365

6466
uninstall:
65-
rm -f $(addprefix '$(DESTDIR)$(includedir)'/, pg_config.h pg_config_os.h pg_config_manual.h postgres_ext.h libpq/libpq-fs.h)
67+
rm -f $(addprefix '$(DESTDIR)$(includedir)'/, pg_config.h pg_config_ext.h pg_config_os.h pg_config_manual.h postgres_ext.h libpq/libpq-fs.h)
6668
rm -f $(addprefix '$(DESTDIR)$(includedir_internal)'/, c.h port.h postgres_fe.h libpq/pqcomm.h)
6769
# heuristic...
6870
rm -rf $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS) *.h)
@@ -72,7 +74,7 @@ clean:
7274
rm -f utils/fmgroids.h utils/errcodes.h parser/gram.h utils/probes.h catalog/schemapg.h
7375

7476
distclean maintainer-clean: clean
75-
rm -f pg_config.h dynloader.h pg_config_os.h stamp-h
77+
rm -f pg_config.h pg_config_ext.h pg_config_os.h dynloader.h stamp-h stamp-ext-h
7678

7779
maintainer-check:
7880
cd catalog && ./duplicate_oids

‎src/include/c.h

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,30 @@
4444
#ifndef C_H
4545
#define C_H
4646

47-
/*
48-
* We have to include stdlib.h here because it defines many of these macros
49-
* on some platforms, and we only want our definitions used if stdlib.h doesn't
50-
* have its own. The same goes for stddef and stdarg if present.
51-
*/
47+
#include "postgres_ext.h"
48+
49+
/* Must undef pg_config_ext.h symbols before including pg_config.h */
50+
#undef PG_INT64_TYPE
5251

5352
#include "pg_config.h"
5453
#include "pg_config_manual.h" /* must be after pg_config.h */
55-
#if !defined(WIN32) && !defined(__CYGWIN__) /* win32 will include further
56-
* down */
54+
55+
#if !defined(WIN32) && !defined(__CYGWIN__) /* win32 includes further down */
5756
#include "pg_config_os.h" /* must be before any system header files */
5857
#endif
59-
#include "postgres_ext.h"
6058

6159
#if _MSC_VER >= 1400 || defined(HAVE_CRTDEFS_H)
6260
#define errcode __msvc_errcode
6361
#include <crtdefs.h>
6462
#undef errcode
6563
#endif
6664

65+
/*
66+
* We have to include stdlib.h here because it defines many of these macros
67+
* on some platforms, and we only want our definitions used if stdlib.h doesn't
68+
* have its own. The same goes for stddef and stdarg if present.
69+
*/
70+
6771
#include <stdio.h>
6872
#include <stdlib.h>
6973
#include <string.h>

‎src/include/pg_config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,9 @@
671671
/* Define to the version of this package. */
672672
#undef PACKAGE_VERSION
673673

674+
/* Define to the name of a signed 64-bit integer type. */
675+
#undef PG_INT64_TYPE
676+
674677
/* Define to the name of the default PostgreSQL service principal in Kerberos.
675678
(--with-krb-srvnam=NAME) */
676679
#undef PG_KRB_SRVNAM

‎src/include/pg_config.h.win32

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,9 @@
562562
/* Define to the version of this package. */
563563
#define PACKAGE_VERSION "9.3devel"
564564

565+
/* Define to the name of a signed 64-bit integer type. */
566+
#define PG_INT64_TYPE long long int
567+
565568
/* PostgreSQL version as a string */
566569
#define PG_VERSION "9.3devel"
567570

‎src/include/pg_config_ext.h.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* src/include/pg_config_ext.h.in. This is generated manually, not by
3+
* autoheader, since we want to limit which symbols get defined here.
4+
*/
5+
6+
/* Define to the name of a signed 64-bit integer type. */
7+
#undef PG_INT64_TYPE

‎src/include/pg_config_ext.h.win32

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* src/include/pg_config_ext.h.win32. This is generated manually, not by
3+
* autoheader, since we want to limit which symbols get defined here.
4+
*/
5+
6+
/* Define to the name of a signed 64-bit integer type. */
7+
#define PG_INT64_TYPE long long int

‎src/include/postgres_ext.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#ifndef POSTGRES_EXT_H
2424
#define POSTGRES_EXT_H
2525

26+
#include "pg_config_ext.h"
27+
2628
/*
2729
* Object ID is a fundamental type in Postgres.
2830
*/
@@ -37,6 +39,9 @@ typedef unsigned int Oid;
3739
#define OID_MAX UINT_MAX
3840
/* you will need to include <limits.h> to use the above #define */
3941

42+
/* Define a signed 64-bit integer type for use in client API declarations. */
43+
typedef PG_INT64_TYPE pg_int64;
44+
4045

4146
/*
4247
* Identifiers of error message fields. Kept here to keep common
@@ -56,9 +61,4 @@ typedef unsigned int Oid;
5661
#define PG_DIAG_SOURCE_LINE 'L'
5762
#define PG_DIAG_SOURCE_FUNCTION 'R'
5863

59-
#ifndef NO_PG_INT64
60-
#define HAVE_PG_INT64 1
61-
typedef long long int pg_int64;
62-
#endif
63-
64-
#endif
64+
#endif /* POSTGRES_EXT_H */

‎src/include/storage/large_object.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,13 @@ typedef struct LargeObjectDesc
6262
* This avoids unnecessary tuple updates caused by partial-page writes.
6363
*/
6464
#define LOBLKSIZE (BLCKSZ / 4)
65+
6566
/*
66-
* Maximum byte length for each large object
67-
*/
68-
#define MAX_LARGE_OBJECT_SIZE ((int64)INT_MAX * LOBLKSIZE)
67+
* Maximum length in bytes for a large object. To make this larger, we'd
68+
* have to widen pg_largeobject.pageno as well as various internal variables.
69+
*/
70+
#define MAX_LARGE_OBJECT_SIZE ((int64) INT_MAX * LOBLKSIZE)
71+
6972

7073
/*
7174
* Function definitions...
@@ -77,8 +80,8 @@ extern Oid inv_create(Oid lobjId);
7780
extern LargeObjectDesc *inv_open(Oid lobjId, int flags, MemoryContext mcxt);
7881
extern void inv_close(LargeObjectDesc *obj_desc);
7982
extern int inv_drop(Oid lobjId);
80-
extern int64 inv_seek(LargeObjectDesc *obj_desc, int64 offset, int whence);
81-
extern int64 inv_tell(LargeObjectDesc *obj_desc);
83+
extern int64 inv_seek(LargeObjectDesc *obj_desc, int64 offset, int whence);
84+
extern int64 inv_tell(LargeObjectDesc *obj_desc);
8285
extern int inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes);
8386
extern int inv_write(LargeObjectDesc *obj_desc, const char *buf, int nbytes);
8487
extern void inv_truncate(LargeObjectDesc *obj_desc, int64 len);

‎src/interfaces/libpq/bcc32.mak

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,14 @@ LIB32_OBJS= \
153153
"$(INTDIR)\pthread-win32.obj"
154154

155155

156-
config: ..\..\include\pg_config.h ..\..\include\pg_config_os.h pg_config_paths.h
156+
config: ..\..\include\pg_config.h ..\..\include\pg_config_ext.h ..\..\include\pg_config_os.h pg_config_paths.h
157157

158158
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
159159
copy ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h
160160

161+
..\..\include\pg_config_ext.h: ..\..\include\pg_config_ext.h.win32
162+
copy ..\..\include\pg_config_ext.h.win32 ..\..\include\pg_config_ext.h
163+
161164
..\..\include\pg_config_os.h: ..\..\include\port\win32.h
162165
copy ..\..\include\port\win32.h ..\..\include\pg_config_os.h
163166

0 commit comments

Comments
 (0)