MAINT-4360 (Setting LogTextureDownloadsToSimulator causes a viewer crash)

The fix in fllowing:
LLTextureFetch has object LLTextureInfo which is has Recorder object.
The recorder object activate (Recorder::handleStart()) self AccumulatorBufferGroup (Recorder::mBuffers into the current (LLTrace::get_thread_recorder()) ThreadRecorder object which created (as I understand) one per thread, and time to time send accumulated data to the master ThreadRecorder.
The problem is that LLTextureFetch also can uses from the main thread.
I decide add parameter to CTOR LLTextureInfo(bool postponeStartRecoreder) -
if it false the recorder start immediatly in LLTextureInfo CTOR body, if true we need to start it manually.
Also I add another one LLTextureInfo  in LLTextureFetch::mTextureInfoMainThread which is intended for accumulate data from the main thread.
The postponed Recorder started/stoped from LLTextureFetch::startThread()/endThread().

--HG--
branch : MAINT-4360

4 files changed, 23 insertions, 30 deletions

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 17b273f316..fab4203ec3 100755
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2522,8 +2522,7 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image
 	  mFetchDebugger(NULL),
 	  mFetchSource(LLTextureFetch::FROM_ALL),
 	  mOriginFetchSource(LLTextureFetch::FROM_ALL),
-	  mFetcherLocked(FALSE),
-	  mTextureInfoMainThread(false)
+	  mFetcherLocked(FALSE)
 {
 	mMaxBandwidth = gSavedSettings.getF32("ThrottleBandwidthKBPS");
 	mTextureInfo.setUpLogging(gSavedSettings.getBOOL("LogTextureDownloadsToViewerLog"), gSavedSettings.getBOOL("LogTextureDownloadsToSimulator"), U32Bytes(gSavedSettings.getU32("TextureLoggingThreshold")));
@@ -3129,7 +3128,6 @@ void LLTextureFetch::shutDownImageDecodeThread()
 // Threads:  Ttf
 void LLTextureFetch::startThread()
 {
-	mTextureInfo.startRecording();
 }
 
 // Threads:  Ttf
@@ -3140,8 +3138,6 @@ void LLTextureFetch::endThread()
 					  << ", ResWaits:  " << mTotalResourceWaitCount
 					  << ", TotalHTTPReq:  " << getTotalNumHTTPRequests()
 					  << LL_ENDL;
-
-	mTextureInfo.stopRecording();
 }
 
 // Threads:  Ttf
@@ -3545,8 +3541,8 @@ bool LLTextureFetch::receiveImagePacket(const LLHost& host, const LLUUID& id, U1
 		if (log_to_viewer_log || log_to_sim)
 		{
 			U64Microseconds timeNow = LLTimer::getTotalTime();
-			mTextureInfoMainThread.setRequestSize(id, worker->mFileSize);
-			mTextureInfoMainThread.setRequestCompleteTimeAndLog(id, timeNow);
+			mTextureInfo.setRequestSize(id, worker->mFileSize);
+			mTextureInfo.setRequestCompleteTimeAndLog(id, timeNow);
 		}
 	}
 	worker->unlockWorkMutex();											// -Mw
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index a2658ecd85..27779a31e0 100755
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -332,7 +332,6 @@ private:
 	F32 mTextureBandwidth;												// <none>
 	F32 mMaxBandwidth;													// Mfnq
 	LLTextureInfo mTextureInfo;
-	LLTextureInfo mTextureInfoMainThread;
 
 	// XXX possible delete
 	U32Bits mHTTPTextureBits;												// Mfnq
diff --git a/indra/newview/lltextureinfo.cpp b/indra/newview/lltextureinfo.cpp
index fbe308595c..59d692b287 100755
--- a/indra/newview/lltextureinfo.cpp
+++ b/indra/newview/lltextureinfo.cpp
@@ -36,14 +36,14 @@ static LLTrace::CountStatHandle<S32> sTextureDownloadsCompleted("texture_downloa
 static LLTrace::CountStatHandle<S32Bytes > sTextureDataDownloaded("texture_data_downloaded", "amount of texture data downloaded");
 static LLTrace::CountStatHandle<U32Milliseconds > sTexureDownloadTime("texture_download_time", "amount of time spent fetching textures");
 
-LLTextureInfo::LLTextureInfo(bool postponeStartRecoreder) :
+LLTextureInfo::LLTextureInfo() : 
 	mLogTextureDownloadsToViewerLog(false),
 	mLogTextureDownloadsToSimulator(false),
 	mTextureDownloadProtocol("NONE"),
 	mTextureLogThreshold(LLUnits::Kilobytes::fromValue(100))
 {
-	if (!postponeStartRecoreder)
-		mRecording.start();
+	mTextures.clear();
+	mRecording.start();
 }
 
 void LLTextureInfo::setUpLogging(bool writeToViewerLog, bool sendToSim, U32Bytes textureLogThreshold)
@@ -78,7 +78,15 @@ U32 LLTextureInfo::getTextureInfoMapSize()
 
 bool LLTextureInfo::has(const LLUUID& id)
 {
-	return mTextures.end() != mTextures.find(id);
+	std::map<LLUUID, LLTextureInfoDetails *>::iterator iterator = mTextures.find(id);
+	if (iterator == mTextures.end())
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
 }
 
 void LLTextureInfo::setRequestStartTime(const LLUUID& id, U64 startTime)
@@ -184,13 +192,15 @@ void LLTextureInfo::setRequestCompleteTimeAndLog(const LLUUID& id, U64Microsecon
 LLSD LLTextureInfo::getAverages()
 {
 	LLSD averagedTextureData;
-	S32 averageDownloadRate = 0;
+	S32 averageDownloadRate;
 	U32Milliseconds download_time = mRecording.getSum(sTexureDownloadTime);
-	if(download_time != (U32Milliseconds)0)
+	if(download_time == (U32Milliseconds)0)
 	{
-		if (0 != download_time.valueInUnits<LLUnits::Seconds>()) {
-			averageDownloadRate = mRecording.getSum(sTextureDataDownloaded).valueInUnits<LLUnits::Bits>() / download_time.valueInUnits<LLUnits::Seconds>();
-		}
+		averageDownloadRate = 0;
+	}
+	else
+	{
+		averageDownloadRate = mRecording.getSum(sTextureDataDownloaded).valueInUnits<LLUnits::Bits>() / download_time.valueInUnits<LLUnits::Seconds>();
 	}
 
 	averagedTextureData["bits_per_second"]             = averageDownloadRate;
@@ -202,16 +212,6 @@ LLSD LLTextureInfo::getAverages()
 	return averagedTextureData;
 }
 
-void LLTextureInfo::startRecording()
-{
-	mRecording.start();
-}
-
-void LLTextureInfo::stopRecording()
-{
-	mRecording.stop();
-}
-
 void LLTextureInfo::resetTextureStatistics()
 {
 	mRecording.restart();
diff --git a/indra/newview/lltextureinfo.h b/indra/newview/lltextureinfo.h
index 03721bdd73..176f2cbb74 100755
--- a/indra/newview/lltextureinfo.h
+++ b/indra/newview/lltextureinfo.h
@@ -35,7 +35,7 @@
 class LLTextureInfo
 {
 public:
-	LLTextureInfo(bool postponeStartRecoreder = true);
+	LLTextureInfo();
 	~LLTextureInfo();
 
 	void setUpLogging(bool writeToViewerLog, bool sendToSim, U32Bytes textureLogThreshold);
@@ -53,8 +53,6 @@ public:
 	void resetTextureStatistics();
 	U32 getTextureInfoMapSize();
 	LLSD getAverages();
-	void startRecording();
-	void stopRecording();
 
 private:
 	void addRequest(const LLUUID& id);