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
cc2c426e
Commit
cc2c426e
authored
12 years ago
by
Nat Goodspeed
Browse files
Options
Downloads
Plain Diff
merge changes for BUG-768
parents
68fffbc5
87b4386a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.hgtags
+1
-0
1 addition, 0 deletions
.hgtags
indra/llcorehttp/_httpinternal.h
+9
-1
9 additions, 1 deletion
indra/llcorehttp/_httpinternal.h
indra/llcorehttp/examples/http_texture_load.cpp
+5
-1
5 additions, 1 deletion
indra/llcorehttp/examples/http_texture_load.cpp
with
15 additions
and
2 deletions
.hgtags
+
1
−
0
View file @
cc2c426e
...
@@ -370,3 +370,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246
...
@@ -370,3 +370,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246
f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230
f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230
b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255
b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255
965b9a35e260c0f53be1a25f0db7abc8a67eaf47 DRTVWR-252
965b9a35e260c0f53be1a25f0db7abc8a67eaf47 DRTVWR-252
bb10adc4f76cf0067fca7075146f00cdc0740e9d DRTVWR-251
This diff is collapsed.
Click to expand it.
indra/llcorehttp/_httpinternal.h
+
9
−
1
View file @
cc2c426e
...
@@ -111,7 +111,15 @@ const int HTTP_TRACE_MIN = HTTP_TRACE_OFF;
...
@@ -111,7 +111,15 @@ const int HTTP_TRACE_MIN = HTTP_TRACE_OFF;
const
int
HTTP_TRACE_MAX
=
HTTP_TRACE_CURL_BODIES
;
const
int
HTTP_TRACE_MAX
=
HTTP_TRACE_CURL_BODIES
;
// Request retry limits
// Request retry limits
const
int
HTTP_RETRY_COUNT_DEFAULT
=
5
;
//
// At a minimum, retries need to extend past any throttling
// window we're expecting from central services. In the case
// of Linden services running through the caps routers, there's
// a five-second or so window for throttling with some spillover.
// We want to span a few windows to allow transport to slow
// after onset of the throttles and then recover without a final
// failure. Other systems may need other constants.
const
int
HTTP_RETRY_COUNT_DEFAULT
=
8
;
const
int
HTTP_RETRY_COUNT_MIN
=
0
;
const
int
HTTP_RETRY_COUNT_MIN
=
0
;
const
int
HTTP_RETRY_COUNT_MAX
=
100
;
const
int
HTTP_RETRY_COUNT_MAX
=
100
;
...
...
This diff is collapsed.
Click to expand it.
indra/llcorehttp/examples/http_texture_load.cpp
+
5
−
1
View file @
cc2c426e
...
@@ -153,6 +153,7 @@ class Metrics
...
@@ -153,6 +153,7 @@ class Metrics
//
//
int
main
(
int
argc
,
char
**
argv
)
int
main
(
int
argc
,
char
**
argv
)
{
{
LLCore
::
HttpStatus
status
;
bool
do_random
(
false
);
bool
do_random
(
false
);
bool
do_verbose
(
false
);
bool
do_verbose
(
false
);
...
@@ -215,6 +216,9 @@ int main(int argc, char** argv)
...
@@ -215,6 +216,9 @@ int main(int argc, char** argv)
// Initialization
// Initialization
init_curl
();
init_curl
();
LLCore
::
HttpRequest
::
createService
();
LLCore
::
HttpRequest
::
createService
();
LLCore
::
HttpRequest
::
setPolicyClassOption
(
LLCore
::
HttpRequest
::
DEFAULT_POLICY_ID
,
LLCore
::
HttpRequest
::
CP_CONNECTION_LIMIT
,
concurrency_limit
);
LLCore
::
HttpRequest
::
startThread
();
LLCore
::
HttpRequest
::
startThread
();
// Get service point
// Get service point
...
@@ -228,7 +232,7 @@ int main(int argc, char** argv)
...
@@ -228,7 +232,7 @@ int main(int argc, char** argv)
ws
.
loadTextureUuids
(
uuids
);
ws
.
loadTextureUuids
(
uuids
);
ws
.
mRandomRange
=
do_random
;
ws
.
mRandomRange
=
do_random
;
ws
.
mVerbose
=
do_verbose
;
ws
.
mVerbose
=
do_verbose
;
ws
.
mMaxConcurrency
=
concurrency_limit
;
ws
.
mMaxConcurrency
=
100
;
if
(
!
ws
.
mTextures
.
size
())
if
(
!
ws
.
mTextures
.
size
())
{
{
...
...
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