You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/11/23 00:24:39 UTC
svn commit: r1037937 - in /trafficserver/traffic/trunk:
libinktomi++/Allocator.cc libinktomi++/Resource.cc
libinktomi++/ink_thread.h proxy/Stuffer.cc proxy/StufferUdpReceiver.cc
proxy/signals.cc
Author: zwoop
Date: Mon Nov 22 23:24:38 2010
New Revision: 1037937
URL: http://svn.apache.org/viewvc?rev=1037937&view=rev
Log:
Small cleanup on vxworks remnants
Modified:
trafficserver/traffic/trunk/libinktomi++/Allocator.cc
trafficserver/traffic/trunk/libinktomi++/Resource.cc
trafficserver/traffic/trunk/libinktomi++/ink_thread.h
trafficserver/traffic/trunk/proxy/Stuffer.cc
trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc
trafficserver/traffic/trunk/proxy/signals.cc
Modified: trafficserver/traffic/trunk/libinktomi++/Allocator.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Allocator.cc?rev=1037937&r1=1037936&r2=1037937&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Allocator.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/Allocator.cc Mon Nov 22 23:24:38 2010
@@ -41,58 +41,3 @@ Allocator::Allocator(const char *name, u
ink_freelist_init(&fl, name, element_size, chunk_size, 0, alignment);
#endif
}
-
-#ifdef USE_PARTITION_MEMORY /* VxWorks */
-
-PART_ID uts_part_id = NULL;
-
-void
-partfree(void *ptr)
-{
- memPartFree(uts_part_id, (char *) ptr);
-}
-
-void *
-partmalloc(unsigned int size)
-{
- char *mem;
- if (NULL == uts_part_id) {
- if (NULL == (uts_part_id = memPartCreate("uTSmem", 10000000))) {
- fprintf(stderr, "[TS]: main: Unable to allocate Memory pool(%d bytes)\n", 10000000);
- return NULL;
- }
- memPartOptionsSet(uts_part_id, MEM_ALLOC_ERROR_LOG_FLAG
- | MEM_ALLOC_ERROR_SUSPEND_FLAG |
- MEM_BLOCK_ERROR_LOG_FLAG | MEM_BLOCK_ERROR_SUSPEND_FLAG | MEM_BLOCK_CHECK);
-
- /*fprintf(stdout,"[TS]: main: create memory pool, armMemPartitionId=%x\n", uts_part_id); */
- }
-
- mem = (char *) memPartAlloc(uts_part_id, size);
- return mem;
-}
-
-void *
-partrealloc(void *ptr, unsigned int size)
-{
- char *mem;
-
- mem = (char *) memPartRealloc(uts_part_id, (char *) ptr, size);
- return mem;
-}
-
-void *
-partstrdup(const char *str, int length)
-{
- char *mem;
-
- if (length == -1) {
- mem = (char *) memPartAlloc(uts_part_id, strlen(str) + 1);
- strcpy(mem, str);
- } else {
- mem = (char *) memPartAlloc(uts_part_id, length);
- strncpy(mem, str, length);
- }
- return mem;
-}
-#endif /* PARTITION_MEMORY */
Modified: trafficserver/traffic/trunk/libinktomi++/Resource.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Resource.cc?rev=1037937&r1=1037936&r2=1037937&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Resource.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/Resource.cc Mon Nov 22 23:24:38 2010
@@ -63,38 +63,4 @@ void operator delete[] (void *p)
_xfree(p);
}
-#elif defined(USE_PARTITION_MEMORY) /* VxWorks */
-
-/*-------------------------------------------------------------------------
- -------------------------------------------------------------------------*/
-void *operator
-new(size_t size)
-{
- return xmalloc((unsigned int) size);
-}
-
-/*-------------------------------------------------------------------------
- -------------------------------------------------------------------------*/
-
-void operator
-delete(void *p)
-{
- xfree(p);
-}
-
-/*-------------------------------------------------------------------------
- -------------------------------------------------------------------------*/
-void *operator new[] (size_t size)
-{
- return xmalloc((unsigned int) size);
-}
-
-/*-------------------------------------------------------------------------
- -------------------------------------------------------------------------*/
-
-void operator delete[] (void *p)
-{
- xfree(p);
-}
-
#endif /* TRACK_MEMORY */
Modified: trafficserver/traffic/trunk/libinktomi++/ink_thread.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_thread.h?rev=1037937&r1=1037936&r2=1037937&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_thread.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_thread.h Mon Nov 22 23:24:38 2010
@@ -34,7 +34,6 @@
#include "ink_hrtime.h"
#include <sched.h>
-// #define DEBUG_VXWORKS
//////////////////////////////////////////////////////////////////////////////
//
Modified: trafficserver/traffic/trunk/proxy/Stuffer.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Stuffer.cc?rev=1037937&r1=1037936&r2=1037937&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Stuffer.cc (original)
+++ trafficserver/traffic/trunk/proxy/Stuffer.cc Mon Nov 22 23:24:38 2010
@@ -50,7 +50,6 @@ connAllowed(uint32 ip)
struct StufferAccepter:Continuation
{
-
StufferAccepter():Continuation(NULL)
{
SET_HANDLER(&StufferAccepter::mainEvent);
@@ -84,20 +83,15 @@ readIPs(ParentRecord * parentRec, uint32
return 0;
int n = 0;
-
pRecord *pr = parentRec->parents;
int n_parents = parentRec->num_parents;
for (int i = 0; i < n_parents && n < max; i++) {
-
-#if !defined(VxWorks)
ink_gethostbyname_r_data data;
+
struct hostent *ent = ink_gethostbyname_r(pr[i].hostname, &data);
if (ent)
ip_arr[n++] = *(uint32 *) ent->h_addr_list[0];
-#else
- ip_arr[n++] = inet_addr(pr[i].hostname);
-#endif
}
return n;
@@ -147,17 +141,9 @@ StufferInitialize(void)
int stuffer_port;
ReadConfigInteger(stuffer_port, proxy_config_stuffer_port);
-
Debug("stuffer", "stuffer initialized (port = %d%s)", stuffer_port, stuffer_port ? "" : " accept disabled");
-
buildParentIPTable();
-#ifdef VxWorks
- extern void *ts_udp_receiver(void *);
- Debug("stuffer", "starting udp listener");
- ink_thread_create(ts_udp_receiver, (void *) stuffer_port);
-#endif
-
if (stuffer_port > 0)
netProcessor.main_accept(NEW(new StufferAccepter), NO_FD, stuffer_port);
}
@@ -183,6 +169,7 @@ inline int
StufferCacheWriter::addData(int max)
{
int nwritten = buf->write(stuffer->reader, max);
+
nadded += nwritten;
return nwritten;
}
@@ -379,8 +366,7 @@ StufferCacheWriter::initCacheLookupConfi
HttpConfigParams *http_config_params = HttpConfig::acquire();
cache_lookup_config.cache_global_user_agent_header = http_config_params->global_user_agent_header ? true : false;
- cache_lookup_config.cache_enable_default_vary_headers =
- http_config_params->cache_enable_default_vary_headers ? true : false;
+ cache_lookup_config.cache_enable_default_vary_headers = http_config_params->cache_enable_default_vary_headers ? true : false;
cache_lookup_config.cache_vary_default_text = http_config_params->cache_vary_default_text;
cache_lookup_config.cache_vary_default_images = http_config_params->cache_vary_default_images;
cache_lookup_config.cache_vary_default_other = http_config_params->cache_vary_default_other;
@@ -435,7 +421,6 @@ responseIsNewer(HTTPHdr * old_resp, HTTP
int
StufferCacheWriter::mainEvent(int event, void *data)
{
-
switch (event) {
case VC_EVENT_READ_COMPLETE:{
Modified: trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc?rev=1037937&r1=1037936&r2=1037937&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc (original)
+++ trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc Mon Nov 22 23:24:38 2010
@@ -67,7 +67,7 @@ static int number_of_packets_dropped = 0
static int number_of_connections_to_ts = 0;
static int number_of_timeouts = 0;
-/*this functions should be a signal handler on OSs other than VxWorks*/
+/* TODO: this functions should be a signal handler ... */
int
stufferUdpStatShow()
{
Modified: trafficserver/traffic/trunk/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.cc?rev=1037937&r1=1037936&r2=1037937&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.cc (original)
+++ trafficserver/traffic/trunk/proxy/signals.cc Mon Nov 22 23:24:38 2010
@@ -239,7 +239,6 @@ static void
child_signal_handler(int sig)
{
(void) sig;
-/* No forked children in VxWorks */
int pid;
int saved_errno = errno;
while ((pid = waitpid(-1, 0, WNOHANG)) > 0) {