You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/22 22:34:21 UTC
svn commit: r947331 - in /trafficserver/traffic/trunk: ./ iocore/hostdb/
libinktomi++/ proxy/
Author: mturk
Date: Sat May 22 20:34:21 2010
New Revision: 947331
URL: http://svn.apache.org/viewvc?rev=947331&view=rev
Log:
TS-366: Use ATS_HAS_FUNCTION defined as 1 or 0 instead HAVE_FUNCTION define
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc
trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
trafficserver/traffic/trunk/libinktomi++/ink_memory.cc
trafficserver/traffic/trunk/libinktomi++/ink_string.cc
trafficserver/traffic/trunk/libinktomi++/ink_string.h
trafficserver/traffic/trunk/proxy/logcat.cc
trafficserver/traffic/trunk/proxy/logstats.cc
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Sat May 22 20:34:21 2010
@@ -682,9 +682,16 @@ AC_SUBST(sqlite3h)
AC_SUBST(db_185h)
AC_SUBST(dbh)
-ATS_FLAG_FUNCS([clock_gettime kqueue epoll_ctl posix_memalign lrand48_r srand48_r port_create])
+ATS_FLAG_FUNCS([clock_gettime kqueue epoll_ctl posix_memalign posix_fadvise lrand48_r srand48_r port_create])
ATS_FLAG_FUNCS([strndup])
+AC_SUBST(has_clock_gettime)
+AC_SUBST(has_posix_memalign)
+AC_SUBST(has_posix_fadvise)
+AC_SUBST(has_lrand48_r)
+AC_SUBST(has_srand48_r)
+AC_SUBST(has_strndup)
+
has_eventfd=0
AS_IF([test "x$enable_eventfd" = "xyes"],
[ATS_FLAG_FUNCS([eventfd])]
Modified: trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc Sat May 22 20:34:21 2010
@@ -2268,7 +2268,7 @@ struct HostDBTestReverse:Continuation
{
int outstanding;
int total;
-#ifdef HAVE_LRAND48_R
+#if ATS_HAVE_LRAND48_R
struct drand48_data dr;
#endif
@@ -2283,10 +2283,10 @@ struct HostDBTestReverse:Continuation
while (outstanding < HOSTDB_TEST_MAX_OUTSTANDING && total < HOSTDB_TEST_LENGTH)
{
long l = 0;
-#ifndef HAVE_LRAND48_R
- l = lrand48();
-#else
+#if ATS_HAVE_LRAND48_R
lrand48_r(&dr, &l);
+#else
+ l = lrand48();
#endif
unsigned int ip = (unsigned int) l;
outstanding++;
@@ -2303,10 +2303,10 @@ struct HostDBTestReverse:Continuation
}
HostDBTestReverse():Continuation(new_ProxyMutex()), outstanding(0), total(0) {
SET_HANDLER((HostDBTestReverseHandler) & HostDBTestReverse::mainEvent);
-#ifndef HAVE_SRAND48_R
- srand48(time(NULL));
-#else
+#if ATS_HAVE_SRAND48_R
srand48_r(time(NULL), &dr);
+#else
+ srand48(time(NULL));
#endif
}
};
Modified: trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_config.h.in?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Sat May 22 20:34:21 2010
@@ -92,6 +92,13 @@
/* Features */
#define ATS_HAS_EVENTFD @has_eventfd@
+#define ATS_HAS_CLOCK_GETTIME @has_clock_gettime@
+#define ATS_HAS_POSIX_MEMALIGN @has_posix_memalign@
+#define ATS_HAS_POSIX_FADVISE @has_posix_fadvise@
+#define ATS_HAS_LRAND48_R @has_lrand48_r@
+#define ATS_HAS_SRAND48_R @has_srand48_r@
+#define ATS_HAS_STRNDUP @has_strndup@
+
#define ATS_HAS_BACKTRACE @has_backtrace@
#define ATS_HAS_PROFILER @has_profiler@
#define ATS_USE_DIAGS @use_diags@
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.cc?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc Sat May 22 20:34:21 2010
@@ -201,7 +201,7 @@ init_hrtime_basis()
#endif
do {
t1 = ink_get_hrtime_internal();
-#ifdef HAVE_CLOCK_GETTIME
+#if ATS_HAS_CLOCK_GETTIME
ink_assert(!clock_gettime(CLOCK_REALTIME, ×pec_basis));
#else
{
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.h?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h Sat May 22 20:34:21 2010
@@ -265,7 +265,7 @@ ink_get_based_hrtime_internal()
{
#if defined(USE_TIME_STAMP_COUNTER_HRTIME)
return hrtime_offset + ink_get_hrtime_internal();
-#elif !defined(HAVE_CLOCK_GETTIME)
+#elif !ATS_HAS_CLOCK_GETTIME
timeval tv;
gettimeofday(&tv, NULL);
return (tv.tv_sec * HRTIME_SECOND + tv.tv_usec * HRTIME_USECOND);
Modified: trafficserver/traffic/trunk/libinktomi++/ink_memory.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_memory.cc?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_memory.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_memory.cc Sat May 22 20:34:21 2010
@@ -264,7 +264,7 @@ ink_memalign(size_t alignment, size_t si
void *ptr;
-#ifdef HAVE_POSIX_MEMALIGN
+#if ATS_HAS_POSIX_MEMALIGN
if (alignment <= 8)
return ink_malloc(size);
Modified: trafficserver/traffic/trunk/libinktomi++/ink_string.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_string.cc?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string.cc Sat May 22 20:34:21 2010
@@ -391,7 +391,7 @@ ink_string_mjoin(int nstrings, ...)
return ns;
}
-#if !defined(HAVE_STRNDUP)
+#if !ATS_HAS_STRNDUP
char *
ink_strndup(const char *str, size_t n)
{
Modified: trafficserver/traffic/trunk/libinktomi++/ink_string.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_string.h?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string.h Sat May 22 20:34:21 2010
@@ -76,7 +76,7 @@ char *ink_string_mcopy(char *source);
char *ink_string_mjoin(int nstrings, ...);
/* Missing fcns */
-#ifdef HAVE_STRNDUP
+#if ATS_HAS_STRNDUP
#define ink_strndup strndup
#else
char *ink_strndup(const char *str, size_t n);
Modified: trafficserver/traffic/trunk/proxy/logcat.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logcat.cc?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logcat.cc (original)
+++ trafficserver/traffic/trunk/proxy/logcat.cc Sat May 22 20:34:21 2010
@@ -305,7 +305,7 @@ main(int argc, char *argv[])
perror(0);
error = DATA_PROCESSING_ERROR;
} else {
-#ifdef HAVE_POSIX_FADVISE
+#if ATS_HAS_POSIX_FADVISE
posix_fadvise(in_fd, 0, 0, POSIX_FADV_DONTNEED);
#endif
if (auto_filenames) {
Modified: trafficserver/traffic/trunk/proxy/logstats.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logstats.cc?rev=947331&r1=947330&r2=947331&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logstats.cc (original)
+++ trafficserver/traffic/trunk/proxy/logstats.cc Sat May 22 20:34:21 2010
@@ -1741,7 +1741,7 @@ open_main_log(char *ymon_notice, const s
strncat(ymon_notice, " squid.blog not enabled", ymon_notice_size - strlen(ymon_notice) - 1);
return -1;
}
-#ifdef HAVE_POSIX_FADVISE
+#if ATS_HAS_POSIX_FADVISE
posix_fadvise(main_fd, 0, 0, POSIX_FADV_DONTNEED);
#endif
return main_fd;