tune threading more

Author: mastercoms

src/datacache/datacache.h

@@ -40,7 +40,7 @@ struct DataCacheItemData_t
 //-------------------------------------
 
 #define DC_NO_NEXT_LOCKED ((DataCacheItem_t *)0xffffffff)
-#define DC_MAX_THREADS_FRAMELOCKED 4
+#define DC_MAX_THREADS_FRAMELOCKED 20
 
 struct DataCacheItem_t : DataCacheItemData_t
 {

src/filesystem/filesystem_async.cpp

@@ -668,7 +668,6 @@ void CBaseFileSystem::InitAsync()
 		ThreadPoolStartParams_t params;
 		params.iThreadPriority = TP_PRIORITY_LOW;
 		params.bIOThreads = true;
-		params.bHeavyLoad = true;
 		if ( IsX360() )
 		{
 			// override defaults

src/materialsystem/cmaterialsystem.cpp

@@ -3549,7 +3549,6 @@ IThreadPool *CMaterialSystem::CreateMatQueueThreadPool()
 		startParams.nThreads = 1;
 		startParams.nStackSize = 256*1024;
 		startParams.fDistribute = TRS_TRUE;
-		startParams.bHeavyLoad = true;
 
 		// The rendering thread has the GL context and the main thread is coming in and
 		//  "helping" finish jobs - that breaks OpenGL, which requires TLS. This flag states 

src/public/vstdlib/jobthread.h

@@ -102,8 +102,8 @@ enum JobPriority_t
 #define TP_MAX_POOL_THREADS	64
 struct ThreadPoolStartParams_t
 {
-	ThreadPoolStartParams_t( bool bIOThreads = false, unsigned nThreads = -1, int *pAffinities = NULL, ThreeState_t fDistribute = TRS_NONE, unsigned nStackSize = -1, int iThreadPriority = SHRT_MIN, bool bHeavyLoad = false )
-		: bIOThreads( bIOThreads ), nThreads( nThreads ), fDistribute( fDistribute ), nStackSize( nStackSize ), iThreadPriority( iThreadPriority ), nThreadsMax( -1 ), bHeavyLoad( bHeavyLoad )
+	ThreadPoolStartParams_t( bool bIOThreads = false, unsigned nThreads = -1, int *pAffinities = NULL, ThreeState_t fDistribute = TRS_NONE, unsigned nStackSize = -1, int iThreadPriority = SHRT_MIN )
+		: bIOThreads( bIOThreads ), nThreads( nThreads ), fDistribute( fDistribute ), nStackSize( nStackSize ), iThreadPriority( iThreadPriority ), nThreadsMax( -1 )
 	{
 		bExecOnThreadPoolThreadsOnly = false;
 
@@ -129,7 +129,6 @@ struct ThreadPoolStartParams_t
 	bool			bIOThreads : 1;
 	bool			bUseAffinityTable : 1;
 	bool			bExecOnThreadPoolThreadsOnly : 1;
-	bool bHeavyLoad : 1;
 };
 
 //-----------------------------------------------------------------------------
@@ -930,7 +929,7 @@ class CParallelProcessor
 
 		if ( nJobs > 1 )
 		{
-			if ( m_iBatchSize != 1)
+			if ( m_iBatchSize != 1 )
 			{
 				m_iBatchSize = nItems / nJobs;
 				m_iLeftOver = nItems % nJobs;
@@ -940,7 +939,7 @@ class CParallelProcessor
 			CJob **jobs = (CJob **)stackalloc( nJobs * sizeof(CJob **) );
 			int i = nJobs;
 
-			while( i-- )
+			while ( i-- )
 			{
 #if 1
 				jobs[i] = pThreadPool->QueueCall( this, &CParallelProcessor<ITEM_TYPE, ITEM_PROCESSOR_TYPE>::DoExecute );
@@ -959,7 +958,7 @@ class CParallelProcessor
 		}
 		else
 		{
-			m_iBatchSize = 1;
+			m_iBatchSize = nItems;
 			DoExecute();
 		}
 #if MEASURE_PARALLEL_WORK
@@ -983,18 +982,26 @@ class CParallelProcessor
 		{
 			m_ItemProcessor.Begin();
 
-			int iBatchSize = m_iBatchSize;
-			if (iBatchIndex == m_iBatchCount - 1)
-			{
-				iBatchSize += m_iLeftOver;
-			}
-
-			for (int i = 0; i < iBatchSize; i++)
+			while (true)
 			{
+				int iBatchSize = m_iBatchSize;
+				if ( iBatchIndex == m_iBatchCount - 1 )
+				{
+					iBatchSize += m_iLeftOver;
+				}
+
+				for ( int i = 0; i < iBatchSize; i++ )
+				{
 #if MEASURE_PARALLEL_WORK
-				++work;
+					++work;
 #endif
-				m_ItemProcessor.Process( *(m_pItems + (iBatchIndex * m_iBatchSize + i)) );
+					m_ItemProcessor.Process( *( m_pItems + ( iBatchIndex * m_iBatchSize + i ) ) );
+				}
+				iBatchIndex = m_iBatchIndex++;
+				if ( iBatchIndex >= m_iBatchCount )
+				{
+					break;
+				}
 			}
 
 			m_ItemProcessor.End();
@@ -1021,7 +1028,6 @@ inline void ParallelProcess( const char *pszDescription, ITEM_TYPE *pItems, unsi
 	CParallelProcessor<ITEM_TYPE, CFuncJobItemProcessor<ITEM_TYPE> > processor( pszDescription );
 	processor.m_ItemProcessor.Init( pfnProcess, pfnBegin, pfnEnd );
 	processor.Run( pItems, nItems, nMaxParallel );
-
 }
 
 template <typename ITEM_TYPE, typename OBJECT_TYPE, typename FUNCTION_CLASS >