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/08/04 01:22:19 UTC
svn commit: r982075 - in /trafficserver/traffic/trunk: ./ iocore/cluster/
proxy/ proxy/http2/ proxy/http2/remap/ proxy/logging/
Author: zwoop
Date: Tue Aug 3 23:22:18 2010
New Revision: 982075
URL: http://svn.apache.org/viewvc?rev=982075&view=rev
Log:
TS-400 Checkpoint 8 in cleanup.
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc
trafficserver/traffic/trunk/iocore/cluster/ClusterRPC.cc
trafficserver/traffic/trunk/proxy/ICP.h
trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc
trafficserver/traffic/trunk/proxy/http2/HttpPages.cc
trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
trafficserver/traffic/trunk/proxy/http2/HttpSessionManager.cc
trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.h
trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.h
trafficserver/traffic/trunk/proxy/logging/LogAccess.h
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Tue Aug 3 23:22:18 2010
@@ -446,18 +446,20 @@ case $host_os in
#
# 111 is "statement is unrecahable"
# 279 is "controlling expression is constant", triggered by our asserts
+ # 383 is "value copied to temporary, reference to temporary used"
# 444 is "destructor for base class is not virtual"
# 522 is "function "xyz" redeclared "inline" after being called
# 873 is "has no corresponding operator delete". ToDo: we should fix.
# 981 is "operands are evaluated in unspecified order"
# 1418 is "external function definition with no prior declaration"
# 1419 is "external declaration in primary source file"
+ # 1572 is "floating-point equality and inequality comparisons are unreliable"
# 1720 is "operator new" has no corresponding member operator delete"
# 2256 is "non-pointer conversion from "int" to "unsigned char" "
# 2259 is "non-pointer conversion from "int" to "unsigned char" "
#
# TODO: We should try to eliminate more of these -wd exclusions.
- common_opt="-pipe -Wall -wd111 -wd279 -wd522 -wd444 -wd873 -wd981 -wd1418 -wd1419 -wd1720 -wd2256 -wd2259"
+ common_opt="-pipe -Wall -wd111 -wd279 -wd383 -wd522 -wd444 -wd873 -wd981 -wd1418 -wd1419 -wd1572 -wd1720 -wd2256 -wd2259"
debug_opt="-ggdb3 $common_opt"
release_opt="-g $common_opt -O2 -axsse4.2 -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc Tue Aug 3 23:22:18 2010
@@ -3057,7 +3057,6 @@ ClusterHandler::do_open_local_requests()
// It is here where we process the open_local requests within the
// ET_CLUSTER thread.
//
- int res;
int pending_request = 0;
ClusterVConnection *cvc;
ClusterVConnection *cvc_ext;
@@ -3087,7 +3086,7 @@ ClusterHandler::do_open_local_requests()
while ((cvc = local_incoming_open_local.pop())) {
MUTEX_TRY_LOCK(lock, cvc->action_.mutex, tt);
if (lock) {
- if ((res = cvc->start(tt)) < 0) {
+ if (cvc->start(tt) < 0) {
cvc->token.clear();
if (cvc->action_.continuation) {
cvc->action_.continuation->handleEvent(CLUSTER_EVENT_OPEN_FAILED, 0);
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterRPC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterRPC.cc?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterRPC.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterRPC.cc Tue Aug 3 23:22:18 2010
@@ -294,6 +294,7 @@ set_channel_pin_ClusterFunction(ClusterM
void
post_setchan_pin_ClusterFunction(ClusterMachine * to, void *data, int len)
{
+ NOWARN_UNUSED(len);
EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
// We are called on the ET_CLUSTER thread.
Modified: trafficserver/traffic/trunk/proxy/ICP.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.h?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.h (original)
+++ trafficserver/traffic/trunk/proxy/ICP.h Tue Aug 3 23:22:18 2010
@@ -1225,14 +1225,15 @@ typedef int (*PluginFreshnessCalcFunc) (
extern PluginFreshnessCalcFunc pluginFreshnessCalcFunc;
inline void *
- ICPRequestCont::operator
+ICPRequestCont::operator
new(size_t size, void *mem)
{
+ NOWARN_UNUSED(size);
return mem;
}
inline void
- ICPRequestCont::operator
+ICPRequestCont::operator
delete(void *mem)
{
ICPRequestCont_allocator.free((ICPRequestCont *) mem);
Modified: trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc Tue Aug 3 23:22:18 2010
@@ -54,6 +54,7 @@ HttpMessageBody::MakeErrorBodyVA(int64 m
const HttpConfigParams * config,
HTTPStatus status_code, const char *reason, const char *format, va_list va)
{
+ NOWARN_UNUSED(config);
char *p, *outbuf = NULL;
char error_title[128];
int pass;
Modified: trafficserver/traffic/trunk/proxy/http2/HttpPages.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpPages.cc?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpPages.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpPages.cc Tue Aug 3 23:22:18 2010
@@ -275,7 +275,7 @@ HttpPagesHandler::dump_sm(HttpSM * sm)
int
HttpPagesHandler::handle_smdetails(int event, void *data)
{
-
+ NOWARN_UNUSED(data);
EThread *ethread = this_ethread();
HttpSM *sm = NULL;
@@ -352,7 +352,7 @@ HttpPagesHandler::handle_smdetails(int e
int
HttpPagesHandler::handle_smlist(int event, void *data)
{
-
+ NOWARN_UNUSED(data);
EThread *ethread = this_ethread();
HttpSM *sm;
@@ -433,6 +433,8 @@ HttpPagesHandler::handle_smlist(int even
int
HttpPagesHandler::handle_callback(int event, void *edata)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(edata);
MUTEX_TRY_LOCK(trylock, action.mutex, this_ethread());
if (!trylock) {
SET_HANDLER(&HttpPagesHandler::handle_callback);
Modified: trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc Tue Aug 3 23:22:18 2010
@@ -65,7 +65,7 @@ http_dump()
return;
}
#endif
-struct DumpStats:Continuation
+struct DumpStats: public Continuation
{
int mainEvent(int event, void *e)
{
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Tue Aug 3 23:22:18 2010
@@ -463,6 +463,8 @@ HttpSM::init()
int
HttpSM::connection_collapsing_piggyback_handler(int event, void *data)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(data);
Debug("http_track", "HttpSM:connection_collapsing_piggyback_handler[%d]\n", sm_id);
call_transact_and_set_next_state(&HttpTransact::DecideCacheLookup);
return 0;
@@ -539,7 +541,7 @@ HttpSM::do_api_callout()
int
HttpSM::state_add_to_list(int event, void *data)
{
-
+ NOWARN_UNUSED(data);
// The list if for stat pages and general debugging
// The config variable exists mostly to allow us to
// measure an performance drop during benchmark runs
@@ -567,7 +569,7 @@ HttpSM::state_add_to_list(int event, voi
int
HttpSM::state_remove_from_list(int event, void *data)
{
-
+ NOWARN_UNUSED(data);
// The config parameters are guranteed not change
// across the life of a transaction so it safe to
// check the config here and use it detrmine
@@ -595,7 +597,8 @@ HttpSM::state_remove_from_list(int event
int
HttpSM::kill_this_async_hook(int event, void *data)
{
-
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(data);
// In the base HttpSM, we don't have anything to
// do here. subclasses can overide this function
// to do their own asyncronous cleanup
@@ -730,7 +733,6 @@ HttpSM::state_read_client_request_header
ink_assert(server_session == NULL);
int bytes_used = 0;
- int return_val = EVENT_CONT;
ink_assert(ua_entry->eos == false);
@@ -789,12 +791,10 @@ HttpSM::state_read_client_request_header
http_parser_clear(&http_parser);
ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
milestones.ua_read_header_done = ink_get_hrtime();
- return_val = EVENT_DONE;
}
switch (state) {
case PARSE_ERROR:
-
Debug("http", "[%lld] error parsing client request header", sm_id);
// Disable further I/O on the client
@@ -2403,8 +2403,6 @@ HttpSM::state_icp_lookup(int event, void
int
HttpSM::state_cache_open_write(int event, void *data)
{
-
- VConnection *write_vc;
STATE_ENTER(&HttpSM:state_cache_open_write, event);
// milestones.cache_open_write_end = ink_get_hrtime();
pending_action = NULL;
@@ -2415,7 +2413,6 @@ STATE_ENTER(&HttpSM:state_cache_open_wri
//////////////////////////////
// OPEN WRITE is successful //
//////////////////////////////
- write_vc = (VConnection *) data;
t_state.cache_info.write_lock_state = HttpTransact::CACHE_WL_SUCCESS;
break;
@@ -3412,6 +3409,7 @@ HttpSM::tunnel_handler_post_ua(int event
int
HttpSM::tunnel_handler_for_partial_post(int event, void *data)
{
+ NOWARN_UNUSED(data);
STATE_ENTER(&HttpSM::tunnel_handler_for_partial_post, event);
tunnel.deallocate_buffers();
tunnel.reset();
@@ -3793,6 +3791,7 @@ HttpSM::state_srv_lookup(int event, void
int
HttpSM::state_remap_request(int event, void *data)
{
+ NOWARN_UNUSED(data);
STATE_ENTER(&HttpSM::state_remap_request, event);
switch (event) {
@@ -6248,18 +6247,11 @@ HttpSM::setup_push_transfer_to_cache()
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::tunnel_handler_push);
- HttpTunnelProducer *p = tunnel.add_producer(ua_entry->vc,
- nbytes,
- buf_start,
- &HttpSM::tunnel_handler_ua_push,
- HT_HTTP_CLIENT,
- "user_agent");
-
- NOWARN_UNUSED(p);
-
+ // TODO: Should we do something with the HttpTunnelProducer* returned?
+ tunnel.add_producer(ua_entry->vc, nbytes, buf_start, &HttpSM::tunnel_handler_ua_push,
+ HT_HTTP_CLIENT, "user_agent");
setup_cache_write_transfer(&cache_sm, ua_entry->vc, &t_state.cache_info.object_store, 0, "cache write");
-
ua_entry->in_tunnel = true;
}
@@ -7410,6 +7402,7 @@ void HttpSM::set_http_schedule(Continuat
int HttpSM::get_http_schedule(int event, void * data)
{
+ NOWARN_UNUSED(data);
bool plugin_lock;
Ptr <ProxyMutex> plugin_mutex;
if (schedule_cont->mutex) {
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSessionManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSessionManager.cc?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSessionManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSessionManager.cc Tue Aug 3 23:22:18 2010
@@ -168,7 +168,7 @@ HSMresult_t
HttpSessionManager::acquire_session(Continuation * cont, unsigned int ip, int port,
const char *hostname, HttpClientSession * ua_session, HttpSM * sm)
{
-
+ NOWARN_UNUSED(cont);
HttpServerSession *to_return = NULL;
// We compute the mmh for matching the hostname as the last
Modified: trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.h?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.h Tue Aug 3 23:22:18 2010
@@ -39,7 +39,7 @@
/**
* A class that represents a queue of plugins to run
**/
-struct RemapPlugins:Continuation
+struct RemapPlugins: public Continuation
{
unsigned int _cur;
UrlMappingContainer *_map_container;
Modified: trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.h?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.h Tue Aug 3 23:22:18 2010
@@ -39,7 +39,7 @@
class url_mapping;
-class RemapProcessor:Processor
+class RemapProcessor: public Processor
{
public:
Modified: trafficserver/traffic/trunk/proxy/logging/LogAccess.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogAccess.h?rev=982075&r1=982074&r2=982075&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogAccess.h (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogAccess.h Tue Aug 3 23:22:18 2010
@@ -320,9 +320,9 @@ public:
static int strlen(char *str);
public:
- inkcoreapi void static marshal_int(char *dest, int64 source);
- inkcoreapi void static marshal_str(char *dest, const char *source, int padded_len);
- inkcoreapi void static marshal_mem(char *dest, const char *source, int actual_len, int padded_len);
+ inkcoreapi static void marshal_int(char *dest, int64 source);
+ inkcoreapi static void marshal_str(char *dest, const char *source, int padded_len);
+ inkcoreapi static void marshal_mem(char *dest, const char *source, int actual_len, int padded_len);
bool initialized;