mirror of
https://github.com/postgres/postgres.git
synced 2025-11-15 03:41:20 +03:00
Repair parallel make in backend tree (and make it really parallel).
Make Gen_fmgrtab.sh reasonably robust against concurrent invocation.
This commit is contained in:
Peter Eisentraut
@@ -9,7 +9,7 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.16 2000/07/06 21:33:30 petere Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.17 2000/07/13 16:07:06 petere Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@@ -19,7 +19,7 @@ CMDNAME=`basename $0`
|
||||
: ${CPP='cc -E'}
|
||||
|
||||
cleanup(){
|
||||
[ x"$noclean" != x"t" ] && rm -f "$CPPTMPFILE" "$RAWFILE"
|
||||
[ x"$noclean" != x"t" ] && rm -f "$CPPTMPFILE" "$RAWFILE" "$$-$OIDSFILE" "$$-$TABLEFILE"
|
||||
}
|
||||
|
||||
BKIOPTS=
|
||||
@@ -71,13 +71,13 @@ if [ x"$INFILE" = x ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
CPPTMPFILE=fmgrtmp.c
|
||||
RAWFILE=fmgr.raw
|
||||
CPPTMPFILE="$$-fmgrtmp.c"
|
||||
RAWFILE="$$-fmgr.raw"
|
||||
OIDSFILE=fmgroids.h
|
||||
TABLEFILE=fmgrtab.c
|
||||
|
||||
|
||||
trap 'echo "Caught signal." ; cleanup ; exit 1' 1 2 3 15
|
||||
trap 'echo "Caught signal." ; cleanup ; exit 1' 1 2 15
|
||||
|
||||
|
||||
#
|
||||
@@ -124,7 +124,7 @@ cpp_define=`echo $OIDSFILE | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTU
|
||||
#
|
||||
# Generate fmgroids.h
|
||||
#
|
||||
cat > "$OIDSFILE" <<FuNkYfMgRsTuFf
|
||||
cat > "$$-$OIDSFILE" <<FuNkYfMgRsTuFf
|
||||
/*-------------------------------------------------------------------------
|
||||
*
|
||||
* $OIDSFILE
|
||||
@@ -165,7 +165,7 @@ FuNkYfMgRsTuFf
|
||||
tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' < $RAWFILE | \
|
||||
$AWK '
|
||||
BEGIN { OFS = ""; }
|
||||
{ if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }' >> "$OIDSFILE"
|
||||
{ if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }' >> "$$-$OIDSFILE"
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
cleanup
|
||||
@@ -173,7 +173,7 @@ if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cat >> "$OIDSFILE" <<FuNkYfMgRsTuFf
|
||||
cat >> "$$-$OIDSFILE" <<FuNkYfMgRsTuFf
|
||||
|
||||
#endif /* $cpp_define */
|
||||
FuNkYfMgRsTuFf
|
||||
@@ -187,7 +187,7 @@ FuNkYfMgRsTuFf
|
||||
# this table definition as a separate C file that won't need to include any
|
||||
# "real" declarations for those functions!
|
||||
#
|
||||
cat > "$TABLEFILE" <<FuNkYfMgRtAbStUfF
|
||||
cat > "$$-$TABLEFILE" <<FuNkYfMgRtAbStUfF
|
||||
/*-------------------------------------------------------------------------
|
||||
*
|
||||
* $TABLEFILE
|
||||
@@ -218,7 +218,7 @@ cat > "$TABLEFILE" <<FuNkYfMgRtAbStUfF
|
||||
|
||||
FuNkYfMgRtAbStUfF
|
||||
|
||||
$AWK '{ print "extern Datum", $(NF-1), "(PG_FUNCTION_ARGS);"; }' $RAWFILE >> "$TABLEFILE"
|
||||
$AWK '{ print "extern Datum", $(NF-1), "(PG_FUNCTION_ARGS);"; }' $RAWFILE >> "$$-$TABLEFILE"
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
cleanup
|
||||
@@ -227,7 +227,7 @@ if [ $? -ne 0 ]; then
|
||||
fi
|
||||
|
||||
|
||||
cat >> "$TABLEFILE" <<FuNkYfMgRtAbStUfF
|
||||
cat >> "$$-$TABLEFILE" <<FuNkYfMgRtAbStUfF
|
||||
|
||||
const FmgrBuiltin fmgr_builtins[] = {
|
||||
FuNkYfMgRtAbStUfF
|
||||
@@ -244,7 +244,7 @@ $AWK 'BEGIN {
|
||||
}
|
||||
{ printf (" { %d, \"%s\", %d, %s, %s, %s },\n"), \
|
||||
$1, $(NF-1), $9, Strict[$8], OldStyle[$4], $(NF-1)
|
||||
}' $RAWFILE >> "$TABLEFILE"
|
||||
}' $RAWFILE >> "$$-$TABLEFILE"
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
cleanup
|
||||
@@ -252,7 +252,7 @@ if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cat >> "$TABLEFILE" <<FuNkYfMgRtAbStUfF
|
||||
cat >> "$$-$TABLEFILE" <<FuNkYfMgRtAbStUfF
|
||||
/* dummy entry is easier than getting rid of comma after last real one */
|
||||
/* (not that there has ever been anything wrong with *having* a
|
||||
comma after the last field in an array initializer) */
|
||||
@@ -264,5 +264,10 @@ const int fmgr_nbuiltins = (sizeof(fmgr_builtins) / sizeof(FmgrBuiltin)) - 1;
|
||||
|
||||
FuNkYfMgRtAbStUfF
|
||||
|
||||
# We use the temporary files to avoid problems with concurrent runs
|
||||
# (which can happen during parallel make).
|
||||
mv "$$-$OIDSFILE" $OIDSFILE
|
||||
mv "$$-$TABLEFILE" $TABLEFILE
|
||||
|
||||
cleanup
|
||||
exit 0
|
||||
|
||||
@@ -1,48 +1,41 @@
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# Makefile--
|
||||
# Makefile for utils
|
||||
# Makefile for utils
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.16 2000/07/01 21:16:44 petere Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.17 2000/07/13 16:07:06 petere Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../..
|
||||
include $(SRCDIR)/Makefile.global
|
||||
|
||||
all: submake SUBSYS.o
|
||||
|
||||
OBJS = fmgrtab.o adt/SUBSYS.o cache/SUBSYS.o error/SUBSYS.o \
|
||||
fmgr/SUBSYS.o hash/SUBSYS.o init/SUBSYS.o misc/SUBSYS.o mmgr/SUBSYS.o \
|
||||
sort/SUBSYS.o time/SUBSYS.o
|
||||
|
||||
DIRS = adt cache error fmgr hash init misc mmgr sort time
|
||||
subdir = src/backend/utils/
|
||||
top_builddir = ../../..
|
||||
include ../../Makefile.global
|
||||
|
||||
SUBDIRS := adt cache error fmgr hash init misc mmgr sort time
|
||||
ifdef MULTIBYTE
|
||||
OBJS += mb/SUBSYS.o
|
||||
DIRS += mb
|
||||
SUBDIRS += mb
|
||||
endif
|
||||
|
||||
SUBSYS.o: $(OBJS)
|
||||
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
|
||||
|
||||
.PHONY: submake clean dep depend
|
||||
|
||||
submake:
|
||||
for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done
|
||||
SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o)
|
||||
|
||||
|
||||
fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
|
||||
CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(SRCDIR)/include/catalog/pg_proc.h
|
||||
all: SUBSYS.o fmgroids.h
|
||||
|
||||
SUBSYS.o: fmgrtab.o $(SUBDIROBJS)
|
||||
$(LD) $(LDREL) $(LDOUT) $@ $^
|
||||
|
||||
$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)
|
||||
|
||||
.PHONY: $(SUBDIRS:%=%-recursive)
|
||||
$(SUBDIRS:%=%-recursive): fmgroids.h
|
||||
$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
|
||||
|
||||
fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(top_srcdir)/src/include/catalog/pg_proc.h
|
||||
CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(top_srcdir)/src/include/catalog/pg_proc.h
|
||||
|
||||
|
||||
clean:
|
||||
for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
|
||||
rm -f SUBSYS.o fmgrtab.o fmgroids.h fmgrtab.c
|
||||
for i in $(DIRS); do $(MAKE) -C $$i clean; done
|
||||
|
||||
dep depend: fmgroids.h fmgrtab.c
|
||||
for i in $(DIRS); do $(MAKE) -C $$i depend; done
|
||||
for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
|
||||
|
||||
ifeq (depend,$(wildcard depend))
|
||||
include depend
|
||||
|
||||
@@ -1,22 +1,16 @@
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# Makefile--
|
||||
# Makefile for utils/adt
|
||||
# Makefile for utils/adt
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.38 2000/07/07 19:24:37 petere Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.39 2000/07/13 16:07:14 petere Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
subdir = src/backend/utils/adt
|
||||
top_builddir = ../../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
# seems to be required for some date/time stuff 1999/07/22 bjm
|
||||
ifeq ($(CPU),alpha)
|
||||
ifeq ($(CC), gcc)
|
||||
CFLAGS+= -mieee
|
||||
endif
|
||||
ifeq ($(CC), egcs)
|
||||
ifeq ($(GCC), yes)
|
||||
CFLAGS+= -mieee
|
||||
endif
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user