You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/05/15 00:08:37 UTC
git commit: TS-1894 madvise() not found on Solaris. And some cleanup.
Updated Branches:
refs/heads/master 8b0fea0ab -> 8135c1fa1
TS-1894 madvise() not found on Solaris. And some cleanup.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8135c1fa
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8135c1fa
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8135c1fa
Branch: refs/heads/master
Commit: 8135c1fa1afd8d86a0d2bff9094fabfc71338f51
Parents: 8b0fea0
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue May 14 16:08:25 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue May 14 16:08:25 2013 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
configure.ac | 5 +++--
lib/ts/ink_config.h.in | 1 -
lib/ts/ink_memory.cc | 4 ++++
proxy/logcat.cc | 2 +-
proxy/logstats.cc | 2 +-
6 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8135c1fa/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8d37def..43a1d14 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
Changes with Apache Traffic Server 3.3.3
+ *) [TS-1894] madvise() not found on Solaris. And some cleanup.
+
*) [TS-1765] Make jtest build more like the rest of the code.
*) [TS-1892] Move msync APIs to ink_memory.h.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8135c1fa/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index c569669..482d299 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1056,12 +1056,13 @@ if test "x${enable_xml}" != "xyes"; then
AC_MSG_ERROR([Need at least one XML library, --with-expat is supported])
fi
-TS_FLAG_FUNCS([clock_gettime kqueue epoll_ctl posix_memalign posix_fadvise posix_fallocate lrand48_r srand48_r port_create])
-TS_FLAG_FUNCS([strlcpy strlcat sysconf getpagesize])
+TS_FLAG_FUNCS([clock_gettime kqueue epoll_ctl posix_memalign posix_fadvise posix_madvise posix_fallocate])
+TS_FLAG_FUNCS([lrand48_r srand48_r port_create strlcpy strlcat sysconf getpagesize])
AC_SUBST(has_clock_gettime)
AC_SUBST(has_posix_memalign)
AC_SUBST(has_posix_fadvise)
+AC_SUBST(has_posix_madvise)
AC_SUBST(has_posix_fallocate)
AC_SUBST(has_lrand48_r)
AC_SUBST(has_srand48_r)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8135c1fa/lib/ts/ink_config.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index 1a89bb2..a2d601f 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -99,7 +99,6 @@
#define TS_HAS_EVENTFD @has_eventfd@
#define TS_HAS_CLOCK_GETTIME @has_clock_gettime@
#define TS_HAS_POSIX_MEMALIGN @has_posix_memalign@
-#define TS_HAS_POSIX_FADVISE @has_posix_fadvise@
#define TS_HAS_LRAND48_R @has_lrand48_r@
#define TS_HAS_SRAND48_R @has_srand48_r@
#define TS_HAS_STRLCPY @has_strlcpy@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8135c1fa/lib/ts/ink_memory.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc
index 64a6b6b..a9e0df1 100644
--- a/lib/ts/ink_memory.cc
+++ b/lib/ts/ink_memory.cc
@@ -200,7 +200,11 @@ ats_madvise(caddr_t addr, size_t len, int flags)
caddr_t a = (caddr_t) (((uintptr_t) addr) & ~(pagesize - 1));
size_t l = (len + (addr - a) + pagesize - 1) & ~(pagesize - 1);
int res = 0;
+#if HAVE_POSIX_MADVISE
+ res = posix_madvise(a, l, flags);
+#else
res = madvise(a, l, flags);
+#endif
return res;
#endif
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8135c1fa/proxy/logcat.cc
----------------------------------------------------------------------
diff --git a/proxy/logcat.cc b/proxy/logcat.cc
index fe9bd3e..1d30504 100644
--- a/proxy/logcat.cc
+++ b/proxy/logcat.cc
@@ -293,7 +293,7 @@ main(int /* argc ATS_UNUSED */, char *argv[])
perror(0);
error = DATA_PROCESSING_ERROR;
} else {
-#if TS_HAS_POSIX_FADVISE
+#if HAVE_POSIX_FADVISE
posix_fadvise(in_fd, 0, 0, POSIX_FADV_DONTNEED);
#endif
if (auto_filenames) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8135c1fa/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index dc5815a..d61faaf 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -2230,7 +2230,7 @@ open_main_log(ExitStatus& status)
status.append(" squid.blog not enabled");
return -1;
}
-#if TS_HAS_POSIX_FADVISE
+#if HAVE_POSIX_FADVISE
posix_fadvise(main_fd, 0, 0, POSIX_FADV_DONTNEED);
#endif
return main_fd;