You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/02/24 19:48:52 UTC
svn commit: r915922 [12/14] - in /incubator/trafficserver/traffic/trunk: ./
install/ iocore/aio/ iocore/block-cache/ iocore/cache/ iocore/cluster/
iocore/dns/ iocore/eventsystem/ iocore/hostdb/ iocore/net/ iocore/utils/
libev/ libev/CVS/ libinktomi++/ ...
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc Wed Feb 24 18:48:42 2010
@@ -28,6 +28,7 @@
****************************************************************************/
+#include "inktomi++.h"
#include "HttpBodyFactory.h"
#include <unistd.h>
#include <dirent.h>
@@ -39,7 +40,6 @@
#include <logging/LogAccess.h>
#include <logging/LogAccessHttp.h>
#include "HttpCompat.h"
-#include "inktomi++.h"
//////////////////////////////////////////////////////////////////////
// The HttpBodyFactory creates HTTP response page bodies, supported //
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpCacheSM.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpCacheSM.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpCacheSM.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpCacheSM.h Wed Feb 24 18:48:42 2010
@@ -35,7 +35,7 @@
#include "P_Cache.h"
#include "StatSystem.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "URL.h"
#include "HTTP.h"
#include "HttpConfig.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc Wed Feb 24 18:48:42 2010
@@ -30,6 +30,7 @@
****************************************************************************/
+#include "ink_config.h"
#include "Allocator.h"
#include "HttpClientSession.h"
#include "HttpSM.h"
@@ -232,13 +233,13 @@
}
VIO *
-HttpClientSession::do_io_read(Continuation * c, int nbytes, MIOBuffer * buf)
+HttpClientSession::do_io_read(Continuation * c, ink64 nbytes, MIOBuffer * buf)
{
return client_vc->do_io_read(c, nbytes, buf);
}
VIO *
-HttpClientSession::do_io_write(Continuation * c, int nbytes, IOBufferReader * buf, bool owner)
+HttpClientSession::do_io_write(Continuation * c, ink64 nbytes, IOBufferReader * buf, bool owner)
{
return client_vc->do_io_write(c, nbytes, buf, owner);
}
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h Wed Feb 24 18:48:42 2010
@@ -58,9 +58,9 @@
public:
void new_connection(NetVConnection * new_vc, bool backdoor);
- virtual VIO *do_io_read(Continuation * c, int nbytes = INT_MAX, MIOBuffer * buf = 0);
+ virtual VIO *do_io_read(Continuation * c, ink64 nbytes = INK64_MAX, MIOBuffer * buf = 0);
- virtual VIO *do_io_write(Continuation * c = NULL, int nbytes = INT_MAX, IOBufferReader * buf = 0, bool owner = false);
+ virtual VIO *do_io_write(Continuation * c = NULL, ink64 nbytes = INK64_MAX, IOBufferReader * buf = 0, bool owner = false);
virtual void do_io_close(int lerrno = -1);
virtual void do_io_shutdown(ShutdownHowTo_t howto);
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc Wed Feb 24 18:48:42 2010
@@ -21,12 +21,13 @@
limitations under the License.
*/
+#include "ink_config.h"
#include <ctype.h>
#include <string.h>
#include "HttpConfig.h"
#include "HTTP.h"
#include "ProcessManager.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "ICPProcessor.h"
#include "P_Net.h"
#include "P_RecUtils.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.h Wed Feb 24 18:48:42 2010
@@ -38,15 +38,19 @@
#include <stdio.h>
#ifdef HAVE_REGEX_H
+#if (HOST_OS == solaris)
+#include <regex.h>
+#else
#include "/usr/include/regex.h"
#endif
+#endif
#ifdef HAVE_CTYPE_H
#include <ctype.h>
#endif
#include "inktomi++.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#undef MgmtInt
#undef MgmtFloat
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpDebugNames.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpDebugNames.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpDebugNames.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpDebugNames.cc Wed Feb 24 18:48:42 2010
@@ -196,8 +196,6 @@
return ("CACHE_EVENT_OPEN_READ");
case CACHE_EVENT_OPEN_READ_FAILED:
return ("CACHE_EVENT_OPEN_READ_FAILED");
- case CACHE_EVENT_OPEN_READ_FAILED_IN_PROGRESS:
- return ("CACHE_EVENT_OPEN_READ_FAILED_IN_PROGRESS");
case CACHE_EVENT_OPEN_WRITE:
return ("CACHE_EVENT_OPEN_WRITE");
case CACHE_EVENT_OPEN_WRITE_FAILED:
@@ -210,10 +208,6 @@
return ("CACHE_EVENT_UPDATE");
case CACHE_EVENT_UPDATE_FAILED:
return ("CACHE_EVENT_UPDATE_FAILED");
-#if 0
- case CACHE_EVENT_LOOKUP_RESPONSE:
- return ("CACHE_EVENT_LOOKUP_RESPONSE");
-#endif
case STAT_PAGE_SUCCESS:
return ("STAT_PAGE_SUCCESS");
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc Wed Feb 24 18:48:42 2010
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include "ink_config.h"
#include "P_Net.h"
#include "Main.h"
#include "Error.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Wed Feb 24 18:48:42 2010
@@ -23,7 +23,7 @@
*/
#include "HttpSM.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "HttpClientSession.h"
#include "HttpServerSession.h"
#include "HttpDebugNames.h"
@@ -5366,7 +5366,7 @@
if (t_state.hdr_info.request_content_length == HTTP_UNDEFINED_CL) {
alloc_index = (int) t_state.http_config_param->default_buffer_size_index;
- if (alloc_index<MIN_CONFIG_BUFFER_SIZE_INDEX || alloc_index> DEFAULT_MAX_BUFFER_SIZE) {
+ if (alloc_index<MIN_CONFIG_BUFFER_SIZE_INDEX || alloc_index> MAX_BUFFER_SIZE_INDEX) {
alloc_index = DEFAULT_REQUEST_BUFFER_SIZE_INDEX;
}
} else {
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.cc Wed Feb 24 18:48:42 2010
@@ -30,6 +30,7 @@
****************************************************************************/
+#include "ink_config.h"
#include "Allocator.h"
#include "HttpServerSession.h"
#include "HttpSessionManager.h"
@@ -51,7 +52,7 @@
state(HSS_INIT), to_parent_proxy(false), server_trans_stat(0),
private_session(false),
enable_origin_connection_limiting(false),
-connection_count(ConnectionCount::getInstance()),
+connection_count(NULL),
read_buffer(NULL), server_vc(NULL), magic(HTTP_SS_MAGIC_DEAD), buf_reader(NULL)
{
}
@@ -102,6 +103,8 @@
// Check to see if we are limiting the number of connections
// per host
if (enable_origin_connection_limiting == true) {
+ if(connection_count == NULL)
+ connection_count = ConnectionCount::getInstance();
connection_count->incrementCount(server_ip);
Debug("http_ss", "[%lld] new connection, ip: %u, count: %u",
con_id, server_ip, connection_count->getCount(server_ip));
@@ -117,13 +120,13 @@
}
VIO *
-HttpServerSession::do_io_read(Continuation * c, int nbytes, MIOBuffer * buf)
+HttpServerSession::do_io_read(Continuation * c, ink64 nbytes, MIOBuffer * buf)
{
return server_vc->do_io_read(c, nbytes, buf);
}
VIO *
-HttpServerSession::do_io_write(Continuation * c, int nbytes, IOBufferReader * buf, bool owner)
+HttpServerSession::do_io_write(Continuation * c, ink64 nbytes, IOBufferReader * buf, bool owner)
{
return server_vc->do_io_write(c, nbytes, buf, owner);
}
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.h Wed Feb 24 18:48:42 2010
@@ -86,9 +86,9 @@
return buf_reader;
};
- virtual VIO *do_io_read(Continuation * c, int nbytes = INT_MAX, MIOBuffer * buf = 0);
+ virtual VIO *do_io_read(Continuation * c, ink64 nbytes = INK64_MAX, MIOBuffer * buf = 0);
- virtual VIO *do_io_write(Continuation * c = NULL, int nbytes = INT_MAX, IOBufferReader * buf = 0, bool owner = false);
+ virtual VIO *do_io_write(Continuation * c = NULL, ink64 nbytes = INK64_MAX, IOBufferReader * buf = 0, bool owner = false);
virtual void do_io_close(int lerrno = -1);
virtual void do_io_shutdown(ShutdownHowTo_t howto);
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc Wed Feb 24 18:48:42 2010
@@ -21,10 +21,11 @@
limitations under the License.
*/
+#include "inktomi++.h"
+
#include <strings.h>
#include <math.h>
-#include "inktomi++.h"
//#include "Hash_Table.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
@@ -6415,7 +6416,7 @@
free_internal_msg_buffer(s->internal_msg_buffer, s->internal_msg_buffer_fast_allocator_size);
}
- if (s->internal_msg_buffer_size <= DEFAULT_MAX_BUFFER_SIZE) {
+ if (s->internal_msg_buffer_size <= max_iobuffer_size) {
s->internal_msg_buffer_fast_allocator_size = buffer_size_to_index(s->internal_msg_buffer_size);
s->internal_msg_buffer = (char *) ioBufAllocator[s->internal_msg_buffer_fast_allocator_size].alloc_void();
} else {
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h Wed Feb 24 18:48:42 2010
@@ -36,7 +36,7 @@
#include "CacheControl.h"
#include "ParentSelection.h"
#include "BaseRecords.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "Transform.h"
//#include "HttpAuthParams.h"
#include "api/include/remap.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc Wed Feb 24 18:48:42 2010
@@ -21,21 +21,17 @@
limitations under the License.
*/
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
#include "HttpTransactCache.h"
#include "time.h"
-#include "ink_assert.h"
-#include "ink_defs.h"
-#include "ParseRules.h"
#include "HTTP.h"
#include "HttpCompat.h"
#include "HttpMessageBody.h"
#include "Error.h"
#include "InkErrno.h"
-#include "ink_base64.h"
ClassAllocator<CacheLookupHttpConfig> CacheLookupHttpConfigAllocator("CacheLookupHttpConfigAllocator");
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransactHeaders.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransactHeaders.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransactHeaders.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransactHeaders.cc Wed Feb 24 18:48:42 2010
@@ -28,22 +28,14 @@
****************************************************************************/
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
-#include "time.h"
-#include "ink_assert.h"
-#include "ink_defs.h"
-#include "ParseRules.h"
-#include "URL.h"
#include "HTTP.h"
#include "HdrUtils.h"
#include "HttpCompat.h"
#include "HttpMessageBody.h"
-#include "Error.h"
-#include "InkErrno.h"
-#include "ink_base64.h"
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc Wed Feb 24 18:48:42 2010
@@ -30,6 +30,7 @@
****************************************************************************/
+#include "ink_config.h"
#include "HttpConfig.h"
#include "HttpTunnel.h"
#include "HttpSM.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/Makefile.am?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/Makefile.am Wed Feb 24 18:48:42 2010
@@ -17,8 +17,8 @@
# limitations under the License.
AM_CPPFLAGS = \
- $(iocore_include_dirs) \
-I$(top_srcdir)/proxy \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlMappingPathIndex.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlMappingPathIndex.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlMappingPathIndex.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlMappingPathIndex.cc Wed Feb 24 18:48:42 2010
@@ -20,6 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
+#include "ink_config.h"
#include "UrlMappingPathIndex.h"
bool
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc Wed Feb 24 18:48:42 2010
@@ -27,7 +27,7 @@
#include "P_EventSystem.h"
#include "StatSystem.h"
#include "P_Cache.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "ReverseProxy.h"
#include "MatcherUtils.h"
#include "Tokenizer.h"
@@ -2247,7 +2247,11 @@
Debug("remap_plugin", "New remap plugin info created for \"%s\"", c);
if ((pi->dlh = dlopen(c, RTLD_NOW)) == NULL) {
+#if (HOST_OS == freebsd)
+ err = (char *)dlerror();
+#else
err = dlerror();
+#endif
ink_snprintf(errbuf, errbufsize, "Can't load plugin \"%s\" - %s", c, err ? err : "Unknown dlopen() error");
return -4;
}
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.h Wed Feb 24 18:48:42 2010
@@ -27,7 +27,11 @@
#include "StringHash.h"
#include "UrlMapping.h"
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
#include <pcre.h>
+#endif
#include <list>
#define URL_REMAP_FILTER_NONE 0x00000000
Modified: incubator/trafficserver/traffic/trunk/proxy/logcat.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logcat.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logcat.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logcat.cc Wed Feb 24 18:48:42 2010
@@ -299,7 +299,9 @@
perror(0);
error = DATA_PROCESSING_ERROR;
} else {
+#ifdef HAVE_POSIX_FADVISE
posix_fadvise(in_fd, 0, 0, POSIX_FADV_DONTNEED);
+#endif
if (auto_filenames) {
// change .blog to .log
//
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc Wed Feb 24 18:48:42 2010
@@ -1054,6 +1054,9 @@
void
Log::init(int flags)
{
+ iObject::Init();
+ iLogBufferBuffer::Init();
+
maxInactiveObjects = LOG_OBJECT_ARRAY_DELTA;
numInactiveObjects = 0;
inactive_objects = new LogObject *[maxInactiveObjects];
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc Wed Feb 24 18:48:42 2010
@@ -38,8 +38,7 @@
***************************************************************************/
#include "ink_unused.h"
-#include <assert.h>
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "Error.h"
#include "HTTP.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccessICP.cc Wed Feb 24 18:48:42 2010
@@ -32,11 +32,8 @@
***************************************************************************/
#ifndef TS_MICRO
-#include "ink_unused.h"
-
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "Error.h"
-#include "ink_hrtime.h"
#include "HTTP.h"
#include "ICP.h"
#include "ICPlog.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc Wed Feb 24 18:48:42 2010
@@ -30,13 +30,14 @@
***************************************************************************/
+
+#include "inktomi++.h"
#include "ink_unused.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "inktomi++.h"
#include "Error.h"
#include "P_EventSystem.h"
#include "LogField.h"
@@ -69,7 +70,7 @@
int fieldlist_cache_entries = 0;
vink32 LogBuffer::M_ID = 0;
-iObjectActivator iObjectActivatorInstance; /* just to do ::Init() before main() */
+//iObjectActivator iObjectActivatorInstance; /* just to do ::Init() before main() */
iObject *iObject::free_heap = 0; /* list of free blocks */
ink_mutex iObject::iObjectMutex; /* mutex for access iObject class global variables */
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h Wed Feb 24 18:48:42 2010
@@ -143,12 +143,13 @@
size_t class_size; /* real class size */
iObject *next_object;
- static void Init(void);
+
protected:
iObject(const iObject &); /* declared; not implemented - block copying and assignment */
iObject & operator=(const iObject &); /* ditto */
public:
+ static void Init(void);
void *operator new(size_t size);
void operator delete(void *p);
@@ -173,7 +174,6 @@
iLogBufferBuffer *next;
size_t real_buf_size;
- static void Init(void);
iLogBufferBuffer()
{
@@ -197,6 +197,7 @@
char *buf;
size_t size;
+ static void Init(void);
static iLogBufferBuffer *New_iLogBufferBuffer(size_t _buf_size);
static iLogBufferBuffer *Delete_iLogBufferBuffer(iLogBufferBuffer * _b);
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc Wed Feb 24 18:48:42 2010
@@ -25,13 +25,14 @@
// include files
//-------------------------------------------------------------------------
+#include "inktomi++.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#include <string.h>
#include <sys/types.h>
-#include "inktomi++.h"
#include "P_EventSystem.h"
#include "P_Net.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationHostSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationHostSM.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationHostSM.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationHostSM.cc Wed Feb 24 18:48:42 2010
@@ -25,6 +25,8 @@
// include files
//-------------------------------------------------------------------------
+#include "ink_config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc Wed Feb 24 18:48:42 2010
@@ -27,10 +27,7 @@
This file implements the LogConfig object.
***************************************************************************/
-#include "ink_unused.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "inktomi++.h"
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
@@ -43,11 +40,12 @@
#if (HOST_OS == linux)
#include <sys/statfs.h>
-#else // linux check
-#if (HOST_OS != freebsd)
+#elif (HOST_OS == solaris)
+#include <sys/statfs.h>
#include <sys/statvfs.h>
-#endif // not freebsd check
-#endif // linux check
+#elif (HOST_OS != freebsd)
+#include <sys/statvfs.h>
+#endif // linux
#include "ink_platform.h"
@@ -1783,12 +1781,19 @@
// Now check the partition to see if there is enough *actual* space.
//
partition_space_left = m_partition_space_left;
+#if (HOST_OS == solaris)
+ struct statvfs fs;
+ ::memset(&fs, 0, sizeof(fs));
+ int ret =::statvfs(logfile_dir, &fs);
+#else
struct statfs fs;
::memset(&fs, 0, sizeof(fs));
int ret =::statfs(logfile_dir, &fs);
+#endif
if (ret >= 0) {
partition_space_left = (ink64) fs.f_bavail * (ink64) fs.f_bsize;
}
+
//
// Update the config variables for space used/left
//
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogField.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogField.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogField.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogField.cc Wed Feb 24 18:48:42 2010
@@ -29,9 +29,8 @@
***************************************************************************/
-#include "ink_unused.h"
+#include "inktomi++.h"
-#include "ink_platform.h"
#include "Error.h"
#include "Resource.h"
#include "LogUtils.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogFieldAliasMap.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogFieldAliasMap.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogFieldAliasMap.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogFieldAliasMap.cc Wed Feb 24 18:48:42 2010
@@ -27,6 +27,7 @@
***************************************************************************/
+#include "ink_config.h"
#include "LogFieldAliasMap.h"
#include "ink_assert.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogFile.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogFile.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogFile.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogFile.cc Wed Feb 24 18:48:42 2010
@@ -26,6 +26,8 @@
***************************************************************************/
+
+#include "inktomi++.h"
#include "ink_unused.h"
#include <errno.h>
@@ -33,7 +35,6 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include "inktomi++.h"
#include "Error.h"
#include "P_EventSystem.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogFilter.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogFilter.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogFilter.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogFilter.cc Wed Feb 24 18:48:42 2010
@@ -26,9 +26,8 @@
***************************************************************************/
-#include "ink_unused.h"
+#include "inktomi++.h"
-#include "ink_platform.h"
#include "Resource.h"
#include "Error.h"
#include "LogUtils.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogFormat.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogFormat.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogFormat.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogFormat.cc Wed Feb 24 18:48:42 2010
@@ -26,6 +26,8 @@
***************************************************************************/
+
+#include "ink_config.h"
#include "ink_unused.h"
#include <stdio.h>
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogHost.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogHost.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogHost.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogHost.cc Wed Feb 24 18:48:42 2010
@@ -26,9 +26,8 @@
***************************************************************************/
-#include "ink_unused.h"
+#include "inktomi++.h"
-#include "ink_platform.h"
#include "Resource.h"
#include "Error.h"
@@ -55,57 +54,35 @@
-------------------------------------------------------------------------*/
LogHost::LogHost(char *object_filename, inku64 object_signature)
- :
-m_object_filename(xstrdup(object_filename))
- ,
-m_object_signature(object_signature)
- ,
-m_ip(0)
- ,
-m_ipstr(NULL)
- ,
-m_name(NULL)
- ,
-m_port(0)
- ,
-m_sock(NULL)
- ,
-m_sock_fd(-1)
- ,
-m_connected(false)
- ,
-m_orphan_file(NULL)
+ : m_object_filename(xstrdup(object_filename))
+ , m_object_signature(object_signature)
+ , m_ip(0)
+ , m_ipstr(NULL)
+ , m_name(NULL)
+ , m_port(0)
+ , m_sock(NULL)
+ , m_sock_fd(-1)
+ , m_connected(false)
+ , m_orphan_file(NULL)
#if defined (IOCORE_LOG_COLLATION)
-,
-m_log_collation_client_sm(NULL)
+ , m_log_collation_client_sm(NULL)
#endif
{
}
LogHost::LogHost(const LogHost & rhs)
- :
-m_object_filename(xstrdup(rhs.m_object_filename))
- ,
-m_object_signature(rhs.m_object_signature)
- ,
-m_ip(rhs.m_ip)
- ,
-m_ipstr(xstrdup(rhs.m_ipstr))
- ,
-m_name(xstrdup(rhs.m_name))
- ,
-m_port(rhs.m_port)
- ,
-m_sock(NULL)
- ,
-m_sock_fd(-1)
- ,
-m_connected(false)
- ,
-m_orphan_file(NULL)
+ : m_object_filename(xstrdup(rhs.m_object_filename))
+ , m_object_signature(rhs.m_object_signature)
+ , m_ip(rhs.m_ip)
+ , m_ipstr(xstrdup(rhs.m_ipstr))
+ , m_name(xstrdup(rhs.m_name))
+ , m_port(rhs.m_port)
+ , m_sock(NULL)
+ , m_sock_fd(-1)
+ , m_connected(false)
+ , m_orphan_file(NULL)
#if defined (IOCORE_LOG_COLLATION)
-,
-m_log_collation_client_sm(NULL)
+ , m_log_collation_client_sm(NULL)
#endif
{
create_orphan_LogFile_object();
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc Wed Feb 24 18:48:42 2010
@@ -251,7 +251,11 @@
fprintf(stderr, "FATAL: Can't acquire lockfile '%s'", lockfile);
if ((err == 0) && (holding_pid != -1)) {
+#if (HOST_OS == 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);
+#endif
} else if ((err == 0) && (holding_pid == -1)) {
fprintf(stderr, " (Lock file exists, but can't read process ID)\n");
} else if (reason) {
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogUtils.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogUtils.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogUtils.cc Wed Feb 24 18:48:42 2010
@@ -29,6 +29,8 @@
***************************************************************************/
+
+#include "ink_config.h"
#include "ink_unused.h"
#include <assert.h>
@@ -45,8 +47,11 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-// need following instead of <netdb.h>
-#include "/usr/include/netdb.h"
+#if (HOST_OS == solaris)
+#include <netdb.h>
+#else
+#include "/usr/include/netdb.h" // need following instead of <netdb.h>
+#endif
#include "P_RecProcess.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/Makefile.am?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/Makefile.am Wed Feb 24 18:48:42 2010
@@ -20,8 +20,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/libinktomi++ \
- $(iocore_include_dirs) \
-I$(top_srcdir)/proxy \
+ $(iocore_include_dirs) \
-I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/http2/remap \
-I$(top_srcdir)/proxy/mgmt2 \
Modified: incubator/trafficserver/traffic/trunk/proxy/logstats.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logstats.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logstats.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logstats.cc Wed Feb 24 18:48:42 2010
@@ -31,6 +31,10 @@
#include <math.h>
#include <sys/utsname.h>
+#if (HOST_OS == solaris)
+#include <sys/types.h>
+#include <unistd.h>
+#endif
#include <iostream>
#include <fstream>
@@ -1726,9 +1730,9 @@
strncat(ymon_notice, " squid.blog not enabled", ymon_notice_size - strlen(ymon_notice) - 1);
return -1;
}
-
+#ifdef HAVE_POSIX_FADVISE
posix_fadvise(main_fd, 0, 0, POSIX_FADV_DONTNEED);
-
+#endif
return main_fd;
}
@@ -1745,6 +1749,7 @@
int res, cnt;
int main_fd;
unsigned max_age;
+ struct flock lck;
char ts_path[PATH_NAME_MAX + 1];
// build the application information structure
@@ -1895,8 +1900,14 @@
my_exit(YMON_CRITICAL, ymon_notice);
}
// Get an exclusive lock, if possible. Try for up to 20 seconds.
+ // Use more portable & standard fcntl() over flock()
+ lck.l_type = F_WRLCK;
+ lck.l_whence = 0; /* offset l_start from beginning of file*/
+ lck.l_start = (off_t)0;
+ lck.l_len = (off_t)0; /* till end of file*/
cnt = 10;
- while (((res = flock(state_fd, LOCK_EX | LOCK_NB)) < 0) && --cnt) {
+ // while (((res = flock(state_fd, LOCK_EX | LOCK_NB)) < 0) && --cnt) {
+ while (((res = fcntl(state_fd, F_SETLK, &lck)) < 0) && --cnt) {
switch (errno) {
case EWOULDBLOCK:
case EINTR:
@@ -2029,7 +2040,9 @@
ymon_status = YMON_WARNING;
}
}
- flock(state_fd, LOCK_UN);
+ //flock(state_fd, LOCK_UN);
+ lck.l_type = F_UNLCK;
+ fcntl(state_fd, F_SETLK, &lck);
close(main_fd);
close(state_fd);
} else {
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc Wed Feb 24 18:48:42 2010
@@ -21,8 +21,9 @@
limitations under the License.
*/
-#include "ink_unused.h"
+#include "ink_config.h"
#include "ink_platform.h"
+#include "ink_unused.h"
#include "Main.h"
#include "MgmtUtils.h"
#include "ConfigParse.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc Wed Feb 24 18:48:42 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/*
*
* Alarms.cc
@@ -32,8 +31,7 @@
*
*/
-#include "ink_platform.h"
-#include "Compatability.h"
+#include "inktomi++.h"
#include "Main.h"
#include "Alarms.h"
#include "Diags.h"
@@ -635,9 +633,9 @@
} else {
int res;
if (alarm_email_from_name && alarm_email_from_addr && alarm_email_to_addr) {
- res = execl(cmd_line, alarm_bin, desc, alarm_email_from_name, alarm_email_from_addr, alarm_email_to_addr, NULL);
+ res = execl(cmd_line, alarm_bin, desc, alarm_email_from_name, alarm_email_from_addr, alarm_email_to_addr, (char*)NULL);
} else {
- res = execl(cmd_line, alarm_bin, desc, NULL);
+ res = execl(cmd_line, alarm_bin, desc, (char*)NULL);
}
_exit(res);
}
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/AutoConf.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/AutoConf.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/AutoConf.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/AutoConf.cc Wed Feb 24 18:48:42 2010
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include "ink_config.h"
#include "InkTime.h"
#include "Main.h"
#include "AutoConf.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc Wed Feb 24 18:48:42 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/**************************************
*
* BaseManager.cc
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseRecords.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseRecords.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseRecords.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseRecords.cc Wed Feb 24 18:48:42 2010
@@ -26,15 +26,10 @@
* BaseRecords.cc
* Member function definitions for the BaseRecords class.
*
- *
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_platform.h"
-#include "Compatability.h"
-#include "ink_string.h"
-#include "ink_atomic.h"
+#include "inktomi++.h"
+#include "Main.h"
#include "Main.h"
#include "BaseRecords.h"
#include "RecordsConfig.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/FileManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/FileManager.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/FileManager.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/FileManager.cc Wed Feb 24 18:48:42 2010
@@ -21,12 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_platform.h"
-#include "Compatability.h"
-#include "ink_resource.h"
-#include "ink_error.h"
+#include "inktomi++.h"
#include "FileManager.h"
#include "Main.h"
#include "Rollback.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/LMRecords.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/LMRecords.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/LMRecords.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/LMRecords.cc Wed Feb 24 18:48:42 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+
/*
*
* LMRecords.cc
@@ -32,6 +32,8 @@
*
*/
+#include "ink_config.h"
+#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "LMRecords.h"
#include "Main.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc Wed Feb 24 18:48:42 2010
@@ -30,10 +30,10 @@
*
*/
+#include "inktomi++.h"
+#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include "ink_platform.h"
-#include "inktomi++.h"
#include "Compatability.h"
#include "LocalManager.h"
#include "NTDefs.h"
@@ -487,7 +487,7 @@
struct sockaddr_un serv_addr;
snprintf(fpath, sizeof(fpath), "%s/%s", pserver_path, LM_CONNECTION_SERVER);
-#if (HOST_OS == freebsd)
+#if 0 /* (HOST_OS == freebsd) */
char ulpath[1024];
strcpy(ulpath, fpath);
ulpath[strlen(fpath) - 1] = 0;
@@ -506,8 +506,11 @@
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)
+ servlen = sizeof(struct sockaddr_un);
+#else
servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
-
+#endif
if (setsockopt(process_server_sockfd, SOL_SOCKET, SO_REUSEADDR, (char *) &one, sizeof(int)) < 0) {
mgmt_fatal(stderr, "[LocalManager::initMgmtProcessServer] Unable to set socket options.\n");
}
@@ -1139,8 +1142,7 @@
Debug("lm-filter", "[LocalManager::startProxy] " "%s execution completed\n", absolute_convert_binary);
}
} else { // invoke the converter script - no args
- int res = execl(absolute_convert_binary,
- convert_bin, NULL, NULL);
+ int res = execl(absolute_convert_binary, convert_bin, NULL, (char*)NULL);
if (res < 0) {
mgmt_elog(stderr, "[LocalManager::startProxy] "
"%s failed to execute successfully.", absolute_convert_binary);
@@ -1205,7 +1207,7 @@
char env_prep_bin[1024];
snprintf(env_prep_bin, sizeof(env_prep_bin), "%s/%s", bin_path, env_prep);
- res = execl(env_prep_bin, env_prep, NULL);
+ res = execl(env_prep_bin, env_prep, (char*)NULL);
_exit(res);
}
}
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Wed Feb 24 18:48:42 2010
@@ -30,6 +30,9 @@
*
*/
+#include "ink_config.h"
+#include "ink_platform.h"
+
#include "Main.h"
#include "MgmtUtils.h"
#include "MgmtSchema.h"
@@ -75,11 +78,9 @@
#include "tools/SysAPI.h"
#endif
-
#define FD_THROTTLE_HEADROOM (128 + 64) // TODO: consolidate with THROTTLE_FD_HEADROOM
-
-#if (HOST_OS != linux)
+#if (HOST_OS != linux) && (HOST_OS != darwin) && (HOST_OS != freebsd) && (HOST_OS != solaris)
extern "C"
{
int gethostname(char *name, int namelen);
@@ -130,7 +131,7 @@
int fds_limit;
typedef void (*PFV) (int);
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
void SignalHandler(int sig, siginfo_t * t, void *f);
void SignalAlrmHandler(int sig, siginfo_t * t, void *f);
#else
@@ -160,7 +161,11 @@
} else {
char *reason = strerror(-err);
if (err == 0) {
+#if (HOST_OS == 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);
+#endif
mgmt_elog(stderr, "FATAL: Lockfile '%s' says server already running as PID %d\n", lockfile, holding_pid);
} else {
fprintf(stderr, "FATAL: Can't open server lockfile '%s' (%s)\n", lockfile, (reason ? reason : "Unknown Reason"));
@@ -181,7 +186,11 @@
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)
+ 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);
+#endif
mgmt_elog(stderr, " (Lock file held by process ID %d)\n", holding_pid);
} else if (reason) {
fprintf(stderr, " (%s)\n", reason);
@@ -205,7 +214,7 @@
sigset_t sigsToBlock;
// Set up the signal handler
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
sigHandler.sa_handler = NULL;
sigHandler.sa_sigaction = SignalHandler;
#else
@@ -225,7 +234,7 @@
// 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)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
sigHandler.sa_flags = SA_RESETHAND | SA_SIGINFO;
#else
sigHandler.sa_flags = SA_RESETHAND;
@@ -237,7 +246,7 @@
sigaction(SIGSEGV, &sigHandler, NULL);
sigaction(SIGTERM, &sigHandler, NULL);
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
sigAlrmHandler.sa_handler = NULL;
sigAlrmHandler.sa_sigaction = SignalAlrmHandler;
#else
@@ -245,7 +254,7 @@
#endif
sigemptyset(&sigAlrmHandler.sa_mask);
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
sigAlrmHandler.sa_flags = SA_SIGINFO;
#else
sigAlrmHandler.sa_flags = 0;
@@ -420,11 +429,19 @@
if (max_it) {
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != rl.rlim_max) {
+#if (HOST_OS == darwin)
+ if (which == RLIMIT_NOFILE)
+ rl.rlim_cur = fmin(OPEN_MAX, rl.rlim_max);
+ else
+ rl.rlim_cur = rl.rlim_max;
+#else
rl.rlim_cur = rl.rlim_max;
+#endif
ink_release_assert(setrlimit(MAGIC_CAST(which), &rl) >= 0);
}
}
+#if (HOST_OS != darwin)
if (unlim_it) {
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != RLIM_INFINITY) {
@@ -432,6 +449,7 @@
ink_release_assert(setrlimit(MAGIC_CAST(which), &rl) >= 0);
}
}
+#endif
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
#ifdef MGMT_USE_SYSLOG
//syslog(LOG_NOTICE, "NOTE: %s(%d):cur(%d),max(%d)", name, which, (int)rl.rlim_cur, (int)rl.rlim_max);
@@ -450,7 +468,9 @@
set_rlimit(RLIMIT_STACK, true, true);
set_rlimit(RLIMIT_DATA, true, true);
set_rlimit(RLIMIT_FSIZE, true, false);
+#ifdef RLIMIT_RSS
set_rlimit(RLIMIT_RSS, true, true);
+#endif
if (!getrlimit(RLIMIT_NOFILE, &lim)) {
if (fds_throttle > (int) (lim.rlim_cur + FD_THROTTLE_HEADROOM)) {
@@ -1094,7 +1114,7 @@
#ifndef _WIN32
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
void
SignalAlrmHandler(int sig, siginfo_t * t, void *c)
#else
@@ -1106,10 +1126,14 @@
fprintf(stderr,"[TrafficManager] ==> SIGALRM received\n");
mgmt_elog(stderr,"[TrafficManager] ==> SIGALRM received\n");
*/
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
if (t) {
if (t->si_code <= 0) {
+#if (HOST_OS == 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);
+#endif
mgmt_elog(stderr, "[TrafficManager] ==> User Alarm from pid: %d uid: %d\n", t->si_pid, t->si_uid);
} else {
fprintf(stderr, "[TrafficManager] ==> Kernel Alarm Reason: %d\n", t->si_code);
@@ -1122,7 +1146,7 @@
}
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
void
SignalHandler(int sig, siginfo_t * t, void *c)
#else
@@ -1133,10 +1157,14 @@
static int clean = 0;
int status;
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
if (t) {
if (t->si_code <= 0) {
+#if (HOST_OS == 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);
+#endif
mgmt_elog(stderr, "[TrafficManager] ==> User Sig %d from pid: %d uid: %d\n", sig, t->si_pid, t->si_uid);
} else {
fprintf(stderr, "[TrafficManager] ==> Kernel Sig %d; Reason: %d\n", sig, t->si_code);
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc Wed Feb 24 18:48:42 2010
@@ -31,6 +31,7 @@
*
*/
+#include "ink_config.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "MgmtDBM.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc Wed Feb 24 18:48:42 2010
@@ -21,9 +21,10 @@
limitations under the License.
*/
+#include "ink_config.h"
+#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include "ink_platform.h"
#include "ink_assert.h"
#include "ink_resource.h"
#include "ink_error.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc Wed Feb 24 18:48:42 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/*
*
* ProcessManager.cc
@@ -231,8 +230,11 @@
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)
+ servlen = sizeof(sockaddr_un);
+#else
servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
-
+#endif
if ((local_manager_sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
mgmt_fatal(stderr, "[ProcessManager::initLMConnection] Unable to create socket\n");
}
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/ProcessRecords.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/ProcessRecords.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/ProcessRecords.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/ProcessRecords.cc Wed Feb 24 18:48:42 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+
/*
*
* ProcessRecords.cc
@@ -32,6 +32,8 @@
*
*/
+#include "ink_config.h"
+#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "ProcessRecords.h"
bool
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Wed Feb 24 18:48:42 2010
@@ -22,7 +22,7 @@
*/
-
+#include "ink_config.h"
#include "RecordsConfig.h"
#include "Main.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc Wed Feb 24 18:48:42 2010
@@ -22,19 +22,13 @@
*/
/****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_platform.h"
-#include "Compatability.h"
-#include "ink_thread.h"
-#include "ink_error.h"
+#include "inktomi++.h"
#include "LocalManager.h"
#include "Rollback.h"
#include "WebMgmtUtils.h"
#include "WebGlobals.h"
#include "MgmtUtils.h"
#include "ExpandingArray.h"
-#include "Diags.h"
#include "MgmtSocket.h"
/****************************************************************************
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc Wed Feb 24 18:48:42 2010
@@ -40,6 +40,7 @@
*
****************************************************************************/
+#include "ink_config.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "WebMgmtUtils.h"
#include "ink_hrtime.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/WebPluginList.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/WebPluginList.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/WebPluginList.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/WebPluginList.cc Wed Feb 24 18:48:42 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
#include "WebPluginList.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc Wed Feb 24 18:48:42 2010
@@ -27,8 +27,8 @@
* Implementation of CfgContext class and all the CfgEleObj subclasses
***********************************************************************/
-#include "ink_platform.h"
#include "inktomi++.h"
+#include "ink_platform.h"
#include "CfgContextImpl.h"
#include "CfgContextUtils.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc Wed Feb 24 18:48:42 2010
@@ -31,6 +31,7 @@
* Created by: Lan Tran
*
***************************************************************************/
+#include "ink_config.h"
#include "ink_platform.h"
#include "CfgContextManager.h"
#include "CfgContextUtils.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc Wed Feb 24 18:48:42 2010
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "ink_platform.h"
#include "inktomi++.h"
+#include "ink_platform.h"
#include "CfgContextUtils.h"
#include "Tokenizer.h"
#if defined(OEM)
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc Wed Feb 24 18:48:42 2010
@@ -29,6 +29,7 @@
*
***************************************************************************/
+#include "ink_config.h"
#include "ink_platform.h"
#include "Main.h"
#include "LocalManager.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.h Wed Feb 24 18:48:42 2010
@@ -35,6 +35,11 @@
#include "CfgContextDefs.h"
#include "Tokenizer.h"
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
INKError Init(char *socket_path = NULL);
INKError Terminate();
@@ -154,4 +159,8 @@
void RmReadCfgList(Tokenizer * Tp, tok_iter_state * Tstate, char **, INKRmServerListT ListType);
INKError WriteRmCfgFile(char *text);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventCallback.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventCallback.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventCallback.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventCallback.cc Wed Feb 24 18:48:42 2010
@@ -29,6 +29,7 @@
*
***************************************************************************/
+#include "ink_config.h"
#include "ink_resource.h"
#include "EventCallback.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventCallback.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventCallback.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventCallback.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventCallback.h Wed Feb 24 18:48:42 2010
@@ -59,6 +59,10 @@
ink_mutex event_callback_lock;
} CallbackTable;
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
EventCallbackT *create_event_callback(INKEventSignalFunc func, void *data);
void delete_event_callback(EventCallbackT * event_cb);
@@ -74,4 +78,8 @@
bool * first_cb);
INKError cb_table_unregister(CallbackTable * cb_table, char *event_name, INKEventSignalFunc func);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventControlMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventControlMain.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventControlMain.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/EventControlMain.cc Wed Feb 24 18:48:42 2010
@@ -29,14 +29,9 @@
*
***************************************************************************/
-#include "ink_platform.h"
-#include "ink_mutex.h"
-#include "ink_hash_table.h"
-#include "ink_sock.h"
-#include "Tokenizer.h"
+#include "inktomi++.h"
#include "LocalManager.h"
#include "MgmtSocket.h"
-
#include "EventControlMain.h"
#include "CoreAPI.h"
#include "NetworkUtilsLocal.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc Wed Feb 24 18:48:42 2010
@@ -29,8 +29,8 @@
*
*
***************************************************************************/
-#include <limits.h>
#include "inktomi++.h"
+#include <limits.h>
#include "INKMgmtAPI.h"
#include "CfgContextManager.h"
@@ -3282,7 +3282,7 @@
wait(&status);
} else {
int res;
- res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, NULL);
+ res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, (char*)NULL);
if (res != 0) {
perror("[rm_change_ip] mv of rmserver.cfg failed! ");
}
@@ -3378,7 +3378,7 @@
wait(&status);
} else { /* Exec the up */
int res;
- res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, NULL);
+ res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, (char*)NULL);
if (res != 0) {
perror("[rm_remove_ip] mv of rmserver.cfg failed! ");
}
@@ -3501,7 +3501,7 @@
wait(&status);
} else { /* Exec the up */
int res;
- res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, NULL);
+ res = execl(mv_binary, "mv", rmserver_path1, rmserver_path, (char*)NULL);
if (res != 0) {
perror("[rm_change_hostname] mv of rmserver.cfg failed! ");
}
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/Makefile.am Wed Feb 24 18:48:42 2010
@@ -43,7 +43,6 @@
DEFS += $(MGMT_DEFS)
noinst_LIBRARIES = libmgmtapilocal.a
-
libmgmtapilocal_a_SOURCES = \
include/INKMgmtAPI.h \
CfgContextDefs.h \
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/MgmtPlugin.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/MgmtPlugin.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/MgmtPlugin.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/MgmtPlugin.cc Wed Feb 24 18:48:42 2010
@@ -30,10 +30,10 @@
****************************************************************************/
+#include "inktomi++.h"
+#include "ink_platform.h"
#include <stdio.h>
#include <list>
-#include "ink_platform.h"
-#include "inktomi++.h"
//#include "ink_file.h"
//#include "Compatability.h"
#include "ParseRules.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc Wed Feb 24 18:48:42 2010
@@ -30,6 +30,7 @@
*
***************************************************************************/
+#include "ink_config.h"
#include "ink_platform.h"
#include "ink_sock.h"
#include "Diags.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc Wed Feb 24 18:48:42 2010
@@ -30,15 +30,10 @@
*
***************************************************************************/
-#include "ink_platform.h"
-#include "ink_mutex.h"
-#include "ink_hash_table.h"
-#include "ink_sock.h"
-#include "Tokenizer.h"
+#include "inktomi++.h"
#include "LocalManager.h"
#include "Main.h"
#include "MgmtSocket.h"
-
#include "TSControlMain.h"
#include "CoreAPI.h"
#include "CoreAPIShared.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h Wed Feb 24 18:48:42 2010
@@ -58,8 +58,10 @@
#if defined (__SUNPRO_CC) || (defined (__GNUC__) || ! defined(__cplusplus))
#if !defined (bool)
+#if (HOST_OS != darwin) && (HOST_OS != freebsd) && (HOST_OS != solaris)
#define bool int
#endif
+#endif
#if !defined (true)
#define true 1
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc Wed Feb 24 18:48:42 2010
@@ -94,6 +94,7 @@
* reset_stats - resets all statistics to default values
*/
+#include "ink_config.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc Wed Feb 24 18:48:42 2010
@@ -36,6 +36,7 @@
*
***************************************************************************/
+#include "ink_config.h"
#include <strings.h>
#include "ink_snprintf.h"
#include "ink_string.h"
@@ -318,7 +319,7 @@
// do this last so that everything else on client side is set up even if
// connection fails; this might happen if client is set up and running
// before TM
- err = connect();
+ err = ts_connect();
if (err != INK_ERR_OKAY)
goto END;
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/EventRegistration.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/EventRegistration.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/EventRegistration.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/EventRegistration.cc Wed Feb 24 18:48:42 2010
@@ -31,13 +31,14 @@
*
***************************************************************************/
+#include "inktomi++.h"
#include <stdio.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <string.h>
#include "ink_thread.h"
-#include "inktomi++.h"
+
#include "MgmtSocket.h"
#include "INKMgmtAPI.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/EventRegistration.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/EventRegistration.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/EventRegistration.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/EventRegistration.h Wed Feb 24 18:48:42 2010
@@ -35,10 +35,18 @@
#include <stdio.h>
#ifndef _WIN32
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
void *event_callback_thread(void *arg);
void *event_poll_thread_main(void *arg);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif /* !_WIN32 */
#endif /* _EVENT_REGISTRATION_H */
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am Wed Feb 24 18:48:42 2010
@@ -38,10 +38,9 @@
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
-noinst_LIBRARIES = libmgmtapiremote.a
-
noinst_PROGRAMS = traffic_api_cli_remote
+noinst_LIBRARIES = libmgmtapiremote.a
libmgmtapiremote_a_SOURCES = \
../CfgContextImpl.cc \
../CfgContextManager.cc \
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc Wed Feb 24 18:48:42 2010
@@ -32,6 +32,7 @@
*
***************************************************************************/
+#include "ink_config.h"
#include "ink_sock.h"
#include "ink_string.h"
#include "NetworkUtilsRemote.h"
@@ -140,7 +141,7 @@
* goes back to just sitting and listening for connection.
***************************************************************************/
INKError
-connect()
+ts_connect()
{
struct sockaddr_un client_sock;
struct sockaddr_un client_event_sock;
@@ -161,8 +162,11 @@
memset(&client_sock, 0, sizeof(sockaddr_un));
client_sock.sun_family = AF_UNIX;
ink_strncpy(client_sock.sun_path, main_socket_path, sizeof(client_sock.sun_path));
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+ sockaddr_len = sizeof(sockaddr_un);
+#else
sockaddr_len = sizeof(client_sock.sun_family) + strlen(client_sock.sun_path);
-
+#endif
// connect call
if (connect(main_socket_fd, (struct sockaddr *) &client_sock, sockaddr_len) < 0) {
//fprintf(stderr, "[connect] ERROR (main_socket_fd %d): %s\n", main_socket_fd, strerror(int(errno)));
@@ -183,8 +187,11 @@
memset(&client_event_sock, 0, sizeof(sockaddr_un));
client_event_sock.sun_family = AF_UNIX;
ink_strncpy(client_event_sock.sun_path, event_socket_path, sizeof(client_sock.sun_path));
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+ sockaddr_len = sizeof(sockaddr_un);
+#else
sockaddr_len = sizeof(client_event_sock.sun_family) + strlen(client_event_sock.sun_path);
-
+#endif
// connect call
if (connect(event_socket_fd, (struct sockaddr *) &client_event_sock, sockaddr_len) < 0) {
//fprintf(stderr, "[connect] ERROR (event_socket_fd %d): %s\n", event_socket_fd, strerror(int(errno)));
@@ -255,7 +262,7 @@
// use the socket_path that was called by remote client on first init
// use connect instead of INKInit() b/c if TM restarted, client-side tables
// would be recreated; just want to reconnect to same socket_path
- err = connect();
+ err = ts_connect();
if (err != INK_ERR_OKAY) // problem establishing connection
return err;
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.h Wed Feb 24 18:48:42 2010
@@ -42,6 +42,11 @@
#include "NetworkUtilsDefs.h"
#include "EventCallback.h"
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
/**********************************************************************
* Socket Helper Functions
**********************************************************************/
@@ -52,7 +57,7 @@
* the client connection information stored in the variables in
* NetworkUtilsRemote.cc
*/
-INKError connect();
+INKError ts_connect(); /* TODO: update documenation, Renamed due to conflict with connect() in <sys/socket.h> on some platforms*/
INKError disconnect();
INKError reconnect();
INKError reconnect_loop(int num_attempts);
@@ -95,4 +100,8 @@
INKError parse_event_active_reply(int fd, bool * is_active);
INKError parse_event_notification(int fd, INKEvent * event);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc Wed Feb 24 18:48:42 2010
@@ -29,10 +29,10 @@
*
****************************************************************************/
+#include "inktomi++.h"
+#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include "ink_platform.h"
-#include "inktomi++.h"
#include "Main.h"
#include "Tokenizer.h"
#include "TextBuffer.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc Wed Feb 24 18:48:42 2010
@@ -29,12 +29,12 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
+#include "inktomi++.h"
#include "ink_platform.h"
+#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/* local includes */
-#include "inktomi++.h"
+
#include "CLIeventHandler.h"
#include "WebMgmtUtils.h"
#include "FileManager.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc Wed Feb 24 18:48:42 2010
@@ -29,13 +29,13 @@
*
****************************************************************************/
+#include "inktomi++.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/* system includes */
#include <stdio.h>
#include <stdlib.h>
/* local includes */
-#include "inktomi++.h"
#include "CLIeventHandler.h"
#include "Tokenizer.h"
#include "WebMgmtUtils.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc Wed Feb 24 18:48:42 2010
@@ -29,12 +29,12 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
+#include "inktomi++.h"
#include "ink_platform.h"
+#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/* local includes */
-#include "inktomi++.h"
+
#include "CLIeventHandler.h"
#include "Tokenizer.h"
#include "TextBuffer.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.cc Wed Feb 24 18:48:42 2010
@@ -28,12 +28,13 @@
*
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
#include "ink_platform.h"
+#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/* local includes */
-#include "inktomi++.h"
+
#include "DynArray.h"
#include "WebMgmtUtils.h"
#include "FileManager.h"
@@ -97,7 +98,7 @@
int
CLIlineBuffer::getLineSize()
{
- int i;
+ intptr_t i;
int line_size = 0;
for (i = 0; i < c_fields; i++)
@@ -110,7 +111,7 @@
int
CLIlineBuffer::getStringSize()
{
- int i;
+ intptr_t i;
int s_size = 0;
for (i = 0; i < c_fields; i++)
@@ -130,7 +131,7 @@
int
CLIlineBuffer::getDepth()
{
- int i;
+ intptr_t i;
int cdepth = 1;
int depth = 1;
int spdepth = 0;
@@ -212,7 +213,7 @@
int iters = 0;
static char *cptr = '\0';
bool done = false;
- int i;
+ intptr_t i;
// calculate output line buffer size
buf_size = buf_depth * (line_size + strlen("\n") + 1) + 1;
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.h?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.h Wed Feb 24 18:48:42 2010
@@ -40,7 +40,7 @@
{
private:
int n_fields; /* available number of fields */
- int c_fields; /* low water mark on used fields */
+ intptr_t c_fields; /* low water mark on used fields */
DynArray < const char *>*f_format; /* array of format fields */
DynArray < const char *>*o_string; /* array of output strings */
DynArray<int>*f_widths; /* array of field widths */
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc Wed Feb 24 18:48:42 2010
@@ -29,12 +29,12 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
+#include "inktomi++.h"
#include "ink_platform.h"
+#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/* local includes */
-#include "inktomi++.h"
+
#include "CLIeventHandler.h"
#include "WebMgmtUtils.h"
#include "WebOverview.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc Wed Feb 24 18:48:42 2010
@@ -29,7 +29,7 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
#include "ink_args.h"
#include "I_Version.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc Wed Feb 24 18:48:42 2010
@@ -28,9 +28,9 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
+#include "ink_config.h"
#include "ink_platform.h"
+#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/* local includes */
#include "FSM.h"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc?rev=915922&r1=915921&r2=915922&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc Wed Feb 24 18:48:42 2010
@@ -29,10 +29,7 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_args.h"
-#include "ink_sock.h"
+#include "inktomi++.h"
#include "Tokenizer.h"
#include "TextBuffer.h"
#include "CliUtils.h" /* cli_read_timeout(), cli_write_timeout(),GetTSDirectory() */
@@ -162,8 +159,11 @@
memset(&clientS, 0, sizeof(sockaddr_un));
clientS.sun_family = AF_UNIX; // UNIX domain socket
ink_strncpy(clientS.sun_path, sockPath, sizeof(clientS.sun_path));
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+ sockaddrLen = sizeof(sockaddr_un);
+#else
sockaddrLen = sizeof(clientS.sun_family) + strlen(clientS.sun_path);;
-
+#endif
// make socket non-blocking
if (safe_nonblocking(socketFD) < 0) {
fprintf(stderr, "Unable to set non-blocking flags on socket : %s\n", strerror(errno));