From 90aebf7f5242b11bc9576f5d9052d755336b1bcc Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 27 Sep 2001 19:10:02 +0000
Subject: [PATCH] Move s_lock.c and spin.c into lmgr subdirectory, which seems
a much more reasonable location for them.
---
src/backend/storage/buffer/Makefile | 10 +++-------
src/backend/storage/ipc/Makefile | 5 ++---
src/backend/storage/lmgr/Makefile | 10 +++++++---
src/backend/storage/{buffer => lmgr}/s_lock.c | 2 +-
src/backend/storage/{ipc => lmgr}/spin.c | 2 +-
5 files changed, 14 insertions(+), 15 deletions(-)
rename src/backend/storage/{buffer => lmgr}/s_lock.c (98%)
rename src/backend/storage/{ipc => lmgr}/spin.c (98%)
diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile
index 54bf25e1377..217f2eafb3c 100644
--- a/src/backend/storage/buffer/Makefile
+++ b/src/backend/storage/buffer/Makefile
@@ -4,7 +4,7 @@
# Makefile for storage/buffer
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.15 2000/08/31 16:10:30 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.16 2001/09/27 19:10:02 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -12,7 +12,7 @@ subdir = src/backend/storage/buffer
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
-OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o
+OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o
all: SUBSYS.o
@@ -23,11 +23,7 @@ depend dep:
$(CC) -MM $(CFLAGS) *.c >depend
clean:
- rm -f SUBSYS.o $(OBJS) s_lock_test
-
-s_lock_test: s_lock.c
- $(CC) $(CFLAGS) -DS_LOCK_TEST=1 s_lock.c -o s_lock_test
- ./s_lock_test
+ rm -f SUBSYS.o $(OBJS)
ifeq (depend,$(wildcard depend))
include depend
diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile
index 44c9744b587..585ae7f6eff 100644
--- a/src/backend/storage/ipc/Makefile
+++ b/src/backend/storage/ipc/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for storage/ipc
#
-# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.15 2000/10/20 21:03:47 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.16 2001/09/27 19:10:02 tgl Exp $
#
subdir = src/backend/storage/ipc
@@ -15,8 +15,7 @@ override CFLAGS+= -fno-inline
endif
endif
-OBJS = ipc.o ipci.o shmem.o shmqueue.o sinval.o \
- sinvaladt.o spin.o
+OBJS = ipc.o ipci.o shmem.o shmqueue.o sinval.o sinvaladt.o
all: SUBSYS.o
diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile
index 37cf81b1aa7..bab933c8422 100644
--- a/src/backend/storage/lmgr/Makefile
+++ b/src/backend/storage/lmgr/Makefile
@@ -4,7 +4,7 @@
# Makefile for storage/lmgr
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.15 2001/01/25 03:31:16 tgl Exp $
+# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.16 2001/09/27 19:10:02 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -12,18 +12,22 @@ subdir = src/backend/storage/lmgr
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
-OBJS = lmgr.o lock.o proc.o deadlock.o
+OBJS = lmgr.o lock.o proc.o deadlock.o spin.o s_lock.o
all: SUBSYS.o
SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+s_lock_test: s_lock.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DS_LOCK_TEST=1 s_lock.c -o s_lock_test
+ ./s_lock_test
+
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend
clean:
- rm -f SUBSYS.o $(OBJS)
+ rm -f SUBSYS.o $(OBJS) s_lock_test
ifeq (depend,$(wildcard depend))
include depend
diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/lmgr/s_lock.c
similarity index 98%
rename from src/backend/storage/buffer/s_lock.c
rename to src/backend/storage/lmgr/s_lock.c
index f0bfbaa71f1..6dc38b5955c 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.38 2001/08/29 11:54:12 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.1 2001/09/27 19:10:02 tgl Exp $
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/lmgr/spin.c
similarity index 98%
rename from src/backend/storage/ipc/spin.c
rename to src/backend/storage/lmgr/spin.c
index 05bf5acbbb3..a1284cbbcae 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/lmgr/spin.c
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.33 2001/06/27 23:31:39 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.1 2001/09/27 19:10:02 tgl Exp $
*
*-------------------------------------------------------------------------
*/
--
GitLab