Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linuxy fixes

Browse Source
This commit is contained in:
Siana Gearz
2011-08-01 19:55:57 +02:00
parent f30c284063
commit fcd37f3a45
15 changed files with 114 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/lltexturefetch.cpp
View File

@@ -479,8 +479,8 @@ static bool sgConnectionThrottle() {
LLMutexLock lock(&mutex);
const U32 THROTTLE_TIMESTEPS_PER_SECOND = 10;
static const LLCachedControl<U32> max_connections_per_second("HTTPRequestRate", 30);
S32 max_connections = max_connections_per_second/THROTTLE_TIMESTEPS_PER_SECOND;
const S32 timestep = USEC_PER_SEC/THROTTLE_TIMESTEPS_PER_SECOND;
U32 max_connections = max_connections_per_second/THROTTLE_TIMESTEPS_PER_SECOND;
const U32 timestep = USEC_PER_SEC/THROTTLE_TIMESTEPS_PER_SECOND;
U64 now = LLTimer::getTotalTime();
std::deque<U64> timestamps;
while(!timestamps.empty() && (timestamps[0]<=now-timestep)) {
@@ -1274,8 +1274,8 @@ bool LLTextureFetchWorker::doWork(S32 param)
//1, not openning too many file descriptors at the same time;
//2, control the traffic of http so udp gets bandwidth.
//
static const LLCachedControl<S32> max_http_requests("HTTPMaxRequests", 32);
static const LLCachedControl<S32> min_http_requests("HTTPMinRequests", 2);
static const LLCachedControl<U32> max_http_requests("HTTPMaxRequests", 32);
static const LLCachedControl<U32> min_http_requests("HTTPMinRequests", 2);
if((mFetcher->getNumHTTPRequests() > max_http_requests) ||
((mFetcher->getTextureBandwidth() > mFetcher->mMaxBandwidth) &&
(mFetcher->getNumHTTPRequests() > min_http_requests)) ||