You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sj...@apache.org on 2010/05/24 19:36:05 UTC
svn commit: r947725 - in /trafficserver/traffic/trunk: proxy/StatSystemV2.cc
proxy/http2/HttpConfig.cc proxy/http2/HttpSM.cc test/deft/proc_manager.cc
Author: sjiang
Date: Mon May 24 17:36:04 2010
New Revision: 947725
URL: http://svn.apache.org/viewvc?rev=947725&view=rev
Log:
TS-215: fix unsupported %b[width] flags in format strings
These used to be supported by the ink_*printf implementation, but no longer work since
we switched to standard *printf
Modified:
trafficserver/traffic/trunk/proxy/StatSystemV2.cc
trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
trafficserver/traffic/trunk/test/deft/proc_manager.cc
Modified: trafficserver/traffic/trunk/proxy/StatSystemV2.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatSystemV2.cc?rev=947725&r1=947724&r2=947725&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatSystemV2.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatSystemV2.cc Mon May 24 17:36:04 2010
@@ -562,7 +562,7 @@ void StatCollectorContinuation::setReadT
StatCollectorContinuation::StatCollectorContinuation() : Continuation(NULL)
{
- Debug("http", "YTS start time : %b64d", StatCollectorContinuation::_startTime);
+ Debug("http", "YTS start time : %lld", (long long) StatCollectorContinuation::_startTime);
SET_HANDLER(&StatCollectorContinuation::mainEvent);
statsCommandThread = INKThreadCreate(commandListen, &_statCommandPort);
}
Modified: trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc?rev=947725&r1=947724&r2=947725&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc Mon May 24 17:36:04 2010
@@ -1985,7 +1985,7 @@ HttpConfig::cluster_delta_cb(void *opaqu
// really ought to atomic. However, any risk of bogus time is
// too ugly for me to contemplate
old = ink_atomic_swap(&HttpConfig::m_master.cluster_time_delta, delta32);
- Debug("http_trans", "Cluster time delta moving from %b32d to %b32d", old, delta32);
+ Debug("http_trans", "Cluster time delta moving from %d to %d", old, delta32);
return NULL;
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=947725&r1=947724&r2=947725&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Mon May 24 17:36:04 2010
@@ -1463,7 +1463,7 @@ HttpSM::state_api_callout(int event, voi
if(prev_hook_stats_enabled && prev_hook_start_time) {
INK64 time_in_plugin_ms = (curr_time - prev_hook_start_time)/1000000;
prev_hook_stats.inc(time_in_plugin_ms);
- Debug("http", "[%b64d] Time spent in plugin %s = %b64d",
+ Debug("http", "[%lld] Time spent in plugin %s = %lld",
sm_id, HttpDebugNames::get_api_hook_name(cur_hook_id), time_in_plugin_ms);
}
@@ -1552,7 +1552,7 @@ HttpSM::state_api_callout(int event, voi
// Handle last plugin on current state
if(prev_hook_stats_enabled && prev_hook_start_time) {
INK64 time_in_plugin_ms = (INKhrtime() - prev_hook_start_time)/1000000;
- Debug("http", "[%b64d] Last plugin : Time spent : %s %b64d",
+ Debug("http", "[%lld] Last plugin : Time spent : %s %lld",
sm_id, HttpDebugNames::get_api_hook_name(cur_hook_id), time_in_plugin_ms);
prev_hook_stats.inc(time_in_plugin_ms);
}
Modified: trafficserver/traffic/trunk/test/deft/proc_manager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/proc_manager.cc?rev=947725&r1=947724&r2=947725&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/proc_manager.cc (original)
+++ trafficserver/traffic/trunk/test/deft/proc_manager.cc Mon May 24 17:36:04 2010
@@ -1233,7 +1233,7 @@ NetCmdHandler::process_stat_file_cmd(Raf
reply(3) = strdup(num_buf);
reply(4) = strdup("mod_date");
- snprintf(num_buf, 63, "%b32d", (uint32) stat_info.st_mtime);
+ snprintf(num_buf, 63, "%d", (uint32) stat_info.st_mtime);
num_buf[63] = '\0';
reply(5) = strdup(num_buf);