Move logging.h and logging.c from src/fe_utils/ to src/common/.

The original placement of this module in src/fe_utils/ is ill-considered,
because several src/common/ modules have dependencies on it, meaning that
libpgcommon and libpgfeutils now have mutual dependencies.  That makes it
pointless to have distinct libraries at all.  The intended design is that
libpgcommon is lower-level than libpgfeutils, so only dependencies from
the latter to the former are acceptable.

We already have the precedent that fe_memutils and a couple of other
modules in src/common/ are frontend-only, so it's not stretching anything
out of whack to treat logging.c as a frontend-only module in src/common/.
To the extent that such modules help provide a common frontend/backend
environment for the rest of common/ to use, it's a reasonable design.
(logging.c does not yet provide an ereport() emulation, but one can
dream.)

Hence, move these files over, and revert basically all of the build-system
changes made by commit cc8d415.  There are no places that need to grow
new dependencies on libpgcommon, further reinforcing the idea that this
is the right solution.

Discussion: https://postgr.es/m/[email protected]

Author: tglsfdc

src/bin/initdb/initdb.c

@@ -65,9 +65,9 @@
 #include "catalog/pg_collation_d.h"
 #include "common/file_perm.h"
 #include "common/file_utils.h"
+#include "common/logging.h"
 #include "common/restricted_token.h"
 #include "common/username.h"
-#include "fe_utils/logging.h"
 #include "fe_utils/string_utils.h"
 #include "getaddrinfo.h"
 #include "getopt_long.h"

src/bin/pg_archivecleanup/Makefile

@@ -7,13 +7,11 @@ subdir = src/bin/pg_archivecleanup
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils
-
 OBJS	= pg_archivecleanup.o $(WIN32RES)
 
 all: pg_archivecleanup
 
-pg_archivecleanup: $(OBJS) | submake-libpgport submake-libpgfeutils
+pg_archivecleanup: $(OBJS) | submake-libpgport
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 install: all installdirs

src/bin/pg_archivecleanup/pg_archivecleanup.c

@@ -17,7 +17,7 @@
 
 #include "pg_getopt.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 #include "access/xlog_internal.h"
 

src/bin/pg_basebackup/pg_basebackup.c

@@ -29,8 +29,8 @@
 #include "access/xlog_internal.h"
 #include "common/file_perm.h"
 #include "common/file_utils.h"
+#include "common/logging.h"
 #include "common/string.h"
-#include "fe_utils/logging.h"
 #include "fe_utils/string_utils.h"
 #include "getopt_long.h"
 #include "libpq-fe.h"

src/bin/pg_basebackup/pg_receivewal.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include "common/file_perm.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 #include "libpq-fe.h"
 #include "access/xlog_internal.h"
 #include "getopt_long.h"

src/bin/pg_basebackup/pg_recvlogical.c

@@ -25,7 +25,7 @@
 #include "access/xlog_internal.h"
 #include "common/file_perm.h"
 #include "common/fe_memutils.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 #include "getopt_long.h"
 #include "libpq-fe.h"
 #include "libpq/pqsignal.h"

src/bin/pg_basebackup/receivelog.c

@@ -27,7 +27,7 @@
 #include "libpq-fe.h"
 #include "access/xlog_internal.h"
 #include "common/file_utils.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 
 /* fd and filename for currently open WAL file */

src/bin/pg_basebackup/streamutil.c

@@ -24,9 +24,9 @@
 #include "access/xlog_internal.h"
 #include "common/fe_memutils.h"
 #include "common/file_perm.h"
+#include "common/logging.h"
 #include "datatype/timestamp.h"
 #include "fe_utils/connect.h"
-#include "fe_utils/logging.h"
 #include "port/pg_bswap.h"
 #include "pqexpbuffer.h"
 

src/bin/pg_checksums/Makefile

@@ -15,13 +15,11 @@ subdir = src/bin/pg_checksums
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils
-
 OBJS= pg_checksums.o $(WIN32RES)
 
 all: pg_checksums
 
-pg_checksums: $(OBJS) | submake-libpgport submake-libpgfeutils
+pg_checksums: $(OBJS) | submake-libpgport
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 install: all installdirs

src/bin/pg_checksums/pg_checksums.c

@@ -23,7 +23,7 @@
 #include "common/controldata_utils.h"
 #include "common/file_perm.h"
 #include "common/file_utils.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 #include "getopt_long.h"
 #include "pg_getopt.h"
 #include "storage/bufpage.h"

src/bin/pg_controldata/Makefile

@@ -15,13 +15,11 @@ subdir = src/bin/pg_controldata
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils
-
 OBJS= pg_controldata.o $(WIN32RES)
 
 all: pg_controldata
 
-pg_controldata: $(OBJS) | submake-libpgport submake-libpgfeutils
+pg_controldata: $(OBJS) | submake-libpgport
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 install: all installdirs

src/bin/pg_controldata/pg_controldata.c

@@ -25,7 +25,7 @@
 #include "access/xlog_internal.h"
 #include "catalog/pg_control.h"
 #include "common/controldata_utils.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 #include "pg_getopt.h"
 #include "getopt_long.h"
 

src/bin/pg_ctl/Makefile

@@ -16,8 +16,6 @@ subdir = src/bin/pg_ctl
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils
-
 # On Windows, we need to link with libpq, just for use of pqexpbuffer;
 # but let's not pull that in on platforms where we don't need it.
 ifeq ($(PORTNAME), win32)
@@ -30,7 +28,7 @@ OBJS=	pg_ctl.o $(WIN32RES)
 
 all: pg_ctl
 
-pg_ctl: $(OBJS) | submake-libpgport submake-libpgfeutils $(SUBMAKE_LIBPQ)
+pg_ctl: $(OBJS) | submake-libpgport $(SUBMAKE_LIBPQ)
 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 install: all installdirs

src/bin/pg_ctl/pg_ctl.c

@@ -26,7 +26,7 @@
 #include "catalog/pg_control.h"
 #include "common/controldata_utils.h"
 #include "common/file_perm.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 #include "getopt_long.h"
 #include "utils/pidfile.h"
 

src/bin/pg_dump/common.c

@@ -22,7 +22,6 @@
 #include <ctype.h>
 
 #include "catalog/pg_class_d.h"
-#include "fe_utils/logging.h"
 #include "fe_utils/string_utils.h"
 
 

src/bin/pg_dump/pg_backup_archiver.c

@@ -35,7 +35,6 @@
 #include "pg_backup_db.h"
 #include "pg_backup_utils.h"
 #include "dumputils.h"
-#include "fe_utils/logging.h"
 #include "fe_utils/string_utils.h"
 
 #include "libpq/libpq-fs.h"

src/bin/pg_dump/pg_backup_custom.c

@@ -29,7 +29,7 @@
 #include "parallel.h"
 #include "pg_backup_utils.h"
 #include "common/file_utils.h"
-#include "fe_utils/logging.h"
+
 
 /*--------
  * Routines in the format interface

src/bin/pg_dump/pg_backup_db.c

@@ -11,10 +11,10 @@
  */
 #include "postgres_fe.h"
 
-#include "dumputils.h"
 #include "fe_utils/connect.h"
-#include "fe_utils/logging.h"
 #include "fe_utils/string_utils.h"
+
+#include "dumputils.h"
 #include "parallel.h"
 #include "pg_backup_archiver.h"
 #include "pg_backup_db.h"

src/bin/pg_dump/pg_backup_utils.h

@@ -15,7 +15,7 @@
 #ifndef PG_BACKUP_UTILS_H
 #define PG_BACKUP_UTILS_H
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 typedef enum					/* bits returned by set_dump_section */
 {

src/bin/pg_dump/pg_dump.c

@@ -63,7 +63,6 @@
 #include "pg_backup_utils.h"
 #include "pg_dump.h"
 #include "fe_utils/connect.h"
-#include "fe_utils/logging.h"
 #include "fe_utils/string_utils.h"
 
 

src/bin/pg_dump/pg_dump_sort.c

@@ -20,7 +20,6 @@
 #include "pg_dump.h"
 
 #include "catalog/pg_class_d.h"
-#include "fe_utils/logging.h"
 
 /*
  * Sort priority for database object types.

src/bin/pg_dump/pg_dumpall.c

@@ -23,8 +23,8 @@
 #include "dumputils.h"
 #include "pg_backup.h"
 #include "common/file_utils.h"
+#include "common/logging.h"
 #include "fe_utils/connect.h"
-#include "fe_utils/logging.h"
 #include "fe_utils/string_utils.h"
 
 /* version string we expect back from pg_dump */

src/bin/pg_dump/pg_restore.c

@@ -51,8 +51,6 @@
 #include "parallel.h"
 #include "pg_backup_utils.h"
 
-#include "fe_utils/logging.h"
-
 
 static void usage(const char *progname);
 

src/bin/pg_resetwal/Makefile

@@ -15,13 +15,11 @@ subdir = src/bin/pg_resetwal
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils
-
 OBJS= pg_resetwal.o $(WIN32RES)
 
 all: pg_resetwal
 
-pg_resetwal: $(OBJS) | submake-libpgport submake-libpgfeutils
+pg_resetwal: $(OBJS) | submake-libpgport
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 install: all installdirs

src/bin/pg_resetwal/pg_resetwal.c

@@ -52,8 +52,8 @@
 #include "common/controldata_utils.h"
 #include "common/fe_memutils.h"
 #include "common/file_perm.h"
+#include "common/logging.h"
 #include "common/restricted_token.h"
-#include "fe_utils/logging.h"
 #include "storage/large_object.h"
 #include "pg_getopt.h"
 #include "getopt_long.h"

src/bin/pg_rewind/Makefile

@@ -16,7 +16,7 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS)
-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
+LDFLAGS_INTERNAL += $(libpq_pgport)
 
 OBJS	= pg_rewind.o parsexlog.o xlogreader.o datapagemap.o timeline.o \
 	fetch.o file_ops.o copy_fetch.o libpq_fetch.o filemap.o \
@@ -26,7 +26,7 @@ EXTRA_CLEAN = xlogreader.c
 
 all: pg_rewind
 
-pg_rewind: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils
+pg_rewind: $(OBJS) | submake-libpq submake-libpgport
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 xlogreader.c: % : $(top_srcdir)/src/backend/access/transam/%

src/bin/pg_rewind/datapagemap.c

@@ -14,7 +14,7 @@
 
 #include "datapagemap.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 struct datapagemap_iterator
 {

src/bin/pg_rewind/pg_rewind.h

@@ -17,7 +17,7 @@
 #include "storage/block.h"
 #include "storage/relfilenode.h"
 
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 /* Configuration options */
 extern char *datadir_target;

src/bin/pg_test_fsync/Makefile

@@ -7,13 +7,11 @@ subdir = src/bin/pg_test_fsync
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils
-
 OBJS = pg_test_fsync.o $(WIN32RES)
 
 all: pg_test_fsync
 
-pg_test_fsync: $(OBJS) | submake-libpgport submake-libpgfeutils
+pg_test_fsync: $(OBJS) | submake-libpgport
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 install: all installdirs

src/bin/pg_test_fsync/pg_test_fsync.c

@@ -14,7 +14,7 @@
 
 #include "getopt_long.h"
 #include "access/xlogdefs.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 
 
 /*

src/bin/pg_upgrade/pg_upgrade.c

@@ -40,8 +40,8 @@
 #include "pg_upgrade.h"
 #include "catalog/pg_class_d.h"
 #include "common/file_perm.h"
+#include "common/logging.h"
 #include "common/restricted_token.h"
-#include "fe_utils/logging.h"
 #include "fe_utils/string_utils.h"
 
 #ifdef HAVE_LANGINFO_H

src/bin/pg_waldump/Makefile

@@ -11,15 +11,14 @@ OBJS = pg_waldump.o compat.o xlogreader.o rmgrdesc.o \
 	$(RMGRDESCOBJS) $(WIN32RES)
 
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils
 
 RMGRDESCSOURCES = $(sort $(notdir $(wildcard $(top_srcdir)/src/backend/access/rmgrdesc/*desc.c)))
 RMGRDESCOBJS = $(patsubst %.c,%.o,$(RMGRDESCSOURCES))
 
 
 all: pg_waldump
 
-pg_waldump: $(OBJS) | submake-libpgport submake-libpgfeutils
+pg_waldump: $(OBJS) | submake-libpgport
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 xlogreader.c: % : $(top_srcdir)/src/backend/access/transam/%

src/bin/pg_waldump/pg_waldump.c

@@ -21,7 +21,7 @@
 #include "access/xlog_internal.h"
 #include "access/transam.h"
 #include "common/fe_memutils.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
 #include "getopt_long.h"
 #include "rmgrdesc.h"
 

src/bin/pgbench/pgbench.c

@@ -33,8 +33,8 @@
 
 #include "postgres_fe.h"
 #include "common/int.h"
+#include "common/logging.h"
 #include "fe_utils/conditional.h"
-#include "fe_utils/logging.h"
 #include "getopt_long.h"
 #include "libpq-fe.h"
 #include "portability/instr_time.h"

src/bin/psql/command.c

@@ -28,7 +28,8 @@
 
 #include "libpq-fe.h"
 #include "pqexpbuffer.h"
-#include "fe_utils/logging.h"
+#include "common/logging.h"
+#include "fe_utils/print.h"
 #include "fe_utils/string_utils.h"
 
 #include "common.h"
@@ -39,7 +40,6 @@
 #include "input.h"
 #include "large_obj.h"
 #include "mainloop.h"
-#include "fe_utils/print.h"
 #include "psqlscanslash.h"
 #include "settings.h"
 #include "variables.h"