Skip to content

Commit 72e2d21

Browse files
anarazelanarazel
committed
Combine win32 and unix latch implementations.
Previously latches for windows and unix had been implemented in different files. A later patch introduce an expanded wait infrastructure, keeping the implementation separate would introduce too much duplication. This basically just moves the functions, without too much change. The reason to keep this separate is that it allows blame to continue working a little less badly; and to make review a tiny bit easier. Discussion: 20160114143931.GG10941@awork2.anarazel.de
1 parent 326d73c commit 72e2d21

File tree

10 files changed

+278
-384
lines changed

10 files changed

+278
-384
lines changed

‎configure

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14786,13 +14786,6 @@ $as_echo "#define USE_WIN32_SHARED_MEMORY 1" >>confdefs.h
1478614786
SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c"
1478714787
fi
1478814788

14789-
# Select latch implementation type.
14790-
if test "$PORTNAME" != "win32"; then
14791-
LATCH_IMPLEMENTATION="src/backend/port/unix_latch.c"
14792-
else
14793-
LATCH_IMPLEMENTATION="src/backend/port/win32_latch.c"
14794-
fi
14795-
1479614789
# If not set in template file, set bytes to use libc memset()
1479714790
if test x"$MEMSET_LOOP_LIMIT" = x"" ; then
1479814791
MEMSET_LOOP_LIMIT=1024
@@ -15868,7 +15861,7 @@ fi
1586815861
ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
1586915862

1587015863

15871-
ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/backend/port/pg_latch.c:${LATCH_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}"
15864+
ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}"
1587215865

1587315866

1587415867
if test "$PORTNAME" = "win32"; then
@@ -16592,7 +16585,6 @@ do
1659216585
"src/backend/port/dynloader.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c" ;;
1659316586
"src/backend/port/pg_sema.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION}" ;;
1659416587
"src/backend/port/pg_shmem.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION}" ;;
16595-
"src/backend/port/pg_latch.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/pg_latch.c:${LATCH_IMPLEMENTATION}" ;;
1659616588
"src/include/dynloader.h") CONFIG_LINKS="$CONFIG_LINKS src/include/dynloader.h:src/backend/port/dynloader/${template}.h" ;;
1659716589
"src/include/pg_config_os.h") CONFIG_LINKS="$CONFIG_LINKS src/include/pg_config_os.h:src/include/port/${template}.h" ;;
1659816590
"src/Makefile.port") CONFIG_LINKS="$CONFIG_LINKS src/Makefile.port:src/makefiles/Makefile.${template}" ;;

‎configure.in

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,13 +1976,6 @@ else
19761976
SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c"
19771977
fi
19781978

1979-
# Select latch implementation type.
1980-
if test "$PORTNAME" != "win32"; then
1981-
LATCH_IMPLEMENTATION="src/backend/port/unix_latch.c"
1982-
else
1983-
LATCH_IMPLEMENTATION="src/backend/port/win32_latch.c"
1984-
fi
1985-
19861979
# If not set in template file, set bytes to use libc memset()
19871980
if test x"$MEMSET_LOOP_LIMIT" = x"" ; then
19881981
MEMSET_LOOP_LIMIT=1024
@@ -2178,7 +2171,6 @@ AC_CONFIG_LINKS([
21782171
src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c
21792172
src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION}
21802173
src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION}
2181-
src/backend/port/pg_latch.c:${LATCH_IMPLEMENTATION}
21822174
src/include/dynloader.h:src/backend/port/dynloader/${template}.h
21832175
src/include/pg_config_os.h:src/include/port/${template}.h
21842176
src/Makefile.port:src/makefiles/Makefile.${template}

‎src/backend/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,7 @@ ifeq ($(PORTNAME), win32)
306306
endif
307307

308308
distclean: clean
309-
rm -f port/tas.s port/dynloader.c port/pg_sema.c port/pg_shmem.c \
310-
port/pg_latch.c
309+
rm -f port/tas.s port/dynloader.c port/pg_sema.c port/pg_shmem.c
311310

312311
maintainer-clean: distclean
313312
rm -f bootstrap/bootparse.c \

‎src/backend/port/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/dynloader.c
2-
/pg_latch.c
32
/pg_sema.c
43
/pg_shmem.c
54
/tas.s

‎src/backend/port/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ subdir = src/backend/port
2121
top_builddir = ../../..
2222
include $(top_builddir)/src/Makefile.global
2323

24-
OBJS = atomics.o dynloader.o pg_sema.o pg_shmem.o pg_latch.o $(TAS)
24+
OBJS = atomics.o dynloader.o pg_sema.o pg_shmem.o $(TAS)
2525

2626
ifeq ($(PORTNAME), darwin)
2727
SUBDIRS += darwin

0 commit comments

Comments
 (0)