livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add pipelining and tracing command line options to the test program.

master
Monty Brandenberg 2014-07-03 19:44:02 -04:00
parent 17da4cf57a
commit 9fb96b416f
1 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
indra/llcorehttp/examples/http_texture_load.cpp
View File

@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2012&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2012-2013, Linden Research, Inc.
* Copyright (C) 2012-2014, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -59,11 +59,13 @@ void usage(std::ostream & out);
// Default command line settings
static int concurrency_limit(40);
static int highwater(100);
static int pipeline_depth(0);
static int tracing(0);
static char url_format[1024] = "http://example.com/some/path?texture_id=%s.texture";
#if defined(WIN32)
#define strncpy(_a, _b, _c) strncpy_s(_a, _b, _c)
#define strncpy(_a, _b, _c) strncpy_s(_a, _b, _c)
#define strtok_r(_a, _b, _c) strtok_s(_a, _b, _c)
int getopt(int argc, char * const argv[], const char *optstring);
@ -163,7 +165,7 @@ int main(int argc, char** argv)
bool do_verbose(false);
int option(-1);
while (-1 != (option = getopt(argc, argv, "u:c:h?RvH:")))
while (-1 != (option = getopt(argc, argv, "u:c:h?RvH:p:t:")))
{
switch (option)
{
@ -193,7 +195,7 @@ int main(int argc, char** argv)
char * end;
value = strtoul(optarg, &end, 10);
if (value < 1 || value > 100 || *end != '\0')
if (value < 1 || value > 200 || *end != '\0')
{
usage(std::cerr);
return 1;
@ -202,6 +204,36 @@ int main(int argc, char** argv)
}
break;
case 'p':
{
unsigned long value;
char * end;
value = strtoul(optarg, &end, 10);
if (value < 0 || value > 100 || *end != '\0')
{
usage(std::cerr);
return 1;
}
pipeline_depth = value;
}
break;
case '5':
{
unsigned long value;
char * end;
value = strtoul(optarg, &end, 10);
if (value < 0 || value > 3 || *end != '\0')
{
usage(std::cerr);
return 1;
}
tracing = value;
}
break;
case 'R':
do_random = true;
break;
@ -240,6 +272,24 @@ int main(int argc, char** argv)
LLCore::HttpRequest::DEFAULT_POLICY_ID,
concurrency_limit,
NULL);
LLCore::HttpRequest::setStaticPolicyOption(LLCore::HttpRequest::PO_PER_HOST_CONNECTION_LIMIT,
LLCore::HttpRequest::DEFAULT_POLICY_ID,
concurrency_limit,
NULL);
if (pipeline_depth)
{
LLCore::HttpRequest::setStaticPolicyOption(LLCore::HttpRequest::PO_PIPELINING_DEPTH,
LLCore::HttpRequest::DEFAULT_POLICY_ID,
pipeline_depth,
NULL);
}
if (tracing)
{
LLCore::HttpRequest::setStaticPolicyOption(LLCore::HttpRequest::PO_TRACE,
LLCore::HttpRequest::DEFAULT_POLICY_ID,
tracing,
NULL);
}
LLCore::HttpRequest::startThread();
// Get service point
@ -334,7 +384,11 @@ void usage(std::ostream & out)
" -c <limit> Maximum connection concurrency. Range: [1..100]\n"
" Default: " << concurrency_limit << "\n"
" -H <limit> HTTP request highwater (requests fed to llcorehttp).\n"
" Range: [1..100] Default: " << highwater << "\n"
" Range: [1..200] Default: " << highwater << "\n"
" -p <depth> If <depth> is positive, enables and sets pipelineing\n"
" depth on HTTP requests. Default: " << pipeline_depth << "\n"
" -t <level> If <level> is positive ([1..3]), enables and sets HTTP\n"
" tracing on HTTP requests. Default: " << tracing << "\n"
" -v Verbose mode. Issue some chatter while running\n"
" -h print this help\n"
"\n"