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
3c46c6bc
Commit
3c46c6bc
authored
10 years ago
by
Rider Linden
Browse files
Options
Downloads
Patches
Plain Diff
Boost unique_ptr into xmlrpc
parent
1ac97766
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llmessage/llcurl.cpp
+2
-0
2 additions, 0 deletions
indra/llmessage/llcurl.cpp
indra/newview/llxmlrpctransaction.cpp
+10
-3
10 additions, 3 deletions
indra/newview/llxmlrpctransaction.cpp
with
12 additions
and
3 deletions
indra/llmessage/llcurl.cpp
+
2
−
0
View file @
3c46c6bc
...
@@ -69,12 +69,14 @@
...
@@ -69,12 +69,14 @@
do this.
do this.
*/
*/
// *TODO: TSN remove the commented code from this file
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
static
const
U32
EASY_HANDLE_POOL_SIZE
=
5
;
static
const
U32
EASY_HANDLE_POOL_SIZE
=
5
;
static
const
S32
MULTI_PERFORM_CALL_REPEAT
=
5
;
static
const
S32
MULTI_PERFORM_CALL_REPEAT
=
5
;
static
const
S32
CURL_REQUEST_TIMEOUT
=
120
;
// seconds per operation
static
const
S32
CURL_REQUEST_TIMEOUT
=
120
;
// seconds per operation
static
const
S32
CURL_CONNECT_TIMEOUT
=
30
;
//seconds to wait for a connection
static
const
S32
CURL_CONNECT_TIMEOUT
=
30
;
//seconds to wait for a connection
//static const S32 MAX_ACTIVE_REQUEST_COUNT = 100;
//static const S32 MAX_ACTIVE_REQUEST_COUNT = 100;
// DEBUG //
// DEBUG //
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llxmlrpctransaction.cpp
+
10
−
3
View file @
3c46c6bc
...
@@ -48,6 +48,13 @@
...
@@ -48,6 +48,13 @@
#include
"llappviewer.h"
#include
"llappviewer.h"
#include
"lltrans.h"
#include
"lltrans.h"
#include
"boost/move/unique_ptr.hpp"
namespace
boost
{
using
::
boost
::
movelib
::
unique_ptr
;
// move unique_ptr into the boost namespace.
}
// Static instance of LLXMLRPCListener declared here so that every time we
// Static instance of LLXMLRPCListener declared here so that every time we
// bring in this code, we instantiate a listener. If we put the static
// bring in this code, we instantiate a listener. If we put the static
// instance of LLXMLRPCListener into llxmlrpclistener.cpp, the linker would
// instance of LLXMLRPCListener into llxmlrpclistener.cpp, the linker would
...
@@ -168,7 +175,7 @@ class LLXMLRPCTransaction::Handler : public LLCore::HttpHandler
...
@@ -168,7 +175,7 @@ class LLXMLRPCTransaction::Handler : public LLCore::HttpHandler
virtual
void
onCompleted
(
LLCore
::
HttpHandle
handle
,
LLCore
::
HttpResponse
*
response
);
virtual
void
onCompleted
(
LLCore
::
HttpHandle
handle
,
LLCore
::
HttpResponse
*
response
);
typedef
st
d
::
unique_ptr
<
LLXMLRPCTransaction
::
Handler
>
ptr_t
;
typedef
boo
st
::
unique_ptr
<
LLXMLRPCTransaction
::
Handler
>
ptr_t
;
private:
private:
...
@@ -309,7 +316,7 @@ void LLXMLRPCTransaction::Handler::onCompleted(LLCore::HttpHandle handle,
...
@@ -309,7 +316,7 @@ void LLXMLRPCTransaction::Handler::onCompleted(LLCore::HttpHandle handle,
LLXMLRPCTransaction
::
Impl
::
Impl
(
const
std
::
string
&
uri
,
LLXMLRPCTransaction
::
Impl
::
Impl
(
const
std
::
string
&
uri
,
XMLRPC_REQUEST
request
,
bool
useGzip
)
XMLRPC_REQUEST
request
,
bool
useGzip
)
:
mHttpRequest
(
0
),
:
mHttpRequest
(),
mStatus
(
LLXMLRPCTransaction
::
StatusNotStarted
),
mStatus
(
LLXMLRPCTransaction
::
StatusNotStarted
),
mURI
(
uri
),
mURI
(
uri
),
mResponse
(
0
)
mResponse
(
0
)
...
@@ -320,7 +327,7 @@ LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
...
@@ -320,7 +327,7 @@ LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
LLXMLRPCTransaction
::
Impl
::
Impl
(
const
std
::
string
&
uri
,
LLXMLRPCTransaction
::
Impl
::
Impl
(
const
std
::
string
&
uri
,
const
std
::
string
&
method
,
LLXMLRPCValue
params
,
bool
useGzip
)
const
std
::
string
&
method
,
LLXMLRPCValue
params
,
bool
useGzip
)
:
mHttpRequest
(
0
),
:
mHttpRequest
(),
mStatus
(
LLXMLRPCTransaction
::
StatusNotStarted
),
mStatus
(
LLXMLRPCTransaction
::
StatusNotStarted
),
mURI
(
uri
),
mURI
(
uri
),
mResponse
(
0
)
mResponse
(
0
)
...
...
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