diff options
| -rwxr-xr-x | indra/newview/llviewerassetstats.cpp | 106 |
1 files changed, 0 insertions, 106 deletions
diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp index 0b820f866e..e4f64f3076 100755 --- a/indra/newview/llviewerassetstats.cpp +++ b/indra/newview/llviewerassetstats.cpp @@ -454,114 +454,8 @@ LLSD LLViewerAssetStats::asLLSD(bool compact_output) AssetStats stats; getStats(stats, compact_output); parser.writeSD(sd, stats); - llinfos << ll_pretty_print_sd(sd) << llendl; return sd; } -//LLSD LLViewerAssetStats::asLLSD(bool compact_output) -//{ -// // Top-level tags -// static const LLSD::String tags[LLViewerAssetStatsFF::EVACCount] = -// { -// LLSD::String("get_texture_temp_http"), -// LLSD::String("get_texture_temp_udp"), -// LLSD::String("get_texture_non_temp_http"), -// LLSD::String("get_texture_non_temp_udp"), -// LLSD::String("get_wearable_udp"), -// LLSD::String("get_sound_udp"), -// LLSD::String("get_gesture_udp"), -// LLSD::String("get_other") -// }; -// -// // Stats Group Sub-tags. -// static const LLSD::String enq_tag("enqueued"); -// static const LLSD::String deq_tag("dequeued"); -// static const LLSD::String rcnt_tag("resp_count"); -// static const LLSD::String rmin_tag("resp_min"); -// static const LLSD::String rmax_tag("resp_max"); -// static const LLSD::String rmean_tag("resp_mean"); -// -// // MMM Group Sub-tags. -// static const LLSD::String cnt_tag("count"); -// static const LLSD::String min_tag("min"); -// static const LLSD::String max_tag("max"); -// static const LLSD::String mean_tag("mean"); -// -// // Avatar sub-tags -// static const LLSD::String avatar_tag("avatar"); -// static const LLSD::String avatar_nearby_tag("nearby"); -// static const LLSD::String avatar_phase_stats_tag("phase_stats"); -// -// const duration_t now = LLViewerAssetStatsFF::get_timestamp(); -// mCurRegionStats->accumulateTime(now); -// -// LLSD regions = LLSD::emptyArray(); -// for (PerRegionContainer::iterator it = mRegionStats.begin(); -// mRegionStats.end() != it; -// ++it) -// { -// if (0 == it->first) -// { -// // Never emit NULL UUID/handle in results. -// continue; -// } -// -// PerRegionStats & stats = *it->second; -// -// LLSD reg_stat = LLSD::emptyMap(); -// -// for (int i = 0; i < LL_ARRAY_SIZE(tags); ++i) -// { -// PerRegionStats::prs_group & group(stats.mRequests[i]); -// -// if ((! compact_output) || -// group.mEnqueued.getCount() || -// group.mDequeued.getCount() || -// group.mResponse.getCount()) -// { -// LLSD & slot = reg_stat[tags[i]]; -// slot = LLSD::emptyMap(); -// slot[enq_tag] = LLSD(S32(stats.mRequests[i].mEnqueued.getCount())); -// slot[deq_tag] = LLSD(S32(stats.mRequests[i].mDequeued.getCount())); -// slot[rcnt_tag] = LLSD(S32(stats.mRequests[i].mResponse.getCount())); -// slot[rmin_tag] = LLSD(F64(stats.mRequests[i].mResponse.getMin() * 1.0e-6)); -// slot[rmax_tag] = LLSD(F64(stats.mRequests[i].mResponse.getMax() * 1.0e-6)); -// slot[rmean_tag] = LLSD(F64(stats.mRequests[i].mResponse.getMean() * 1.0e-6)); -// } -// } -// -// if ((! compact_output) || stats.mFPS.getCount()) -// { -// LLSD & slot = reg_stat["fps"]; -// slot = LLSD::emptyMap(); -// slot[cnt_tag] = LLSD(S32(stats.mFPS.getCount())); -// slot[min_tag] = LLSD(F64(stats.mFPS.getMin())); -// slot[max_tag] = LLSD(F64(stats.mFPS.getMax())); -// slot[mean_tag] = LLSD(F64(stats.mFPS.getMean())); -// } -// U32 grid_x(0), grid_y(0); -// grid_from_region_handle(it->first, &grid_x, &grid_y); -// reg_stat["grid_x"] = LLSD::Integer(grid_x); -// reg_stat["grid_y"] = LLSD::Integer(grid_y); -// reg_stat["duration"] = LLSD::Real(stats.mTotalTime * 1.0e-6); -// regions.append(reg_stat); -// } -// -// LLSD ret = LLSD::emptyMap(); -// ret["regions"] = regions; -// ret["duration"] = LLSD::Real((now - mResetTimestamp) * 1.0e-6); -// LLSD avatar_info; -// avatar_info[avatar_nearby_tag] = LLSD::emptyArray(); -// for (S32 rez_stat=0; rez_stat < mAvatarRezStates.size(); ++rez_stat) -// { -// std::string rez_status_name = LLVOAvatar::rezStatusToString(rez_stat); -// avatar_info[avatar_nearby_tag][rez_status_name] = mAvatarRezStates[rez_stat]; -// } -// avatar_info[avatar_phase_stats_tag]["cloud"] = mPhaseStats["cloud"].asLLSD(); -// avatar_info[avatar_phase_stats_tag]["cloud-or-gray"] = mPhaseStats["cloud-or-gray"].asLLSD(); -// ret[avatar_tag] = avatar_info; -// -// return ret; -//} // ------------------------------------------------------ // Global free-function definitions (LLViewerAssetStatsFF namespace) |