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/10/17 16:24:00 UTC
svn commit: r1023504 - in /trafficserver/traffic/trunk:
iocore/eventsystem/I_Thread.h libinktomi++/Allocator.h libinktomi++/Arena.h
proxy/hdrs/MIME.cc proxy/http2/HttpSM.cc
Author: zwoop
Date: Sun Oct 17 14:24:00 2010
New Revision: 1023504
URL: http://svn.apache.org/viewvc?rev=1023504&view=rev
Log:
Tiny cleanup, last remnants of VxWorks.
Modified:
trafficserver/traffic/trunk/iocore/eventsystem/I_Thread.h
trafficserver/traffic/trunk/libinktomi++/Allocator.h
trafficserver/traffic/trunk/libinktomi++/Arena.h
trafficserver/traffic/trunk/proxy/hdrs/MIME.cc
trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_Thread.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_Thread.h?rev=1023504&r1=1023503&r2=1023504&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_Thread.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_Thread.h Sun Oct 17 14:24:00 2010
@@ -114,23 +114,23 @@ public:
// PRIVATE
void set_specific();
- Thread();
- virtual ~ Thread();
+ Thread();
+ virtual ~ Thread();
static ink_hrtime cur_time;
inkcoreapi static ink_thread_key thread_data_key;
- Ptr<ProxyMutex> mutex_ptr;
+ Ptr<ProxyMutex> mutex_ptr;
private:
// prevent unauthorized copies (Not implemented)
- Thread(const Thread &);
- Thread & operator =(const Thread &);
+ Thread(const Thread &);
+ Thread & operator =(const Thread &);
public:
void start(ThreadFunction f = NULL, void *a = NULL, size_t stacksize = 0);
+
virtual void execute()
- {
- }
+ { }
};
TS_INLINE ink_hrtime ink_get_hrtime();
Modified: trafficserver/traffic/trunk/libinktomi++/Allocator.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Allocator.h?rev=1023504&r1=1023503&r2=1023504&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Allocator.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/Allocator.h Sun Oct 17 14:24:00 2010
@@ -219,8 +219,7 @@ Allocator::free_void(void *ptr)
#endif
}
#else
-// no freelist
-// no freelist, non WIN32 platform, vxworks platform
+// no freelist, non WIN32 platform
inline void *
Allocator::alloc_void()
{
Modified: trafficserver/traffic/trunk/libinktomi++/Arena.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Arena.h?rev=1023504&r1=1023503&r2=1023504&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Arena.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/Arena.h Sun Oct 17 14:24:00 2010
@@ -26,9 +26,7 @@
#include <sys/types.h>
-#if !defined (VxWorks)
#include <memory.h>
-#endif
#include "ink_assert.h"
Modified: trafficserver/traffic/trunk/proxy/hdrs/MIME.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/MIME.cc?rev=1023504&r1=1023503&r2=1023504&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/MIME.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/MIME.cc Sun Oct 17 14:24:00 2010
@@ -945,13 +945,7 @@ mime_init_date_format_table()
int i, now_days, first_days, last_days, num_days;
int m=0, d=0, y=0;
-#if defined (VxWorks)
- struct timeval tv;
- gettimeofday(&tv);
- now_secs = tv.tv_sec;
-#else /* !VxWorks */
time(&now_secs);
-#endif /* !VxWorks */
now_days = (int) (now_secs / (60 * 60 * 24));
first_days = now_days - 366;
last_days = now_days + 366;
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=1023504&r1=1023503&r2=1023504&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Sun Oct 17 14:24:00 2010
@@ -2139,11 +2139,12 @@ HttpSM::process_hostdb_info(HostDBInfo *
milestones.dns_lookup_end = ink_get_hrtime();
- if (t_state.api_txn_dns_timeout_value != -1) {
- int foo = (int) (milestone_difference_msec(milestones.dns_lookup_begin, milestones.dns_lookup_end));
- Debug("http_timeout", "DNS took: %d msec", foo);
+ if (is_debug_tag_set("http_timeout")) {
+ if (t_state.api_txn_dns_timeout_value != -1) {
+ int foo = (int) (milestone_difference_msec(milestones.dns_lookup_begin, milestones.dns_lookup_end));
+ Debug("http_timeout", "DNS took: %d msec", foo);
+ }
}
-
}
//////////////////////////////////////////////////////////////////////////////