You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/08/02 04:59:30 UTC
[4/9] git commit: TS-2977: apply library naming conventions to
librecords
TS-2977: apply library naming conventions to librecords
Everywhere else "foo_lm.a" is the local manager variant, and "foo_p.a"
is the process manager variant. Make librecords follow the same
pattern.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/73865831
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/73865831
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/73865831
Branch: refs/heads/master
Commit: 7386583197067f7a64de8f39bf0f10a59516c8fd
Parents: 93f46af
Author: James Peach <jp...@apache.org>
Authored: Thu Jul 31 10:52:32 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Aug 1 19:55:45 2014 -0700
----------------------------------------------------------------------
cmd/traffic_cop/Makefile.am | 2 +-
cmd/traffic_manager/Makefile.am | 4 +--
iocore/aio/Makefile.am | 2 +-
iocore/eventsystem/Makefile.am | 2 +-
lib/records/Makefile.am | 62 ++++++++++++------------------------
lib/records/RecProcess.cc | 2 +-
lib/records/test_RecProcess.i | 2 +-
proxy/Makefile.am | 10 +++---
8 files changed, 33 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/73865831/cmd/traffic_cop/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am
index 653d4e7..cd7085b 100644
--- a/cmd/traffic_cop/Makefile.am
+++ b/cmd/traffic_cop/Makefile.am
@@ -36,5 +36,5 @@ traffic_cop_LDADD = \
$(top_builddir)/mgmt/api/libtsmgmtshare.la \
$(top_builddir)/mgmt/api/libtsmgmt.la \
$(top_builddir)/lib/ts/libtsutil.la \
- $(top_builddir)/lib/records/librec4cop.a \
+ $(top_builddir)/lib/records/librecords_cop.a \
@LIBRESOLV@ @OPENSSL_LIBS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/73865831/cmd/traffic_manager/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index 3b65181..1bb5614 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -32,7 +32,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/lib \
-I$(top_builddir)/lib
-#
+
traffic_manager_SOURCES = \
AddConfigFilesHere.cc \
Main.cc \
@@ -48,7 +48,7 @@ traffic_manager_LDADD = \
$(top_builddir)/mgmt/api/libtsmgmtshare.la \
$(top_builddir)/mgmt/utils/libutils_lm.a \
$(top_builddir)/proxy/hdrs/libhdrs.a \
- $(top_builddir)/lib/records/libreclocal.a \
+ $(top_builddir)/lib/records/librecords_lm.a \
$(top_builddir)/lib/ts/libtsutil.la \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/proxy/shared/liberror.a \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/73865831/iocore/aio/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index db25e37..51adaa2 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -50,7 +50,7 @@ test_AIO_CXXFLAGS = \
test_AIO_LDADD = \
libinkaio.a \
- $(top_builddir)/lib/records/librecprocess.a \
+ $(top_builddir)/lib/records/librecords_p.a \
$(top_builddir)/mgmt/libmgmt_p.a \
$(top_builddir)/mgmt/utils/libutils_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/73865831/iocore/eventsystem/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index cfa77e1..ce1a432 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -84,7 +84,7 @@ test_CXXFLAGS = \
test_LDADD = \
libinkevent.a \
- $(top_builddir)/lib/records/librecprocess.a \
+ $(top_builddir)/lib/records/librecords_p.a \
$(top_builddir)/mgmt/libmgmt_p.a \
$(top_builddir)/mgmt/utils/libutils_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/73865831/lib/records/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index c291ac2..744194c 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -28,67 +28,47 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/ts
-noinst_LIBRARIES = libreclocal.a librecprocess.a librec4cop.a
+noinst_LIBRARIES = librecords_lm.a librecords_p.a librecords_cop.a
-libreclocal_a_SOURCES = \
+librecords_COMMON = \
I_RecAlarms.h \
I_RecCore.h \
I_RecDefs.h \
I_RecEvents.h \
- I_RecLocal.h \
+ I_RecHttp.h \
I_RecMutex.h \
I_RecSignals.h \
- P_RecFile.h \
- P_RecCore.h \
P_RecCore.cc \
+ P_RecCore.h \
P_RecDefs.h \
- P_RecLocal.h \
+ P_RecFile.h \
+ P_RecFile.h \
P_RecMessage.h \
P_RecTree.h \
P_RecUtils.h \
- P_RecFile.h \
- RecFile.cc \
+ RecConfigParse.cc \
RecCore.cc \
- RecLocal.cc \
+ RecDebug.cc \
+ RecFile.cc \
+ RecHttp.cc \
RecMessage.cc \
RecMutex.cc \
RecTree.cc \
- I_RecHttp.h \
- RecHttp.cc \
- RecUtils.cc \
- RecDebug.cc \
- RecConfigParse.cc
+ RecUtils.cc
-librecprocess_a_SOURCES = \
- I_RecAlarms.h \
- I_RecCore.h \
- I_RecDefs.h \
- I_RecEvents.h \
- I_RecMutex.h \
+librecords_lm_a_SOURCES = \
+ $(librecords_COMMON) \
+ I_RecLocal.h \
+ P_RecLocal.h \
+ RecLocal.cc
+
+librecords_p_a_SOURCES = \
+ $(librecords_COMMON) \
I_RecProcess.h \
- I_RecSignals.h \
- P_RecFile.h \
- P_RecCore.h \
- P_RecCore.cc \
- P_RecDefs.h \
- P_RecMessage.h \
P_RecProcess.h \
- P_RecTree.h \
- P_RecUtils.h \
- P_RecFile.h \
- RecFile.cc \
- RecCore.cc \
- RecMessage.cc \
- RecMutex.cc \
- RecProcess.cc \
- RecTree.cc \
- I_RecHttp.h \
- RecHttp.cc \
- RecUtils.cc \
- RecDebug.cc \
- RecConfigParse.cc
+ RecProcess.cc
-librec4cop_a_SOURCES = \
+librecords_cop_a_SOURCES = \
RecConfigParse.cc \
RecFile.cc \
RecDebug.cc
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/73865831/lib/records/RecProcess.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecProcess.cc b/lib/records/RecProcess.cc
index 079cea2..3d39d80 100644
--- a/lib/records/RecProcess.cc
+++ b/lib/records/RecProcess.cc
@@ -47,7 +47,7 @@ static Event *config_update_cont_event;
static Event *sync_cont_event;
//-------------------------------------------------------------------------
-// i_am_the_record_owner, only used for librecprocess.a
+// i_am_the_record_owner, only used for librecords_p.a
//-------------------------------------------------------------------------
bool
i_am_the_record_owner(RecT rec_type)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/73865831/lib/records/test_RecProcess.i
----------------------------------------------------------------------
diff --git a/lib/records/test_RecProcess.i b/lib/records/test_RecProcess.i
index d56353a..efa286b 100644
--- a/lib/records/test_RecProcess.i
+++ b/lib/records/test_RecProcess.i
@@ -1,6 +1,6 @@
/** @file
- A small test and sample program for librecprocess.a
+ A small test and sample program for librecords_p.a
@section license License
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/73865831/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index cb6bcad..2a3d346 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -217,7 +217,7 @@ traffic_server_LDADD = \
$(top_builddir)/iocore/aio/libinkaio.a \
$(top_builddir)/iocore/net/libinknet.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/lib/records/librecprocess.a \
+ $(top_builddir)/lib/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(which_libts) \
@HWLOC_LIBS@ \
@@ -252,7 +252,7 @@ traffic_logcat_LDADD = \
shared/libxml.a \
$(top_builddir)/mgmt/utils/libutils_p.a \
$(top_builddir)/mgmt/libmgmt_p.a \
- $(top_builddir)/lib/records/librecprocess.a \
+ $(top_builddir)/lib/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \
@@ -268,7 +268,7 @@ traffic_logstats_LDADD = \
shared/libxml.a \
$(top_builddir)/mgmt/utils/libutils_p.a \
$(top_builddir)/mgmt/libmgmt_p.a \
- $(top_builddir)/lib/records/librecprocess.a \
+ $(top_builddir)/lib/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \
@@ -328,7 +328,7 @@ traffic_sac_LDADD = \
$(top_builddir)/iocore/aio/libinkaio.a \
$(top_builddir)/iocore/net/libinknet.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/lib/records/librecprocess.a \
+ $(top_builddir)/lib/records/librecords_p.a \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \
@LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm
@@ -340,7 +340,7 @@ endif
test_xml_parser_SOURCES = test_xml_parser.cc
test_xml_parser_LDADD = \
- $(top_builddir)/lib/records/librecprocess.a \
+ $(top_builddir)/lib/records/librecords_p.a \
$(top_builddir)/mgmt/libmgmt_p.a \
$(top_builddir)/mgmt/utils/libutils_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \