Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
b2d76953
Commit
b2d76953
authored
11 years ago
by
Monty Brandenberg
Browse files
Options
Downloads
Patches
Plain Diff
Code review updates. All comments so far.
parent
d191585a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llcommon/lldeadmantimer.h
+4
-6
4 additions, 6 deletions
indra/llcommon/lldeadmantimer.h
indra/llmessage/llcurl.cpp
+1
-1
1 addition, 1 deletion
indra/llmessage/llcurl.cpp
with
5 additions
and
7 deletions
indra/llcommon/lldeadmantimer.h
+
4
−
6
View file @
b2d76953
...
@@ -155,11 +155,9 @@ class LL_COMMON_API LLDeadmanTimer
...
@@ -155,11 +155,9 @@ class LL_COMMON_API LLDeadmanTimer
///
///
void
ringBell
(
time_type
now
,
unsigned
int
count
);
void
ringBell
(
time_type
now
,
unsigned
int
count
);
/// Checks on the status of the timer Declare that something interesting happened. This has two
/// Checks the status of the timer. If the timer has expired,
/// effects on an unexpired-timer. 1) The expiration time
/// also returns various timer-related stats. Unlike ringBell(),
/// is extended for 'horizon' seconds after the 'now' value.
/// does not extend the horizon, it only checks for expiration.
/// 2) An internal counter associated with the event is incremented.
/// This count is returned via the @see isExpired() method.
///
///
/// @param now Current time as returned by @see
/// @param now Current time as returned by @see
/// LLTimer::getCurrentClockCount(). If zero,
/// LLTimer::getCurrentClockCount(). If zero,
...
@@ -192,7 +190,7 @@ class LL_COMMON_API LLDeadmanTimer
...
@@ -192,7 +190,7 @@ class LL_COMMON_API LLDeadmanTimer
bool
isExpired
(
time_type
now
,
F64
&
started
,
F64
&
stopped
,
U64
&
count
,
bool
isExpired
(
time_type
now
,
F64
&
started
,
F64
&
stopped
,
U64
&
count
,
U64
&
user_cpu
,
U64
&
sys_cpu
);
U64
&
user_cpu
,
U64
&
sys_cpu
);
/// Identical to the six-arugment form except i
s
does without the
/// Identical to the six-arugment form except i
t
does without the
/// CPU time return if the caller isn't interested in it.
/// CPU time return if the caller isn't interested in it.
bool
isExpired
(
time_type
now
,
F64
&
started
,
F64
&
stopped
,
U64
&
count
);
bool
isExpired
(
time_type
now
,
F64
&
started
,
F64
&
stopped
,
U64
&
count
);
...
...
This diff is collapsed.
Click to expand it.
indra/llmessage/llcurl.cpp
+
1
−
1
View file @
b2d76953
...
@@ -296,7 +296,7 @@ LLCurl::Easy* LLCurl::Easy::getEasy()
...
@@ -296,7 +296,7 @@ LLCurl::Easy* LLCurl::Easy::getEasy()
// Enable a brief cache period for now. This was zero for the longest time
// Enable a brief cache period for now. This was zero for the longest time
// which caused some routers grief and generated unneeded traffic. For the
// which caused some routers grief and generated unneeded traffic. For the
// threded resolver, we're using system resolution libraries and non-zero values
// thre
a
ded resolver, we're using system resolution libraries and non-zero values
// are preferred. The c-ares resolver is another matter and it might not
// are preferred. The c-ares resolver is another matter and it might not
// track server changes as well.
// track server changes as well.
CURLcode
result
=
curl_easy_setopt
(
easy
->
mCurlEasyHandle
,
CURLOPT_DNS_CACHE_TIMEOUT
,
15
);
CURLcode
result
=
curl_easy_setopt
(
easy
->
mCurlEasyHandle
,
CURLOPT_DNS_CACHE_TIMEOUT
,
15
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment