From 56f9cce8a11cadff1b7c8cf7c001638bfe1155fb Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 25 Jan 2017 15:58:38 -0800
Subject: MAINT-7082: Remove waiting loop in frame when textures queued for
download in alternate thread. With debug spam for observation.
---
indra/newview/llappviewer.cpp | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index a0ebae119e..a148d3c30d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1491,7 +1491,7 @@ bool LLAppViewer::frame()
idleTimer.reset();
S32 total_work_pending = 0;
S32 total_io_pending = 0;
- while(1)
+ //while(1)
{
S32 work_pending = 0;
S32 io_pending = 0;
@@ -1515,11 +1515,15 @@ bool LLAppViewer::frame()
total_work_pending += work_pending ;
total_io_pending += io_pending ;
-
- if (!work_pending || idleTimer.getElapsedTimeF64() >= max_idle_time)
- {
- break;
- }
+
+ if (work_pending)
+ {
+ LL_WARNS("Idle") << "Work pending in texture thread: " << work_pending << LL_ENDL;
+ }
+// if (!work_pending || idleTimer.getElapsedTimeF64() >= max_idle_time)
+// {
+// break;
+// }
}
gMeshRepo.update() ;
--
cgit v1.2.3
From bab0ee6a3a32e816cffd5923a38a723713173f91 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 26 Jan 2017 10:19:54 -0800
Subject: MAINT-7082: max_idle_time unused.
---
indra/newview/llappviewer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index a148d3c30d..e557076daa 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1487,7 +1487,7 @@ bool LLAppViewer::frame()
ms_sleep(500);
}
- const F64Milliseconds max_idle_time = llmin(.005f*10.f*(F32Milliseconds)gFrameTimeSeconds, F32Milliseconds(5)); // 5 ms a second
+ //const F64Milliseconds max_idle_time = llmin(.005f*10.f*(F32Milliseconds)gFrameTimeSeconds, F32Milliseconds(5)); // 5 ms a second
idleTimer.reset();
S32 total_work_pending = 0;
S32 total_io_pending = 0;
--
cgit v1.2.3
From cb73d43bf6ba1a4d6fdac6245eed328e62927f8d Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 26 Jan 2017 15:50:26 -0800
Subject: MAINT-7082: Clean up, remove log spam.
---
indra/newview/llappviewer.cpp | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e557076daa..e178bbb21a 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1487,11 +1487,9 @@ bool LLAppViewer::frame()
ms_sleep(500);
}
- //const F64Milliseconds max_idle_time = llmin(.005f*10.f*(F32Milliseconds)gFrameTimeSeconds, F32Milliseconds(5)); // 5 ms a second
idleTimer.reset();
S32 total_work_pending = 0;
S32 total_io_pending = 0;
- //while(1)
{
S32 work_pending = 0;
S32 io_pending = 0;
@@ -1516,14 +1514,6 @@ bool LLAppViewer::frame()
total_work_pending += work_pending ;
total_io_pending += io_pending ;
- if (work_pending)
- {
- LL_WARNS("Idle") << "Work pending in texture thread: " << work_pending << LL_ENDL;
- }
-// if (!work_pending || idleTimer.getElapsedTimeF64() >= max_idle_time)
-// {
-// break;
-// }
}
gMeshRepo.update() ;
--
cgit v1.2.3