From e247336a03ba25eaacaec3ec0cf6665daba69dfc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 4 Mar 2013 14:06:18 -0500 Subject: fix Linux warning/error --- indra/newview/llviewerstatsrecorder.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerstatsrecorder.cpp') diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp index 91e485d01b..97ca08f694 100644 --- a/indra/newview/llviewerstatsrecorder.cpp +++ b/indra/newview/llviewerstatsrecorder.cpp @@ -216,7 +216,11 @@ void LLViewerStatsRecorder::writeToLog( F32 interval ) << "Texture Fetch bps\t" << "\n"; - fwrite(data_msg.str().c_str(), 1, data_msg.str().size(), mObjectCacheFile ); + size_t data_size = data_msg.str().size(); + if ( data_size != fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile )) + { + llwarns << "Unable to write complete column headings to " << STATS_FILE_NAME << llendl; + } } else { @@ -249,7 +253,12 @@ void LLViewerStatsRecorder::writeToLog( F32 interval ) << "\t" << (mTextureFetchSize * 8 / delta_time) << "\n"; - fwrite(data_msg.str().c_str(), 1, data_msg.str().size(), mObjectCacheFile ); + size_t data_size = data_msg.str().size(); + if ( data_size != fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile )) + { + llwarns << "Unable to write complete stats record to " << STATS_FILE_NAME << llendl; + } + fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile ); clearStats(); } -- cgit v1.2.3 From 8037601dedbe9e0a3f1e588b6109bbad6adb1cff Mon Sep 17 00:00:00 2001 From: "Graham Madarasz (Graham Linden)" Date: Mon, 1 Apr 2013 14:07:12 -0700 Subject: Remove duplicate fwrite of viewer stats data --- indra/newview/llviewerstatsrecorder.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llviewerstatsrecorder.cpp') diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp index 97ca08f694..728f04af78 100644 --- a/indra/newview/llviewerstatsrecorder.cpp +++ b/indra/newview/llviewerstatsrecorder.cpp @@ -258,7 +258,6 @@ void LLViewerStatsRecorder::writeToLog( F32 interval ) { llwarns << "Unable to write complete stats record to " << STATS_FILE_NAME << llendl; } - fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile ); clearStats(); } -- cgit v1.2.3 From 806d09b1143894ad66cea2c228f467e8c39a8adf Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Tue, 30 Apr 2013 19:50:05 -0700 Subject: Merge 3.5.1 into Materials --- indra/newview/llviewerstatsrecorder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerstatsrecorder.cpp') diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp index 728f04af78..3ff2dfa4fe 100644 --- a/indra/newview/llviewerstatsrecorder.cpp +++ b/indra/newview/llviewerstatsrecorder.cpp @@ -256,7 +256,7 @@ void LLViewerStatsRecorder::writeToLog( F32 interval ) size_t data_size = data_msg.str().size(); if ( data_size != fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile )) { - llwarns << "Unable to write complete stats record to " << STATS_FILE_NAME << llendl; + llwarns << "Unable to write complete column data to " << STATS_FILE_NAME << llendl; } clearStats(); } -- cgit v1.2.3 From da343188ff07bcfc86b3d72a93f327be4f2607e2 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 10 May 2013 11:52:08 -0400 Subject: fix merge error in 3.5.2 merge --- indra/newview/llviewerstatsrecorder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerstatsrecorder.cpp') diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp index f5a4737c59..bba089fb30 100755 --- a/indra/newview/llviewerstatsrecorder.cpp +++ b/indra/newview/llviewerstatsrecorder.cpp @@ -254,7 +254,7 @@ void LLViewerStatsRecorder::writeToLog( F32 interval ) << "\t" << (mTextureFetchSize * 8 / delta_time) << "\n"; - size_t data_size = data_msg.str().size(); + data_size = data_msg.str().size(); if ( data_size != fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile )) { llwarns << "Unable to write complete column data to " << STATS_FILE_NAME << llendl; -- cgit v1.2.3