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 2016/06/20 03:52:42 UTC
[trafficserver] branch master updated: TS-4563: Make the LuaJIT
build unconditional.
This is an automated email from the ASF dual-hosted git repository.
jpeach pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 7c20bde TS-4563: Make the LuaJIT build unconditional.
7c20bde is described below
commit 7c20bde5bdb383bb19e2b1fe0ac1e21472683c2a
Author: James Peach <jp...@apache.org>
AuthorDate: Sat Jun 18 19:44:49 2016 -0700
TS-4563: Make the LuaJIT build unconditional.
This closes #722.
---
cmd/traffic_manager/Makefile.am | 2 --
cmd/traffic_manager/metrics.h | 25 -------------------------
cmd/traffic_manager/traffic_manager.cc | 14 --------------
configure.ac | 14 --------------
lib/Makefile.am | 2 --
lib/bindings/Makefile.am | 4 ----
lib/ts/ink_config.h.in | 1 -
plugins/experimental/Makefile.am | 19 ++++++++-----------
proxy/Makefile.am | 10 ++++------
9 files changed, 12 insertions(+), 79 deletions(-)
diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index c92b788..32831f5 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -66,7 +66,6 @@ traffic_manager_LDADD = \
$(top_builddir)/proxy/shared/liberror.a \
$(top_builddir)/proxy/shared/libdiagsconfig.a
-if BUILD_LUAJIT
AM_LDFLAGS += \
$(LUAJIT_LDFLAGS)
@@ -76,7 +75,6 @@ traffic_manager_SOURCES += \
traffic_manager_LDADD += \
$(top_builddir)/lib/bindings/libbindings.la \
$(top_builddir)/lib/luajit/src/libluajit.a
-endif
traffic_manager_LDADD +=\
$(LIBUNWIND_LIBS) \
diff --git a/cmd/traffic_manager/metrics.h b/cmd/traffic_manager/metrics.h
index ce9a3ba..4bc97ce 100644
--- a/cmd/traffic_manager/metrics.h
+++ b/cmd/traffic_manager/metrics.h
@@ -24,33 +24,8 @@
#ifndef METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B
#define METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B
-#if TS_USE_LUAJIT
-
bool metrics_binding_initialize(BindingInstance &binding);
void metrics_binding_destroy(BindingInstance &binding);
void metrics_binding_evaluate(BindingInstance &binding);
-#else /* TS_USE_LUAJIT */
-
-struct BindingInstance {
-};
-
-static inline bool
-metrics_binding_initialize(BindingInstance &binding)
-{
- return false;
-}
-
-static inline void
-metrics_binding_destroy(BindingInstance &binding)
-{
-}
-
-static inline void
-metrics_binding_evaluate(BindingInstance &binding)
-{
-}
-
-#endif /* TS_USE_LUAJIT */
-
#endif /* METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B */
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index 16ade5e..6fc8e8e 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -51,10 +51,8 @@
#include "StatProcessor.h"
#include "P_RecLocal.h"
-#if TS_USE_LUAJIT
#include "bindings/bindings.h"
#include "bindings/metrics.h"
-#endif
#include "metrics.h"
@@ -740,18 +738,6 @@ main(int argc, const char **argv)
RecRegisterStatInt(RECT_NODE, "proxy.node.config.restart_required.manager", 0, RECP_NON_PERSISTENT);
RecRegisterStatInt(RECT_NODE, "proxy.node.config.restart_required.cop", 0, RECP_NON_PERSISTENT);
-#if !TS_USE_LUAJIT
- if (enable_lua) {
- static bool warned = false;
- enable_lua = false;
-
- if (!warned) {
- Warning("missing Lua support, disabling Lua derived metrics");
- warned = true;
- }
- }
-#endif
-
if (enable_lua) {
binding = new BindingInstance;
metrics_binding_initialize(*binding);
diff --git a/configure.ac b/configure.ac
index 8e7ed49..07a04c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -488,20 +488,6 @@ AC_MSG_RESULT([$enable_cppapi])
AM_CONDITIONAL([ENABLE_CPPAPI], [ test "x${enable_cppapi}" = "xyes" ])
#
-# Disable LuaJIT? This is a interim option, when Lua becomes part of the core
-# requirements, we will remove this option.
-#
-AC_MSG_CHECKING([whether to disable LuaJIT])
-AC_ARG_ENABLE([luajit],
- [AS_HELP_STRING([--disable-luajit],[turn off LuaJIT])],
- [],
- [enable_luajit="yes"]
-)
-AC_MSG_RESULT([$enable_luajit])
-AM_CONDITIONAL([BUILD_LUAJIT], [ test "x${enable_luajit}" = "xyes" ])
-TS_ARG_ENABLE_VAR([use], [luajit])
-
-#
# Check if we should allow builds on 32-bit platforms
#
AC_MSG_CHECKING([whether to allow 32-bit builds])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 60351d6..e0a0468 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -38,7 +38,6 @@ endif
# Note: The LUA_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
# the -m64 flag. See configure.ac.
#
-if BUILD_LUAJIT
all-local:
@echo "Making all in luajit"
test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
@@ -53,4 +52,3 @@ all-local:
clean-local:
test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"
-endif
diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am
index 3ea6f63..8d0738f 100644
--- a/lib/bindings/Makefile.am
+++ b/lib/bindings/Makefile.am
@@ -24,8 +24,6 @@ AM_CPPFLAGS = \
AM_CXXFLAGS = \
$(LUAJIT_CFLAGS)
-if BUILD_LUAJIT
-
noinst_LTLIBRARIES = libbindings.la
libbindings_la_SOURCES = \
@@ -38,5 +36,3 @@ libbindings_la_SOURCES = \
repl.cc \
repl.h
-endif
-
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index 2996840..02aee01 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -79,7 +79,6 @@
#define TS_USE_TLS_ECKEY @use_tls_eckey@
#define TS_USE_LINUX_NATIVE_AIO @use_linux_native_aio@
#define TS_USE_REMOTE_UNWINDING @use_remote_unwinding@
-#define TS_USE_LUAJIT @use_luajit@
#define TS_USE_SSLV3_CLIENT @use_sslv3_client@
#define TS_HAS_SO_PEERCRED @has_so_peercred@
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index a530a38..7832f6b 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -20,9 +20,9 @@ SUBDIRS = \
background_fetch \
balancer \
buffer_upload \
- cachekey \
- cache_range_requests \
cache_promote \
+ cache_range_requests \
+ cachekey \
collapsed_connection \
collapsed_forwarding \
custom_redirect \
@@ -34,20 +34,21 @@ SUBDIRS = \
header_normalize \
hipes \
inliner \
- metalink \
- multiplexer \
memcache \
memcached_remap \
+ metalink \
+ mp4 \
+ multiplexer \
regex_revalidate \
remap_stats \
s3_auth \
ssl_cert_loader \
sslheaders \
stale_while_revalidate \
+ stream_editor \
+ ts_lua \
url_sig \
- xdebug \
- mp4 \
- stream_editor
+ xdebug
if ENABLE_CPPAPI
if BUILD_WEBP_TRANSFORM_PLUGIN
@@ -59,10 +60,6 @@ if HAS_MYSQL
SUBDIRS += mysql_remap
endif
-if BUILD_LUAJIT
- SUBDIRS += ts_lua
-endif
-
if HAS_KYOTOCABINET
SUBDIRS += cache_key_genid
endif
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 75458f6..eb3ccc7 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -239,13 +239,11 @@ traffic_server_LDADD = \
@OPENSSL_LIBS@ \
-lm
-if BUILD_LUAJIT
- traffic_server_LDADD += $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%)
+traffic_server_LDADD += $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%)
- # On Darwin LuaJIT requires magic link options, otherwise it will crash in luaL_openlibs() at startup. See
- # http://luajit.org/install.html.
- traffic_server_LDFLAGS += $(LUAJIT_LDFLAGS)
-endif
+# On Darwin LuaJIT requires magic link options, otherwise it will
+# crash in luaL_openlibs() at startup. See http://luajit.org/install.html.
+traffic_server_LDFLAGS += $(LUAJIT_LDFLAGS)
traffic_logcat_SOURCES = logcat.cc
traffic_logcat_LDADD = \
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].