Code review updates. All comments so far.

Mon, 18 Nov 2013 13:33:19 -0500

author
Monty Brandenberg <monty@lindenlab.com>
date
Mon, 18 Nov 2013 13:33:19 -0500
changeset 40737
c55d1d91d904
parent 40735
c7ea0015ea29
child 40738
f0b6756e6e0b

Code review updates. All comments so far.

indra/llcommon/lldeadmantimer.h file | annotate | diff | revisions
indra/llmessage/llcurl.cpp file | annotate | diff | revisions
     1.1 --- a/indra/llcommon/lldeadmantimer.h	Tue Nov 12 14:06:38 2013 -0500
     1.2 +++ b/indra/llcommon/lldeadmantimer.h	Mon Nov 18 13:33:19 2013 -0500
     1.3 @@ -155,11 +155,9 @@
     1.4  	///
     1.5  	void ringBell(time_type now, unsigned int count);
     1.6  	
     1.7 -	/// Checks on the status of the timer Declare that something interesting happened.  This has two
     1.8 -	/// effects on an unexpired-timer.  1)  The expiration time
     1.9 -	/// is extended for 'horizon' seconds after the 'now' value.
    1.10 -	/// 2)  An internal counter associated with the event is incremented.
    1.11 -	/// This count is returned via the @see isExpired() method.
    1.12 +	/// Checks the status of the timer.  If the timer has expired,
    1.13 +	/// also returns various timer-related stats.  Unlike ringBell(),
    1.14 +	/// does not extend the horizon, it only checks for expiration.
    1.15  	///
    1.16  	/// @param now		Current time as returned by @see
    1.17  	///					LLTimer::getCurrentClockCount().  If zero,
    1.18 @@ -192,7 +190,7 @@
    1.19  	bool isExpired(time_type now, F64 & started, F64 & stopped, U64 & count,
    1.20  				   U64 & user_cpu, U64 & sys_cpu);
    1.21  
    1.22 -	/// Identical to the six-arugment form except is does without the
    1.23 +	/// Identical to the six-arugment form except it does without the
    1.24  	/// CPU time return if the caller isn't interested in it.
    1.25  	bool isExpired(time_type now, F64 & started, F64 & stopped, U64 & count);
    1.26  
     2.1 --- a/indra/llmessage/llcurl.cpp	Tue Nov 12 14:06:38 2013 -0500
     2.2 +++ b/indra/llmessage/llcurl.cpp	Mon Nov 18 13:33:19 2013 -0500
     2.3 @@ -296,7 +296,7 @@
     2.4  	
     2.5  	// Enable a brief cache period for now.  This was zero for the longest time
     2.6  	// which caused some routers grief and generated unneeded traffic.  For the
     2.7 -	// threded resolver, we're using system resolution libraries and non-zero values
     2.8 +	// threaded resolver, we're using system resolution libraries and non-zero values
     2.9  	// are preferred.  The c-ares resolver is another matter and it might not
    2.10  	// track server changes as well.
    2.11  	CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 15);

mercurial