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 15:51:14 UTC
svn commit: r947296 [1/2] - in /trafficserver/traffic/trunk: ./ iocore/aio/
iocore/block-cache/ iocore/cache/ iocore/cluster/ iocore/dns/
iocore/eventsystem/ iocore/fastio/include/ iocore/fastio/libfastIO/
iocore/fastio/tools/NewUdpSend/ iocore/hostdb/...
Author: mturk
Date: Sat May 22 13:51:11 2010
New Revision: 947296
URL: http://svn.apache.org/viewvc?rev=947296&view=rev
Log:
TS-366: Axe HOST_OS by running the automated script
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/aio/test_AIO.i
trafficserver/traffic/trunk/iocore/block-cache/diags.i
trafficserver/traffic/trunk/iocore/cache/Store.cc
trafficserver/traffic/trunk/iocore/cache/test_Cache.i
trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc
trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc
trafficserver/traffic/trunk/iocore/dns/DNS.cc
trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
trafficserver/traffic/trunk/iocore/dns/test_I_DNS.cc
trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc
trafficserver/traffic/trunk/iocore/eventsystem/test_Buffer.cc
trafficserver/traffic/trunk/iocore/eventsystem/test_Event.i
trafficserver/traffic/trunk/iocore/fastio/include/IncludeFiles.h
trafficserver/traffic/trunk/iocore/fastio/include/fastio.h
trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h
trafficserver/traffic/trunk/iocore/fastio/tools/NewUdpSend/UdpSend.c
trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc
trafficserver/traffic/trunk/iocore/hostdb/test_I_HostDB.cc
trafficserver/traffic/trunk/iocore/net/Connection.cc
trafficserver/traffic/trunk/iocore/net/I_NetConfig.h
trafficserver/traffic/trunk/iocore/net/P_LibBulkIO.h
trafficserver/traffic/trunk/iocore/net/P_Net.h
trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
trafficserver/traffic/trunk/iocore/net/UnixNet.cc
trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
trafficserver/traffic/trunk/iocore/net/test_I_Net.cc
trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc
trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc
trafficserver/traffic/trunk/iocore/utils/diags.i
trafficserver/traffic/trunk/libinktomi++/Compatability.h
trafficserver/traffic/trunk/libinktomi++/Diags.cc
trafficserver/traffic/trunk/libinktomi++/InkTime.h
trafficserver/traffic/trunk/libinktomi++/ink_atomic.h
trafficserver/traffic/trunk/libinktomi++/ink_bool.h
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
trafficserver/traffic/trunk/libinktomi++/ink_defs.cc
trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc
trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
trafficserver/traffic/trunk/libinktomi++/ink_inet.cc
trafficserver/traffic/trunk/libinktomi++/ink_killall.cc
trafficserver/traffic/trunk/libinktomi++/ink_killall.h
trafficserver/traffic/trunk/libinktomi++/ink_llqueue.h
trafficserver/traffic/trunk/libinktomi++/ink_memory.cc
trafficserver/traffic/trunk/libinktomi++/ink_mutex.h
trafficserver/traffic/trunk/libinktomi++/ink_platform.h
trafficserver/traffic/trunk/libinktomi++/ink_port.h
trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc
trafficserver/traffic/trunk/libinktomi++/ink_resolver.h
trafficserver/traffic/trunk/libinktomi++/ink_resource.cc
trafficserver/traffic/trunk/libinktomi++/ink_string.cc
trafficserver/traffic/trunk/libinktomi++/ink_thread.h
trafficserver/traffic/trunk/libinktomi++/llqueue.cc
trafficserver/traffic/trunk/libinktomi++/llqueue.h
trafficserver/traffic/trunk/libinktomi++/lockfile.cc
trafficserver/traffic/trunk/libinktomi++/test_atomic.cc
trafficserver/traffic/trunk/proxy/CoreUtils.cc
trafficserver/traffic/trunk/proxy/CoreUtils.h
trafficserver/traffic/trunk/proxy/ICP.cc
trafficserver/traffic/trunk/proxy/Initialize.cc
trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/Plugin.cc
trafficserver/traffic/trunk/proxy/StatSystem.h
trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
trafficserver/traffic/trunk/proxy/logging/LogBuffer.h
trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
trafficserver/traffic/trunk/proxy/logging/LogFile.cc
trafficserver/traffic/trunk/proxy/logging/LogFormat.cc
trafficserver/traffic/trunk/proxy/logging/LogFormatType.h
trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc
trafficserver/traffic/trunk/proxy/logging/LogUtils.cc
trafficserver/traffic/trunk/proxy/logstats.cc
trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc
trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_scriptpaths.h
trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc
trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc
trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.h
trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.h
trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/ShmemClean.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.h
trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSocket.h
trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h
trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
trafficserver/traffic/trunk/proxy/signals.cc
trafficserver/traffic/trunk/test/SDKtest/client/Plugin.cc
trafficserver/traffic/trunk/test/SDKtest/synth_server/synth_server.c
trafficserver/traffic/trunk/test/deft/remote_start.cc
trafficserver/traffic/trunk/test/deft/sio_loop.h
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Sat May 22 13:51:11 2010
@@ -550,25 +550,24 @@ ATS_ADDTO(CPPFLAGS, [-D_REENTRANT])
case $host_os in
linux*)
EXTRA_CXX_LDFLAGS="-rdynamic"
- HOST_OS=linux
+ host_os_def=linux
;;
darwin*)
- HOST_OS=darwin
+ host_os_def=darwin
;;
freebsd*)
EXTRA_CXX_LDFLAGS="-rdynamic"
- HOST_OS=freebsd
+ host_os_def=freebsd
;;
solaris*)
- HOST_OS=solaris
+ host_os_def=solaris
;;
*)
EXTRA_CXX_LDFLAGS="-rdynamic"
- HOST_OS=unknown
+ host_os_def=unknown
;;
esac
-ATS_ADDTO(CPPFLAGS, [-D$HOST_OS])
-AC_SUBST(HOST_OS)
+ATS_ADDTO(CPPFLAGS, [-D$host_os_def])
#
# _Here_ is where we go ahead and add the _optimizations_ to already
Modified: trafficserver/traffic/trunk/iocore/aio/test_AIO.i
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/aio/test_AIO.i?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/aio/test_AIO.i (original)
+++ trafficserver/traffic/trunk/iocore/aio/test_AIO.i Sat May 22 13:51:11 2010
@@ -80,7 +80,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/block-cache/diags.i
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/block-cache/diags.i?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/block-cache/diags.i (original)
+++ trafficserver/traffic/trunk/iocore/block-cache/diags.i Sat May 22 13:51:11 2010
@@ -84,7 +84,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/cache/Store.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Store.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Store.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Store.cc Sat May 22 13:51:11 2010
@@ -435,18 +435,18 @@ Store::write_config_data(int fd)
-#if (HOST_OS == freebsd) || (HOST_OS == darwin) || (HOST_OS == solaris)
+#if defined(freebsd) || defined(darwin) || defined(solaris)
#include <ctype.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/mount.h>
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
#include <sys/disklabel.h>
//#include <sys/diskslice.h>
-#elif (HOST_OS == darwin)
+#elif defined(darwin)
#include <sys/disk.h>
#include <sys/statvfs.h>
-#elif (HOST_OS == solaris)
+#elif defined(solaris)
#include <sys/statfs.h>
#include <sys/statvfs.h>
#endif
@@ -500,7 +500,7 @@ Span::init(char *an, int64 size)
return "unable to open";
}
-#if (HOST_OS == solaris)
+#if defined(solaris)
struct statvfs fs;
if ((ret = fstatvfs(fd, &fs)) < 0) {
Warning("unable to statvfs '%s': %d %d, %s", n, ret, errno, strerror(errno));
@@ -618,7 +618,7 @@ Lfail:
}
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
Modified: trafficserver/traffic/trunk/iocore/cache/test_Cache.i
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/test_Cache.i?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/test_Cache.i (original)
+++ trafficserver/traffic/trunk/iocore/cache/test_Cache.i Sat May 22 13:51:11 2010
@@ -79,7 +79,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Sat May 22 13:51:11 2010
@@ -1097,7 +1097,7 @@ ClusterHandler::startClusterEvent(int ev
// Startup the periodic events to process entries in
// external_incoming_control.
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
int procs_online = 1;
#else
int procs_online = sysconf(_SC_NPROCESSORS_ONLN);
Modified: trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc Sat May 22 13:51:11 2010
@@ -88,7 +88,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc Sat May 22 13:51:11 2010
@@ -88,7 +88,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/dns/DNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/DNS.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/DNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/DNS.cc Sat May 22 13:51:11 2010
@@ -316,7 +316,7 @@ DNSEntry::init(const char *x, int len, i
}
#endif
if (sem_ent) {
-#if (HOST_OS == darwin)
+#if defined(darwin)
static int qnum = 0;
char sname[NAME_MAX];
int retval;
@@ -1011,7 +1011,7 @@ DNSProcessor::getby(const char *x, int l
else
e->handleEvent(EVENT_IMMEDIATE, 0);
if (wait) {
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_wait(e->sem);
#else
ink_sem_wait(&e->sem);
@@ -1138,7 +1138,7 @@ DNSEntry::post(DNSHandler * h, HostEnt *
if (sem_ent) {
// If this call was synchronous, post to the semaphore
*sem_ent = ent;
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_post(sem);
#else
ink_sem_post(&sem);
Modified: trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h Sat May 22 13:51:11 2010
@@ -173,7 +173,7 @@ struct DNSEntry:Continuation
HostEnt *result_ent;
HostEnt **sem_ent;
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem *sem;
#else
ink_sem sem;
Modified: trafficserver/traffic/trunk/iocore/dns/test_I_DNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/test_I_DNS.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/test_I_DNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/test_I_DNS.cc Sat May 22 13:51:11 2010
@@ -81,7 +81,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc Sat May 22 13:51:11 2010
@@ -27,11 +27,11 @@
****************************************************************************/
#include "inktomi++.h"
-#if (HOST_OS != linux)
+#if !defined(linux)
#include <sys/filio.h>
#endif
-#if (HOST_OS == solaris)
+#if defined(solaris)
#include <sys/types.h>
#include <sys/mman.h>
extern "C" int madvise(caddr_t, size_t, int); // FIXME: why is this not being found
@@ -85,7 +85,7 @@ safe_msync(caddr_t addr, size_t len, cad
& ~(socketManager.pagesize - 1);
if ((a + l) > end)
l = end - a; // strict limit
-#if (HOST_OS == linux)
+#if defined(linux)
/* Fix INKqa06500
Under Linux, msync(..., MS_SYNC) calls are painfully slow, even on
non-dirty buffers. This is true as of kernel 2.2.12. We sacrifice
@@ -102,7 +102,7 @@ int
safe_madvise(caddr_t addr, size_t len, caddr_t end, int flags)
{
(void) end;
-#if (HOST_OS == linux)
+#if defined(linux)
(void) addr;
(void) len;
(void) end;
Modified: trafficserver/traffic/trunk/iocore/eventsystem/test_Buffer.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/test_Buffer.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/test_Buffer.cc (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/test_Buffer.cc Sat May 22 13:51:11 2010
@@ -83,7 +83,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_IOCORE_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_IOCORE_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/eventsystem/test_Event.i
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/test_Event.i?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/test_Event.i (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/test_Event.i Sat May 22 13:51:11 2010
@@ -81,7 +81,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/fastio/include/IncludeFiles.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/include/IncludeFiles.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/include/IncludeFiles.h (original)
+++ trafficserver/traffic/trunk/iocore/fastio/include/IncludeFiles.h Sat May 22 13:51:11 2010
@@ -33,25 +33,25 @@
#include <sys/types.h>
-#if (HOST_OS == linux)
+#if defined(linux)
#include <stdint.h>
#endif
-#if (HOST_OS == sunos)
+#if defined(sunos)
#include <sys/inttypes.h>
#endif
#include <sys/socket.h>
#ifndef _KERNEL
-#if (HOST_OS == sunos)
+#if defined(sunos)
#include <thread.h>
#include <synch.h>
#endif
#endif
#include <stropts.h>
-#if (HOST_OS == sunos)
+#if defined(sunos)
#include <sys/stream.h>
#endif
Modified: trafficserver/traffic/trunk/iocore/fastio/include/fastio.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/include/fastio.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/include/fastio.h (original)
+++ trafficserver/traffic/trunk/iocore/fastio/include/fastio.h Sat May 22 13:51:11 2010
@@ -82,7 +82,7 @@
struct fastIO_split_rule
{
struct fastIO_session *splitTo;
-#if (HOST_OS == sunos)
+#if defined(sunos)
/* FIXME: for other platfroms */
queue_t *dst_queue; /*internal use only */
#endif
Modified: trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h (original)
+++ trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h Sat May 22 13:51:11 2010
@@ -40,13 +40,13 @@
#ifndef _KERNEL
-#if (HOST_OS == sunos)
+#if defined(sunos)
#include <thread.h>
#include <synch.h>
#endif
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/types.h>
typedef u_int32_t uint32_t;
#endif
@@ -83,7 +83,7 @@ typedef u_int32_t uint32_t;
uint32_t *flist1;
uint32_t *activefl;
int nextflentry;
-#if (HOST_OS == sunos)
+#if defined(sunos)
/* FIXME: for other platfroms */
mutex_t mem_mutex;
#endif
@@ -107,7 +107,7 @@ typedef u_int32_t uint32_t;
};
-#if (HOST_OS == sunos)
+#if defined(sunos)
/*
* Initialize the fastIO system and create a state cookie
Modified: trafficserver/traffic/trunk/iocore/fastio/tools/NewUdpSend/UdpSend.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/tools/NewUdpSend/UdpSend.c?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/tools/NewUdpSend/UdpSend.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/tools/NewUdpSend/UdpSend.c Sat May 22 13:51:11 2010
@@ -36,7 +36,7 @@
#include <signal.h>
#include <sys/stat.h>
-#if (HOST_OS != freebsd)
+#if !defined(freebsd)
#include <stropts.h>
#endif
Modified: trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc Sat May 22 13:51:11 2010
@@ -426,7 +426,7 @@ MultiCacheBase::mmap_data(bool private_f
int fd = -1;
// find a good address to start
-#if (HOST_OS != darwin)
+#if !defined(darwin)
fd = socketManager.open("/dev/zero", O_RDONLY, 0645);
if (fd < 0) {
Warning("unable to open /dev/zero: %d, %s", errno, strerror(errno));
@@ -435,14 +435,14 @@ MultiCacheBase::mmap_data(bool private_f
#endif
// lots of useless stuff
-#if (HOST_OS == darwin)
+#if defined(darwin)
cur = (char *) mmap(0, totalsize, PROT_READ, MAP_SHARED_MAP_NORESERVE | MAP_ANON, -1, 0);
#else
cur = (char *) mmap(0, totalsize, PROT_READ, MAP_SHARED_MAP_NORESERVE, fd, 0);
#endif
if (cur == NULL || cur == (caddr_t) MAP_FAILED) {
store = saved;
-#if (HOST_OS == darwin)
+#if defined(darwin)
Warning("unable to mmap anonymous region for %u bytes: %d, %s", totalsize, errno, strerror(errno));
#else
Warning("unable to mmap /dev/zero for %u bytes: %d, %s", totalsize, errno, strerror(errno));
@@ -452,7 +452,7 @@ MultiCacheBase::mmap_data(bool private_f
}
if (munmap(cur, totalsize)) {
store = saved;
-#if (HOST_OS == darwin)
+#if defined(darwin)
Warning("unable to munmap anonymous region for %u bytes: %d, %s", totalsize, errno, strerror(errno));
#else
Warning("unable to munmap /dev/zero for %u bytes: %d, %s", totalsize, errno, strerror(errno));
@@ -483,7 +483,7 @@ MultiCacheBase::mmap_data(bool private_f
mapped_header = (MultiCacheHeader *) cur;
if (!mmap_region(1, fds, cur, private_flag, fd))
goto Labort;
-#if (HOST_OS != darwin)
+#if !defined(darwin)
ink_assert(!socketManager.close(fd));
#endif
store = saved;
Modified: trafficserver/traffic/trunk/iocore/hostdb/test_I_HostDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/test_I_HostDB.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/test_I_HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/test_I_HostDB.cc Sat May 22 13:51:11 2010
@@ -81,7 +81,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/net/Connection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Connection.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Connection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/Connection.cc Sat May 22 13:51:11 2010
@@ -353,7 +353,7 @@ Server::setup_fd_for_listen(bool non_blo
goto Lerror;
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
if (NetProcessor::accept_mss > 0)
if ((res = safe_setsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, (char *) &NetProcessor::accept_mss, sizeof(int)) < 0))
goto Lerror;
@@ -473,7 +473,7 @@ Server::listen(int port_number, bool non
goto Lerror;
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
if (NetProcessor::accept_mss > 0)
if ((res = safe_setsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, (char *) &NetProcessor::accept_mss, sizeof(int))) < 0)
goto Lerror;
Modified: trafficserver/traffic/trunk/iocore/net/I_NetConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_NetConfig.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_NetConfig.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_NetConfig.h Sat May 22 13:51:11 2010
@@ -29,7 +29,7 @@
* net sub system.
* For the default values look at NetConfig.cc
*/
-#if (HOST_OS == solaris)
+#if defined(solaris)
#define DEFAULT_POLL_TIMEOUT 30 /* mseconds */
#else
#define DEFAULT_POLL_TIMEOUT 10 /* mseconds */
Modified: trafficserver/traffic/trunk/iocore/net/P_LibBulkIO.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_LibBulkIO.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_LibBulkIO.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_LibBulkIO.h Sat May 22 13:51:11 2010
@@ -25,7 +25,7 @@
#ifndef _LIB_BULK_IO_H
#define _LIB_BULK_IO_H
-#if (HOST_OS == solaris)
+#if defined(solaris)
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
Modified: trafficserver/traffic/trunk/iocore/net/P_Net.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_Net.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_Net.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_Net.h Sat May 22 13:51:11 2010
@@ -130,7 +130,7 @@ do { \
NET_SYSTEM_MODULE_MINOR_VERSION, \
PRIVATE_MODULE_HEADER)
// libev backend flags
-#if (HOST_OS == solaris)
+#if defined(solaris)
#define LIBEV_BACKEND_LIST (EVBACKEND_POLL | EVBACKEND_SELECT) // Level-Triggered
#else
#define LIBEV_BACKEND_LIST 0 /* auto */
Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNet.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNet.h Sat May 22 13:51:11 2010
@@ -410,7 +410,7 @@ accept_error_seriousness(int res)
return 1;
case -EMFILE:
case -ENOMEM:
-#if (HOST_OS != freebsd)
+#if !defined(freebsd)
case -ENOSR:
#endif
ink_assert(!"throttling misconfigured: set too high");
@@ -424,7 +424,7 @@ accept_error_seriousness(int res)
case -EINTR:
ink_assert(!"should be handled at a lower level");
return 0;
-#if (HOST_OS != freebsd)
+#if !defined(freebsd)
case -EPROTO:
#endif
case -EOPNOTSUPP:
@@ -443,7 +443,7 @@ check_transient_accept_error(int res)
if (!last_transient_accept_error || t - last_transient_accept_error > TRANSIENT_ACCEPT_ERROR_MESSAGE_EVERY) {
last_transient_accept_error = t;
Warning("accept thread received transient error: errno = %d", -res);
-#if (HOST_OS == linux)
+#if defined(linux)
if (res == -ENOBUFS || res == -ENFILE)
Warning("errno : %d consider a memory upgrade", -res);
#endif
Modified: trafficserver/traffic/trunk/iocore/net/UnixNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNet.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNet.cc Sat May 22 13:51:11 2010
@@ -412,7 +412,7 @@ NetHandler::mainNetEvent(int event, Even
vc->net_read_io(this, trigger_event->ethread);
else if (!vc->read.enabled) {
read_ready_list.remove(vc);
-#if (HOST_OS == solaris)
+#if defined(solaris)
if (vc->read.triggered && vc->write.enabled) {
vc->ep.modify(-EVENTIO_READ);
vc->ep.refresh(EVENTIO_WRITE);
@@ -432,7 +432,7 @@ NetHandler::mainNetEvent(int event, Even
write_to_net(this, vc, pd, trigger_event->ethread);
else if (!vc->write.enabled) {
write_ready_list.remove(vc);
-#if (HOST_OS == solaris)
+#if defined(solaris)
if (vc->write.triggered && vc->read.enabled) {
vc->ep.modify(-EVENTIO_WRITE);
vc->ep.refresh(EVENTIO_READ);
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc Sat May 22 13:51:11 2010
@@ -451,7 +451,7 @@ NetAccept::acceptFastEvent(int event, vo
if (res < 0) {
res = -errno;
if (res == -EAGAIN || res == -ECONNABORTED
-#if (HOST_OS == linux)
+#if defined(linux)
|| res == -EPIPE
#endif
) {
Modified: trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc Sat May 22 13:51:11 2010
@@ -39,7 +39,7 @@ inkcoreapi ClassAllocator<UDPWorkContinu
EventType ET_UDP;
-#if (HOST_OS == linux) && !defined(DEBUG)
+#if defined(linux) && !defined(DEBUG)
#define NODIAGS
#endif
@@ -1084,7 +1084,7 @@ UDPQueue::SendUDPPacket(UDPPacketInterna
}
Debug("udp-send", "Sending 0x%x", p);
-#if (HOST_OS != solaris)
+#if !defined(solaris)
msg.msg_control = 0;
msg.msg_controllen = 0;
msg.msg_flags = 0;
Modified: trafficserver/traffic/trunk/iocore/net/test_I_Net.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/test_I_Net.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/test_I_Net.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/test_I_Net.cc Sat May 22 13:51:11 2010
@@ -83,7 +83,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/test_I_UDPNet.cc Sat May 22 13:51:11 2010
@@ -85,7 +85,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_IOCORE_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_IOCORE_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/test_P_UDPNet.cc Sat May 22 13:51:11 2010
@@ -85,7 +85,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_IOCORE_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_IOCORE_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/iocore/utils/diags.i
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/diags.i?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/diags.i (original)
+++ trafficserver/traffic/trunk/iocore/utils/diags.i Sat May 22 13:51:11 2010
@@ -79,7 +79,7 @@ reconfigure_diags()
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/libinktomi++/Compatability.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Compatability.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Compatability.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/Compatability.h Sat May 22 13:51:11 2010
@@ -56,16 +56,16 @@ template<class T> T max(const T a, const
// If you the gethostbyname() routines on your system are automatically
// re-entrent (as in Digital Unix), define the following
//
-#if (HOST_OS == linux)
+#if defined(linux)
#define NEED_ALTZONE_DEFINED
#define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
-#elif (HOST_OS == darwin)
+#elif defined(darwin)
#define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
#else
#define MAP_SHARED_MAP_NORESERVE (MAP_SHARED | MAP_NORESERVE)
#endif
-#if (HOST_OS == darwin)
+#if defined(darwin)
typedef uint32_t in_addr_t;
#endif
Modified: trafficserver/traffic/trunk/libinktomi++/Diags.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Diags.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Diags.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/Diags.cc Sat May 22 13:51:11 2010
@@ -327,7 +327,7 @@ Diags::print_va(const char *debug_tag, D
}
}
-#if (HOST_OS != freebsd)
+#if !defined(freebsd)
unlock();
#endif
@@ -369,7 +369,7 @@ Diags::print_va(const char *debug_tag, D
vsnprintf(syslog_buffer, sizeof(syslog_buffer) - 1, format_buf, ap);
syslog(priority, "%s", syslog_buffer);
}
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
unlock();
#endif
}
Modified: trafficserver/traffic/trunk/libinktomi++/InkTime.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/InkTime.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/InkTime.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/InkTime.h Sat May 22 13:51:11 2010
@@ -47,7 +47,7 @@ enum
inkcoreapi int ink_gmtime_r(const ink_time_t * clock, struct tm *res);
ink_time_t convert_tm(const struct tm *tp);
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
inline int
ink_timezone()
Modified: trafficserver/traffic/trunk/libinktomi++/ink_atomic.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_atomic.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_atomic.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_atomic.h Sat May 22 13:51:11 2010
@@ -122,7 +122,7 @@ extern "C"
int64 ink_atomic_swap64(pvint64 mem, int64 value);
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
static inline int ink_atomic_cas(pvint32 mem, int old, int new_value)
{
@@ -167,7 +167,7 @@ extern "C"
/* Atomic 64-bit compare and swap
THIS IS NOT DEFINED for x86 */
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
static inline int ink_atomic_cas64(pvint64 az, int64 ax, int64 ay)
{
Modified: trafficserver/traffic/trunk/libinktomi++/ink_bool.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_bool.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_bool.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_bool.h Sat May 22 13:51:11 2010
@@ -39,14 +39,14 @@
#define _ink_bool_h_
-#if (HOST_OS != linux)
+#if !defined(linux)
#if (defined (__GNUC__) || ! defined(__cplusplus))
/*
* bool, true, and false already declared in C++
*/
#if !defined (bool)
-#if (HOST_OS != freebsd) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(solaris)
#define bool int
#endif
#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=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Sat May 22 13:51:11 2010
@@ -38,7 +38,6 @@
#define ATS_VERSION_MINOR @ATS_VERSION_MINOR@
#define ATS_VERSION_MICRO @ATS_VERSION_MICRO@
-#define HOST_OS @HOST_OS@
#define BUILD_MACHINE "@build_machine@"
#define BUILD_PERSON "@build_person@"
#define BUILD_GROUP "@build_group@"
Modified: trafficserver/traffic/trunk/libinktomi++/ink_defs.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_defs.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_defs.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_defs.cc Sat May 22 13:51:11 2010
@@ -31,12 +31,12 @@
#include "inktomi++.h"
#include "ink_unused.h"
#include "ink_platform.h"
-#if (HOST_OS == linux) || (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(linux) || defined(freebsd) || defined(darwin)
#include <sys/types.h>
#include <sys/param.h>
#include <sys/sysctl.h>
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/utsname.h>
#endif /* MAGIC_EDITING_TAG */
@@ -49,7 +49,7 @@ ink_sys_name_release(char *name, int nam
{
*name = 0;
*release = 0;
-#if (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(freebsd) || defined(darwin)
int mib[2];
size_t len = namelen;
mib[0] = CTL_KERN;
@@ -66,7 +66,7 @@ ink_sys_name_release(char *name, int nam
return -1;
return 0;
-#elif (HOST_OS == linux)
+#elif defined(linux)
struct utsname buf;
int n;
@@ -94,7 +94,7 @@ ink_sys_name_release(char *name, int nam
int
ink_number_of_processors()
{
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
int mib[2], n;
mib[0] = CTL_HW;
mib[1] = HW_NCPU;
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc Sat May 22 13:51:11 2010
@@ -31,7 +31,7 @@
#include "ink_hrtime.h"
#include "ink_assert.h"
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
#include <sys/types.h>
#include <sys/param.h>
#include <sys/sysctl.h>
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h Sat May 22 13:51:11 2010
@@ -246,7 +246,7 @@ ink_get_hrtime_internal()
#if defined (NEED_HRTIME)
#if defined (USE_TIME_STAMP_COUNTER_HRTIME)
return get_hrtime_rdtsc();
-#elif (HOST_OS == freebsd)
+#elif defined(freebsd)
timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
return (ts.tv_sec * HRTIME_SECOND + ts.tv_nsec * HRTIME_NSECOND);
Modified: trafficserver/traffic/trunk/libinktomi++/ink_inet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_inet.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_inet.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_inet.cc Sat May 22 13:51:11 2010
@@ -23,7 +23,7 @@
#include "inktomi++.h"
-#if (HOST_OS == darwin)
+#if defined(darwin)
extern "C"
{
struct hostent *gethostbyname_r(const char *name, struct hostent *result, char *buffer, int buflen, int *h_errnop);
Modified: trafficserver/traffic/trunk/libinktomi++/ink_killall.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_killall.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_killall.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_killall.cc Sat May 22 13:51:11 2010
@@ -26,7 +26,7 @@
#include "inktomi++.h"
-#if (HOST_OS == linux)
+#if defined(linux)
#include "ink_killall.h"
#include "ink_resource.h"
Modified: trafficserver/traffic/trunk/libinktomi++/ink_killall.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_killall.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_killall.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_killall.h Sat May 22 13:51:11 2010
@@ -30,7 +30,7 @@
#include "ink_config.h"
-#if (HOST_OS == linux)
+#if defined(linux)
/*-------------------------------------------------------------------------
ink_killall
Modified: trafficserver/traffic/trunk/libinktomi++/ink_llqueue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_llqueue.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_llqueue.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_llqueue.h Sat May 22 13:51:11 2010
@@ -45,7 +45,7 @@ typedef struct llq_s
LLQrec * head, *tail, *free;
unsigned long len, highwater;
ink_mutex mux;
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem *sema;
#else /* !darwin */
ink_sem sema;
Modified: trafficserver/traffic/trunk/libinktomi++/ink_memory.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_memory.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_memory.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_memory.cc Sat May 22 13:51:11 2010
@@ -32,7 +32,7 @@
#include "inktomi++.h"
#include <assert.h>
-#if (HOST_OS == linux)
+#if defined(linux)
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 600
#endif
@@ -299,7 +299,7 @@ ink_memalign(size_t alignment, size_t si
#endif
return (ptr);
#else
-#if (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(freebsd) || defined(darwin)
/*
* DEC malloc calims to align for "any allocatable type",
* and the following code checks that.
Modified: trafficserver/traffic/trunk/libinktomi++/ink_mutex.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_mutex.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_mutex.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_mutex.h Sat May 22 13:51:11 2010
@@ -71,7 +71,7 @@ ink_mutex_init(ink_mutex * m, const char
{
(void) name;
-#if (HOST_OS == solaris)
+#if defined(solaris)
if ( pthread_mutex_init(m, NULL) != 0 ) {
abort();
}
Modified: trafficserver/traffic/trunk/libinktomi++/ink_platform.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_platform.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_platform.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_platform.h Sat May 22 13:51:11 2010
@@ -155,7 +155,7 @@ struct ifafilt;
#include <resolv.h>
-#if (HOST_OS == linux)
+#if defined(linux)
typedef unsigned int in_addr_t;
#endif
@@ -163,7 +163,7 @@ typedef unsigned int in_addr_t;
# include <sys/sysinfo.h>
#endif
-#if (HOST_OS != darwin)
+#if !defined(darwin)
#ifdef HAVE_SYS_SYSCTL_H
# include <sys/sysctl.h>
#endif
Modified: trafficserver/traffic/trunk/libinktomi++/ink_port.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_port.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_port.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_port.h Sat May 22 13:51:11 2010
@@ -69,11 +69,11 @@ typedef unsigned long long uint64;
#endif
#endif
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
#define NO_MEMALIGN
#endif
-#if (HOST_OS == darwin)
+#if defined(darwin)
#define NO_MEMALIGN
#define RENTRENT_GETHOSTBYNAME
#define RENTRENT_GETHOSTBYADDR
Modified: trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_res_init.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc Sat May 22 13:51:11 2010
@@ -90,7 +90,7 @@
#include "ink_string.h"
#include "ink_resolver.h"
-#if (HOST_OS != linux)
+#if !defined(linux)
int inet_aton(register const char *cp, struct in_addr *addr);
#endif
Modified: trafficserver/traffic/trunk/libinktomi++/ink_resolver.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_resolver.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_resolver.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_resolver.h Sat May 22 13:51:11 2010
@@ -260,7 +260,7 @@ int ink_res_init(ink_res_state, unsigned
int ink_res_mkquery(ink_res_state, int, const char *, int, int,
const unsigned char *, int, const unsigned char *, unsigned char *, int);
-#if (HOST_OS != linux)
+#if !defined(linux)
int inet_aton(register const char *cp, struct in_addr *addr);
#endif
Modified: trafficserver/traffic/trunk/libinktomi++/ink_resource.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_resource.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_resource.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_resource.cc Sat May 22 13:51:11 2010
@@ -134,7 +134,7 @@ static int unused = atexit(exit_cb);
unsigned int
res_hash(const char *s)
{
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && !defined(__i386__)
+#if !defined(linux) && !defined(freebsd) && !defined(__i386__)
#define HASH_ONE(h,one) ((h << 3) + (one) + (h >> 29))
#define WORD_HAS_NULLBYTE(w) ((((w) - 0x01010101) ^ (w)) & 0x80808080)
@@ -249,7 +249,7 @@ res_stat(const char *path, int64 value)
}
-#if (HOST_OS == linux) || (HOST_OS == freebsd)
+#if defined(linux) || defined(freebsd)
static const int magic_array_offset = 0;
#else
#error "I do not know about this platform."
Modified: trafficserver/traffic/trunk/libinktomi++/ink_string.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_string.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string.cc Sat May 22 13:51:11 2010
@@ -442,7 +442,7 @@ ink_utf8_to_latin1(const char *in, int i
inbytesleft = inlen;
outbytesleft = *outlen;
-#if (HOST_OS == freebsd) || (HOST_OS == solaris)
+#if defined(freebsd) || defined(solaris)
if (iconv(ic, &in, &inbytesleft, &out, &outbytesleft) == (size_t) - 1)
#else
if (iconv(ic, (char **) &in, &inbytesleft, &out, &outbytesleft) == (size_t) - 1)
Modified: trafficserver/traffic/trunk/libinktomi++/ink_thread.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_thread.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_thread.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_thread.h Sat May 22 13:51:11 2010
@@ -135,7 +135,7 @@ ink_thread_create(void *(*f) (void *), v
static inline void
ink_thread_cancel(ink_thread who)
{
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
(void) who;
ink_assert(!"not supported");
#else
@@ -161,7 +161,7 @@ ink_thread_self()
static inline int
ink_thread_get_priority(ink_thread t, int *priority)
{
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
(void) t;
(void) priority;
ink_assert(!"not supported");
@@ -225,7 +225,7 @@ ink_sem_destroy(ink_sem * sp)
ink_assert(!sem_destroy(sp));
}
-#if (HOST_OS == darwin)
+#if defined(darwin)
static inline ink_sem *
ink_sem_open(const char *name , int oflag, mode_t mode, unsigned int value)
{
@@ -274,7 +274,7 @@ ink_cond_timedwait(ink_cond * cp, ink_mu
{
int err;
while (EINTR == (err = pthread_cond_timedwait(cp, mp, t)));
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
ink_assert((err == 0) || (err == ETIMEDOUT));
#else
ink_assert((err == 0) || (err == ETIME) || (err == ETIMEDOUT));
Modified: trafficserver/traffic/trunk/libinktomi++/llqueue.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/llqueue.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/llqueue.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/llqueue.cc Sat May 22 13:51:11 2010
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
#include <malloc.h>
#endif
#include <assert.h>
@@ -89,7 +89,7 @@ create_queue()
if (!new_val)
return NULL;
-#if (HOST_OS == darwin)
+#if defined(darwin)
static int qnum = 0;
char sname[NAME_MAX];
qnum++;
@@ -150,7 +150,7 @@ enqueue(LLQ * Q, void *data)
if (Q->len > Q->highwater)
Q->highwater = Q->len;
ink_mutex_release(&(Q->mux));
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_post(Q->sema);
#else
ink_sem_post(&(Q->sema));
@@ -221,7 +221,7 @@ dequeue(LLQ * Q)
{
LLQrec * rec;
void *d;
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_wait(Q->sema);
#else
ink_sem_wait(&(Q->sema));
Modified: trafficserver/traffic/trunk/libinktomi++/llqueue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/llqueue.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/llqueue.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/llqueue.h Sat May 22 13:51:11 2010
@@ -45,7 +45,7 @@ typedef struct llq_s
LLQrec * head, *tail, *free;
unsigned long len, highwater;
ink_mutex mux;
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem *sema;
#else /* !darwin */
ink_sem sema;
Modified: trafficserver/traffic/trunk/libinktomi++/lockfile.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/lockfile.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/lockfile.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/lockfile.cc Sat May 22 13:51:11 2010
@@ -25,7 +25,7 @@
#include "ink_platform.h"
#include "ink_lockfile.h"
-#if (HOST_OS == linux)
+#if defined(linux)
#include "ink_killall.h"
#endif
@@ -207,7 +207,7 @@ lockfile_kill_internal(pid_t init_pid, i
{
int err;
-#if (HOST_OS == linux)
+#if defined(linux)
pid_t *pidv;
int pidvcnt;
Modified: trafficserver/traffic/trunk/libinktomi++/test_atomic.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_atomic.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_atomic.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_atomic.cc Sat May 22 13:51:11 2010
@@ -207,7 +207,7 @@ main(int argc, const char *argv[])
pthread_attr_t attr;
pthread_attr_init(&attr);
-#if (HOST_OS != freebsd)
+#if !defined(freebsd)
pthread_attr_setstacksize(&attr, 1024 * 1024);
#endif
ink_assert(pthread_create(&tid, &attr, testalist, (void *) ali) == 0);
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Sat May 22 13:51:11 2010
@@ -122,7 +122,7 @@ lwpTable default_lwpTable = { 0, 0 };
DynArray<struct lwpTable>arrayLwp(&default_lwpTable, 0);
#endif /* sparc */
-#if (HOST_OS == linux)
+#if defined(linux)
#include "CoreUtils.h"
#define __p_type p_type //ugly hack? - see resolv.h
@@ -132,7 +132,7 @@ int framepointer = 0;
int program_counter = 0;
#endif // linux check
-#if (HOST_OS == darwin) || (HOST_OS == freebsd) || (HOST_OS == solaris) // FIXME: solaris x86
+#if defined(darwin) || defined(freebsd) || defined(solaris) // FIXME: solaris x86
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
@@ -454,7 +454,7 @@ CoreUtils::find_stuff(StuffTest_f f)
/* Linux Specific functions */
-#if (HOST_OS == linux)
+#if defined(linux)
// copies stack info for the thread's base frame to the given
// core_stack_state pointer
void
@@ -734,7 +734,7 @@ CoreUtils::process_HttpSM(HttpSM * core_
last_seen_http_sm = core_ptr;
if (is_debug_tag_set("magic")) {
-#if (HOST_OS == linux)
+#if defined(linux)
printf("\n*****match-ALIVE*****\n");
#endif
#if defined(sparc)
@@ -754,7 +754,7 @@ CoreUtils::process_HttpSM(HttpSM * core_
printf("------------------------------------------------\n\n\n");
} else if (http_sm->magic == HTTP_SM_MAGIC_DEAD) {
if (is_debug_tag_set("magic")) {
-#if (HOST_OS == linux)
+#if defined(linux)
printf("\n*****match-DEAD*****\n");
#endif
#if defined(sparc)
@@ -1025,7 +1025,7 @@ CoreUtils::dump_history(HttpSM * hsm)
fileline = (fileline != NULL) ? fileline : xstrdup("UNKNOWN");
-#if (HOST_OS == winnt)
+#if defined(_WIN32)
// Visual C++ preprocessor is unable to stringify __LINE__
// so we have to waste a ton a memory and store it
// as an integer
@@ -1075,7 +1075,7 @@ CoreUtils::process_EThread(EThread * eth
// This is not 64-bit correct. /leif
printf("----------- EThread @ 0x%p ----------\n", eth_test);
-#if (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(freebsd) || defined(darwin)
printf(" thread_id: %p\n", loaded_eth->tid);
#else
printf(" thread_id: %i\n", (int) loaded_eth->tid);
@@ -1455,7 +1455,7 @@ CoreUtils::load_string(const char *addr)
}
// parses core file
-#if (HOST_OS == linux)
+#if defined(linux)
void
process_core(char *fname)
{
@@ -1809,7 +1809,7 @@ process_core(char *fname)
}
#endif /* sparc */
-#if (HOST_OS != linux) && !defined(sparc)
+#if !defined(linux) && !defined(sparc)
void
process_core(char *fname)
{
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.h Sat May 22 13:51:11 2010
@@ -52,7 +52,7 @@ struct core_stack_state
};
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
#include <stdio.h>
#include <sys/procfs.h>
#include <unistd.h>
@@ -82,7 +82,7 @@ struct core_stack_state
};
#endif // linux check
-#if (HOST_OS == darwin) || (HOST_OS == freebsd) || (HOST_OS == solaris) // FIXME: solaris x86
+#if defined(darwin) || defined(freebsd) || defined(solaris) // FIXME: solaris x86
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@@ -196,7 +196,7 @@ public:
* inputs: int threadId, core_stack_state* coress
* outputs: returns the base core_stack_state for the given thread id
**********************************************************************/
-#if (HOST_OS == linux)
+#if defined(linux)
static void get_base_frame(intptr_t framep, core_stack_state * coress);
#endif
Modified: trafficserver/traffic/trunk/proxy/ICP.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICP.cc Sat May 22 13:51:11 2010
@@ -1752,10 +1752,10 @@ ICPRequestCont::BuildICPMsg(ICPopcode_t
mhdr->msg_name = (caddr_t) 0;
mhdr->msg_namelen = 0;
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin) && !defined(solaris)
mhdr->msg_accrights = (caddr_t) 0;
mhdr->msg_accrightslen = 0;
-#elif (HOST_OS != solaris)
+#elif !defined(solaris)
mhdr->msg_control = 0;
mhdr->msg_controllen = 0;
mhdr->msg_flags = 0;
Modified: trafficserver/traffic/trunk/proxy/Initialize.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Initialize.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Initialize.cc (original)
+++ trafficserver/traffic/trunk/proxy/Initialize.cc Sat May 22 13:51:11 2010
@@ -47,7 +47,7 @@ max_out_limit(const char *name, int whic
{
struct rlimit rl;
-#if (HOST_OS == linux)
+#if defined(linux)
# define MAGIC_CAST(x) (enum __rlimit_resource)(x)
#else
# define MAGIC_CAST(x) x
@@ -56,7 +56,7 @@ max_out_limit(const char *name, int whic
if (max_it) {
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != rl.rlim_max) {
-#if (HOST_OS == darwin)
+#if defined(darwin)
if (which == RLIMIT_NOFILE)
rl.rlim_cur = fmin(OPEN_MAX, rl.rlim_max);
else
@@ -145,7 +145,7 @@ init_system_dirs(void)
}
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/prctl.h>
#endif
@@ -170,7 +170,7 @@ set_core_size(const char *name, RecDataT
if (setrlimit(RLIMIT_CORE, &lim) < 0) {
failed = true;
}
-#if (HOST_OS == linux)
+#if defined(linux)
#ifndef PR_SET_DUMPABLE
#define PR_SET_DUMPABLE 4
#endif
@@ -346,7 +346,7 @@ init_system_reconfigure_diags(void)
////////////////////////////////////
// change the diags config values //
////////////////////////////////////
-#if !defined (_WIN32) && !defined(__GNUC__) && (HOST_OS != hpux)
+#if !defined (_WIN32) && !defined(__GNUC__) && !defined(hpux)
diags->config = c;
#else
memcpy(((void *) &diags->config), ((void *) &c), sizeof(DiagsConfigState));
Modified: trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc Sat May 22 13:51:11 2010
@@ -29,7 +29,7 @@
#include "inktomi++.h"
#include "api/ts/InkAPIPrivateIOCore.h"
-#if (HOST_OS == solaris) && !defined(__GNUC__)
+#if defined(solaris) && !defined(__GNUC__)
#include "P_EventSystem.h" // I_EventSystem.h
#include "P_Net.h" // I_Net.h
#else
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Sat May 22 13:51:11 2010
@@ -31,17 +31,17 @@
****************************************************************************/
#include "inktomi++.h"
-#if (HOST_OS != linux)
+#if !defined(linux)
#include <sys/lock.h>
#endif
#include <sys/resource.h>
-#if (HOST_OS == linux)
+#if defined(linux)
extern "C" int plock(int);
#else
#include <sys/filio.h>
#endif
#include <syslog.h>
-#if (HOST_OS != darwin) && (HOST_OS != freebsd) && (HOST_OS != solaris)
+#if !defined(darwin) && !defined(freebsd) && !defined(solaris)
#include <mcheck.h>
#endif
@@ -282,7 +282,7 @@ ArgumentDescription argument_description
{"clear_cache", 'K', "Clear Cache on Startup", "F",
&cacheProcessor.auto_clear_flag, "PROXY_CLEAR_CACHE", NULL},
{"vingid", 'v', "Vingid Flag", "S255", vingid_flag, "PROXY_VINGID", NULL},
-#if (HOST_OS == linux)
+#if defined(linux)
{"read_core", 'c', "Read Core file", "S255",
&core_file, NULL, NULL},
#endif
@@ -314,7 +314,7 @@ max_out_limit(const char *name, int whic
{
struct rlimit rl;
-#if (HOST_OS == linux)
+#if defined(linux)
# define MAGIC_CAST(x) (enum __rlimit_resource)(x)
#else
# define MAGIC_CAST(x) x
@@ -323,7 +323,7 @@ max_out_limit(const char *name, int whic
if (max_it) {
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != rl.rlim_max) {
-#if (HOST_OS == darwin)
+#if defined(darwin)
if (which == RLIMIT_NOFILE)
rl.rlim_cur = fmin(OPEN_MAX, rl.rlim_max);
else
@@ -410,7 +410,7 @@ check_lockfile()
fprintf(stderr, "WARNING: Can't acquire lockfile '%s'", lockfile);
if ((err == 0) && (holding_pid != -1)) {
-#if (HOST_OS == solaris)
+#if defined(solaris)
fprintf(stderr, " (Lock file held by process ID %d)\n", (int)holding_pid);
#else
fprintf(stderr, " (Lock file held by process ID %d)\n", holding_pid);
@@ -1092,7 +1092,7 @@ parse_accept_fd_list()
return accept_array;
}
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/prctl.h>
#endif
@@ -1117,7 +1117,7 @@ set_core_size(const char *name, RecDataT
if (setrlimit(RLIMIT_CORE, &lim) < 0) {
failed = true;
}
-#if (HOST_OS == linux)
+#if defined(linux)
#ifndef PR_SET_DUMPABLE
#define PR_SET_DUMPABLE 4
#endif
@@ -1174,7 +1174,7 @@ init_ink_memalign_heap(void)
static void
adjust_sys_settings(void)
{
-#if (HOST_OS == linux)
+#if defined(linux)
struct rlimit lim;
int mmap_max = -1;
int fds_throttle = -1;
@@ -1613,7 +1613,7 @@ change_uid_gid(const char *user)
{
struct passwd pwbuf;
struct passwd *pwbufp = NULL;
-#if (HOST_OS == freebsd) // TODO: investigate sysconf(_SC_GETPW_R_SIZE_MAX)) failure
+#if defined(freebsd) // TODO: investigate sysconf(_SC_GETPW_R_SIZE_MAX)) failure
long buflen = 1024; // or 4096?
#else
long buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
Modified: trafficserver/traffic/trunk/proxy/Plugin.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Plugin.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Plugin.cc (original)
+++ trafficserver/traffic/trunk/proxy/Plugin.cc Sat May 22 13:51:11 2010
@@ -23,7 +23,7 @@
#include "ink_config.h"
#include <stdio.h>
-#if (HOST_OS == hpux)
+#if defined(hpux)
#include <dl.h>
#endif
#include "ink_platform.h"
Modified: trafficserver/traffic/trunk/proxy/StatSystem.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatSystem.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatSystem.h (original)
+++ trafficserver/traffic/trunk/proxy/StatSystem.h Sat May 22 13:51:11 2010
@@ -153,7 +153,7 @@ typedef enum { \
MAX_HTTP_TRANS_STATS \
} HttpTransactionStat_t;
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
#undef _D
#endif
#define _D(_x) _x,
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Sat May 22 13:51:11 2010
@@ -49,7 +49,7 @@
//#include "HttpAuthParams.h"
#include "congest/Congestion.h"
-#if (HOST_OS == solaris) && !defined(__GNUC__)
+#if defined(solaris) && !defined(__GNUC__)
#include <string>
#endif
@@ -289,7 +289,7 @@ HttpVCTable::cleanup_all()
#define __REMEMBER(x) #x
#define _REMEMBER(x) __REMEMBER(x)
-#if (HOST_OS == winnt)
+#if defined(_WIN32)
// Proper macro expansion is beyond Visual C++
#define RECORD_FILE_LINE() \
history[pos].fileline = __FILE__; \
@@ -1463,7 +1463,7 @@ HttpSM::state_api_callout(int event, voi
if(prev_hook_stats_enabled && prev_hook_start_time) {
INK64 time_in_plugin_ms = (curr_time - prev_hook_start_time)/1000000;
prev_hook_stats.inc(time_in_plugin_ms);
- Debug("http", "[%b64d] Time spent in plugin %s = %b64d",
+ Debug("http", "[%b64d] Time spent in plugin %s = %b64d",
sm_id, HttpDebugNames::get_api_hook_name(cur_hook_id), time_in_plugin_ms);
}
@@ -1552,11 +1552,11 @@ HttpSM::state_api_callout(int event, voi
// Handle last plugin on current state
if(prev_hook_stats_enabled && prev_hook_start_time) {
INK64 time_in_plugin_ms = (INKhrtime() - prev_hook_start_time)/1000000;
- Debug("http", "[%b64d] Last plugin : Time spent : %s %b64d",
+ Debug("http", "[%b64d] Last plugin : Time spent : %s %b64d",
sm_id, HttpDebugNames::get_api_hook_name(cur_hook_id), time_in_plugin_ms);
prev_hook_stats.inc(time_in_plugin_ms);
}
-
+
// Get ready for next state
prev_hook_stats_enabled = false;
prev_hook_start_time = 0;
@@ -6690,7 +6690,7 @@ HttpSM::dump_state_on_assert()
for (int i = 0; i < hist_size; i++) {
int r = history[i].reentrancy;
int e = history[i].event;
-#if (HOST_OS == winnt)
+#if defined(_WIN32)
// Visual C++ preprocessor is unable to stringify __LINE__
// so we have to waste a ton a memory and store it
// as an integer
Modified: trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc Sat May 22 13:51:11 2010
@@ -2297,7 +2297,7 @@ UrlRewrite::load_remap_plugin(char *argv
Debug("remap_plugin", "New remap plugin info created for \"%s\"", c);
if ((pi->dlh = dlopen(c, RTLD_NOW)) == NULL) {
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
err = (char *)dlerror();
#else
err = dlerror();
Modified: trafficserver/traffic/trunk/proxy/logging/LogBuffer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogBuffer.h (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogBuffer.h Sat May 22 13:51:11 2010
@@ -39,7 +39,7 @@ class LogBufferIterator;
#define LOG_SEGMENT_COOKIE 0xaceface
#define LOG_SEGMENT_VERSION 2
-#if (HOST_OS == linux)
+#if defined(linux)
#define LB_DEFAULT_ALIGN_MASK 511
#else
#define LB_DEFAULT_ALIGN_MASK INK_ALIGN_INT
Modified: trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogConfig.cc Sat May 22 13:51:11 2010
@@ -39,12 +39,12 @@
#include <dirent.h>
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/statfs.h>
-#elif (HOST_OS == solaris)
+#elif defined(solaris)
#include <sys/statfs.h>
#include <sys/statvfs.h>
-#elif (HOST_OS != freebsd)
+#elif !defined(freebsd)
#include <sys/statvfs.h>
#endif // linux
@@ -72,7 +72,7 @@
#include "LogCollationAccept.h"
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/vfs.h>
#else
extern "C"
@@ -1758,7 +1758,7 @@ LogConfig::update_space_used()
// Now check the partition to see if there is enough *actual* space.
//
partition_space_left = m_partition_space_left;
-#if (HOST_OS == solaris)
+#if defined(solaris)
struct statvfs fs;
::memset(&fs, 0, sizeof(fs));
int ret =::statvfs(logfile_dir, &fs);
Modified: trafficserver/traffic/trunk/proxy/logging/LogFile.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogFile.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogFile.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogFile.cc Sat May 22 13:51:11 2010
@@ -775,7 +775,7 @@ LogFile::writeln(char *data, int len, in
memset(&wvec[1], 0, sizeof(iovec));
int bytes_this_write, vcnt = 1;
-#if (HOST_OS == solaris)
+#if defined(solaris)
wvec[0].iov_base = (caddr_t) data;
#else
wvec[0].iov_base = (void *) data;
@@ -783,7 +783,7 @@ LogFile::writeln(char *data, int len, in
wvec[0].iov_len = (size_t) len;
if (data[len - 1] != '\n') {
-#if (HOST_OS == solaris)
+#if defined(solaris)
wvec[1].iov_base = (caddr_t) "\n";
#else
wvec[1].iov_base = (void *) "\n";
Modified: trafficserver/traffic/trunk/proxy/logging/LogFormat.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogFormat.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogFormat.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogFormat.cc Sat May 22 13:51:11 2010
@@ -123,7 +123,7 @@ int32 LogFormat::id_from_name(const char
INK_MD5
name_md5;
name_md5.encodeBuffer(name, (int)::strlen(name));
-#if (HOST_OS == linux)
+#if defined(linux)
/* Mask most signficant bit so that return value of this function
* is not sign extended to be a negative number.
* This problem is only known to occur on Linux which
Modified: trafficserver/traffic/trunk/proxy/logging/LogFormatType.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogFormatType.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogFormatType.h (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogFormatType.h Sat May 22 13:51:11 2010
@@ -45,7 +45,7 @@ enum LogFileFormat
N_LOGFILE_TYPES
};
-#if (HOST_OS == linux)
+#if defined(linux)
#define ASCII_PIPE_FORMAT_SUPPORTED
#endif
Modified: trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc Sat May 22 13:51:11 2010
@@ -78,7 +78,7 @@ AppVersionInfo appVersionInfo;
/*-------------------------------------------------------------------------
max_out_limit
-------------------------------------------------------------------------*/
-#if (HOST_OS == linux)
+#if defined(linux)
/* Stupid PICKY stupid (did I mention that?) C++ compielrs */
#define RLIMCAST enum __rlimit_resource
#else
@@ -227,7 +227,7 @@ check_lockfile(const char *config_dir, c
fprintf(stderr, "FATAL: Can't acquire lockfile '%s'", lockfile);
if ((err == 0) && (holding_pid != -1)) {
-#if (HOST_OS == solaris)
+#if defined(solaris)
fprintf(stderr, " (Lock file held by process ID %d)\n", (int)holding_pid);
#else
fprintf(stderr, " (Lock file held by process ID %d)\n", holding_pid);
Modified: trafficserver/traffic/trunk/proxy/logging/LogUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogUtils.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogUtils.cc Sat May 22 13:51:11 2010
@@ -47,7 +47,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#if (HOST_OS == solaris)
+#if defined(solaris)
#include <netdb.h>
#else
#include "/usr/include/netdb.h" // need following instead of <netdb.h>
@@ -135,7 +135,7 @@ LogUtils::timestamp_to_netscape_str(long
#endif
struct tm res;
struct tm *tms = ink_localtime_r((const time_t *) ×tamp, &res);
-#if (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(freebsd) || defined(darwin)
long zone = -tms->tm_gmtoff; // double negative!
#else
long zone = (tms->tm_isdst > 0) ? altzone : timezone;
Modified: trafficserver/traffic/trunk/proxy/logstats.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logstats.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logstats.cc (original)
+++ trafficserver/traffic/trunk/proxy/logstats.cc Sat May 22 13:51:11 2010
@@ -35,7 +35,7 @@
#include <math.h>
#include <sys/utsname.h>
-#if (HOST_OS == solaris)
+#if defined(solaris)
#include <sys/types.h>
#include <unistd.h>
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc Sat May 22 13:51:11 2010
@@ -83,7 +83,7 @@ LocalManager::mgmtShutdown(int status, b
if (processRunning()) {
waitpid(watched_process_pid, &status, 0);
-#if (HOST_OS == linux)
+#if defined(linux)
/* Avert race condition, wait for the thread to complete,
before getting one more restart process */
/* Workaround for bugid INKqa10060 */
@@ -500,7 +500,7 @@ LocalManager::initMgmtProcessServer()
memset(&serv_addr, 0, sizeof(serv_addr));
serv_addr.sun_family = AF_UNIX;
ink_strncpy(serv_addr.sun_path, fpath, sizeof(serv_addr.sun_path));
-#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+#if defined(darwin) || defined(freebsd)
servlen = sizeof(struct sockaddr_un);
#else
servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Sat May 22 13:51:11 2010
@@ -77,14 +77,14 @@
#define FD_THROTTLE_HEADROOM (128 + 64) // TODO: consolidate with THROTTLE_FD_HEADROOM
-#if (HOST_OS != linux) && (HOST_OS != darwin) && (HOST_OS != freebsd) && (HOST_OS != solaris)
+#if !defined(linux) && !defined(darwin) && !defined(freebsd) && !defined(solaris)
extern "C"
{
int gethostname(char *name, int namelen);
}
#endif
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
extern "C" int getpwnam_r(const char *name, struct passwd *result, char *buffer, size_t buflen, struct passwd **resptr);
#endif
@@ -129,7 +129,7 @@ const char *recs_conf = "records.config"
int fds_limit;
typedef void (*PFV) (int);
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
void SignalHandler(int sig, siginfo_t * t, void *f);
void SignalAlrmHandler(int sig, siginfo_t * t, void *f);
#else
@@ -159,7 +159,7 @@ check_lockfile()
} else {
char *reason = strerror(-err);
if (err == 0) {
-#if (HOST_OS == solaris)
+#if defined(solaris)
fprintf(stderr, "FATAL: Lockfile '%s' says server already running as PID %d\n", lockfile, (int)holding_pid);
#else
fprintf(stderr, "FATAL: Lockfile '%s' says server already running as PID %d\n", lockfile, holding_pid);
@@ -184,7 +184,7 @@ check_lockfile()
fprintf(stderr, "FATAL: Can't acquire manager lockfile '%s'", lockfile);
mgmt_elog(stderr, "FATAL: Can't acquire manager lockfile '%s'", lockfile);
if (err == 0) {
-#if (HOST_OS == solaris)
+#if defined(solaris)
fprintf(stderr, " (Lock file held by process ID %d)\n", (int)holding_pid);
#else
fprintf(stderr, " (Lock file held by process ID %d)\n", holding_pid);
@@ -212,7 +212,7 @@ initSignalHandlers()
sigset_t sigsToBlock;
// Set up the signal handler
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
sigHandler.sa_handler = NULL;
sigHandler.sa_sigaction = SignalHandler;
#else
@@ -232,7 +232,7 @@ initSignalHandlers()
// Don't block the signal on entry to the signal
// handler so we can reissue it and get a core
// file in the appropriate circumstances
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
sigHandler.sa_flags = SA_RESETHAND | SA_SIGINFO;
#else
sigHandler.sa_flags = SA_RESETHAND;
@@ -244,7 +244,7 @@ initSignalHandlers()
sigaction(SIGSEGV, &sigHandler, NULL);
sigaction(SIGTERM, &sigHandler, NULL);
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
sigAlrmHandler.sa_handler = NULL;
sigAlrmHandler.sa_sigaction = SignalAlrmHandler;
#else
@@ -252,7 +252,7 @@ initSignalHandlers()
#endif
sigemptyset(&sigAlrmHandler.sa_mask);
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
sigAlrmHandler.sa_flags = SA_SIGINFO;
#else
sigAlrmHandler.sa_flags = 0;
@@ -288,13 +288,13 @@ initSignalHandlers()
#endif /* !_WIN32 */
}
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/prctl.h>
#endif
static int
setup_coredump()
{
-#if (HOST_OS == linux)
+#if defined(linux)
#ifndef PR_SET_DUMPABLE
#define PR_SET_DUMPABLE 4 /* Ugly, but we cannot compile with 2.2.x otherwise.
Should be removed when we compile only on 2.4.x */
@@ -376,7 +376,7 @@ max_out_limit(const char *name, int whic
{
struct rlimit rl;
-#if (HOST_OS == linux)
+#if defined(linux)
# define MAGIC_CAST(x) (enum __rlimit_resource)(x)
#else
# define MAGIC_CAST(x) x
@@ -385,7 +385,7 @@ max_out_limit(const char *name, int whic
if (max_it) {
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != rl.rlim_max) {
-#if (HOST_OS == darwin)
+#if defined(darwin)
if (which == RLIMIT_NOFILE)
rl.rlim_cur = fmin(OPEN_MAX, rl.rlim_max);
else
@@ -397,7 +397,7 @@ max_out_limit(const char *name, int whic
}
}
-#if (HOST_OS != darwin)
+#if !defined(darwin)
if (unlim_it) {
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != RLIM_INFINITY) {
@@ -1075,7 +1075,7 @@ main(int argc, char **argv)
#ifndef _WIN32
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
void
SignalAlrmHandler(int sig, siginfo_t * t, void *c)
#else
@@ -1087,10 +1087,10 @@ SignalAlrmHandler(int sig)
fprintf(stderr,"[TrafficManager] ==> SIGALRM received\n");
mgmt_elog(stderr,"[TrafficManager] ==> SIGALRM received\n");
*/
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
if (t) {
if (t->si_code <= 0) {
-#if (HOST_OS == solaris)
+#if defined(solaris)
fprintf(stderr, "[TrafficManager] ==> User Alarm from pid: %d uid: %d\n", (int)t->si_pid, t->si_uid);
#else
fprintf(stderr, "[TrafficManager] ==> User Alarm from pid: %d uid: %d\n", t->si_pid, t->si_uid);
@@ -1107,7 +1107,7 @@ SignalAlrmHandler(int sig)
}
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
void
SignalHandler(int sig, siginfo_t * t, void *c)
#else
@@ -1118,10 +1118,10 @@ SignalHandler(int sig)
static int clean = 0;
int status;
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
if (t) {
if (t->si_code <= 0) {
-#if (HOST_OS == solaris)
+#if defined(solaris)
fprintf(stderr, "[TrafficManager] ==> User Sig %d from pid: %d uid: %d\n", sig, (int)t->si_pid, t->si_uid);
#else
fprintf(stderr, "[TrafficManager] ==> User Sig %d from pid: %d uid: %d\n", sig, t->si_pid, t->si_uid);
@@ -1157,7 +1157,7 @@ SignalHandler(int sig)
if (sig == SIGTERM || sig == SIGINT) {
kill(lmgmt->watched_process_pid, sig);
waitpid(lmgmt->watched_process_pid, &status, 0);
-#if (HOST_OS == linux) && defined (USE_SNMP)
+#if defined(linux) && defined (USE_SNMP)
// INKqa08918: band-aid: for some reasons if snmpd.cnf is modified
// the snmp processes are killed and restarted successfully. But
// when traffic server is shut down, the snmp processes are not killed.
@@ -1176,7 +1176,7 @@ SignalHandler(int sig)
case SIGQUIT:
case SIGILL:
case SIGTRAP:
-#if (HOST_OS != linux)
+#if !defined(linux)
case SIGEMT:
case SIGSYS:
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc Sat May 22 13:51:11 2010
@@ -77,7 +77,7 @@ MgmtDBM::mgmt_batch_open()
}
if (status == -1) {
-#if (HOST_OS == linux)
+#if defined(linux)
union semun dummy_semun;
holding_pid = semctl(mgmt_sem_id, 0, GETPID, dummy_semun);
current_val = semctl(mgmt_sem_id, 0, GETVAL, dummy_semun);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc Sat May 22 13:51:11 2010
@@ -227,7 +227,7 @@ ProcessManager::initLMConnection()
snprintf(message, sizeof(message), "%s/%s", pserver_path, LM_CONNECTION_SERVER);
ink_strncpy(serv_addr.sun_path, message, sizeof(serv_addr.sun_path));
-#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+#if defined(darwin) || defined(freebsd)
servlen = sizeof(sockaddr_un);
#else
servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);