add macos workflow, fix filesystem_async max thread count

nillerusr · nillerusr · commit dfacccaab6f4 · 2023-04-24T18:35:53.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -91,3 +91,21 @@ jobs:
     - name: Build dedicated linux-amd64
       run: |
         scripts/build-ubuntu-amd64.sh -d
+
+  build-macos-amd64:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build macos-amd64
+      run: |
+        scripts/build-macos-amd64.sh
+
+  build-dedicated-macos-amd64:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build dedicated macos-amd64
+      run: |
+        scripts/build-macos-amd64.sh -d
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,6 +21,15 @@ jobs:
       run: |
         scripts/tests-ubuntu-amd64.sh
 
+  tests-macos-amd64:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run tests macos-amd64
+      run: |
+        scripts/tests-macos-amd64.sh
+
   tests-windows-i386:
     runs-on: windows-2019
 
diff --git a/appframework/sdlmgr.cpp b/appframework/sdlmgr.cpp
@@ -2224,7 +2224,7 @@ GLMDisplayDB *CSDLMgr::GetDisplayDB( void )
 }
 
 #ifndef OSX
-# include "glmdisplaydb_linuxwin.inl"
+#include "glmdisplaydb_linuxwin.inl"
 #endif
 
 
diff --git a/appframework/wscript b/appframework/wscript
@@ -24,11 +24,10 @@ def build(bld):
 		source += [
 			'sdlmgr.cpp'
 		]
-	
-	if bld.env.DEST_OS == 'darwin':
-		source += [
-			'glmrendererinfo_osx.mm'
-		]
+
+	if bld.env.DEST_OS == 'darwin' and bld.env.GL:
+		source += ['glmrendererinfo_osx.mm']
+
 
 	if bld.env.DEST_OS == 'win32':
 		source += [
diff --git a/bitmap/imageformat.cpp b/bitmap/imageformat.cpp
@@ -288,13 +288,11 @@ int GetNumMipMapLevels( int width, int height, int depth )
 // Turn off warning about FOURCC formats below...
 #pragma warning (disable:4063)
 
-#ifdef DX_TO_GL_ABSTRACTION
 #ifndef MAKEFOURCC
 #define MAKEFOURCC(ch0, ch1, ch2, ch3)                              \
 	((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) |   \
 	((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
 #endif //defined(MAKEFOURCC)
-#endif	
 //-----------------------------------------------------------------------------
 // convert back and forth from D3D format to ImageFormat, regardless of
 // whether it's supported or not
diff --git a/filesystem/filesystem_async.cpp b/filesystem/filesystem_async.cpp
@@ -659,16 +659,16 @@ void CBaseFileSystem::InitAsync()
 		Msg( "Async I/O disabled from command line\n" );
 		return;
 	}
-
+#ifndef UNITTESTS
 	if ( VCRGetMode() == VCR_Disabled )
+#endif
 	{
 		// create the i/o thread pool
 		m_pThreadPool = CreateThreadPool();
 
 		ThreadPoolStartParams_t params;
 		params.iThreadPriority = 0;
 		params.bIOThreads = true;
-		params.nThreadsMax = 4; // Limit count of IO threads to a maximum of 4.
 		if ( IsX360() )
 		{
 			// override defaults
@@ -678,11 +678,10 @@ void CBaseFileSystem::InitAsync()
 			params.bUseAffinityTable = true;
 			params.iAffinityTable[0] = XBOX_PROCESSOR_3;
 		}
-		else if( IsPC() )
+		else
 		{
-			// override defaults
-			// maximum # of async I/O thread on PC is 2
-			params.nThreads = 1;
+			params.nThreadsMax = MIN(params.nThreads, 4); // Limit count of IO threads to a maximum of 4.
+			params.nStackSize = 256*1024;
 		}
 
 		if ( !m_pThreadPool->Start( params, "IOJob" ) )
diff --git a/scripts/build-macos-amd64.sh b/scripts/build-macos-amd64.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+git submodule init && git submodule update
+
+brew install sdl2
+
+./waf configure -T debug --64bits --disable-warns $* &&
+./waf build
diff --git a/scripts/tests-macos-amd64.sh b/scripts/tests-macos-amd64.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+git submodule init && git submodule update
+./waf configure -T release --sanitize=address,undefined --disable-warns --tests -8 --prefix=out/ $* &&
+./waf install &&
+cd out &&
+DYLD_LIBRARY_PATH=bin/ ./unittest || exit 1
diff --git a/tier2/renderutils.cpp b/tier2/renderutils.cpp
@@ -12,7 +12,7 @@
 #include "materialsystem/imaterial.h"
 #include "tier0/vprof.h"
 #include "tier0/basetypes.h"
-#ifndef DEDICATED
+#ifdef DX_TO_GL_ABSTRACTION
 #include "togl/rendermechanism.h"
 #endif
 
diff --git a/utils/unittest/unittest.cpp b/utils/unittest/unittest.cpp
@@ -128,7 +128,7 @@ bool CUnitTestApp::Create()
 		while ((dir = readdir(d)) != NULL)
 		{
 			int len = strlen(dir->d_name);
-			if( len > 2 && strcmp(dir->d_name+len-3, ".so") == 0)
+			if( len > 2 && strcmp(dir->d_name+len-strlen(DLL_EXT_STRING), DLL_EXT_STRING) == 0)
 			{
 				static char path[2048];
 				snprintf(path, sizeof(path), "tests/%s", dir->d_name);
diff --git a/wscript b/wscript
@@ -159,15 +159,17 @@ def define_platform(conf):
 	conf.env.DEDICATED = conf.options.DEDICATED
 	conf.env.TESTS = conf.options.TESTS
 	conf.env.TOGLES = conf.options.TOGLES
-	conf.env.GL = conf.options.GL
+	conf.env.GL = conf.options.GL and not conf.options.TESTS and not conf.options.DEDICATED
 	conf.env.OPUS = conf.options.OPUS
 
 	if conf.options.DEDICATED:
 		conf.options.SDL = False
-#		conf.options.GL = False
 		conf.define('DEDICATED', 1)
 
-	if conf.options.GL and not conf.options.TESTS:
+	if conf.options.TESTS:
+		conf.define('UNITTESTS', 1)
+
+	if conf.env.GL:
 		conf.env.append_unique('DEFINES', [
 			'DX_TO_GL_ABSTRACTION',
 			'GL_GLEXT_PROTOTYPES',
@@ -177,6 +179,9 @@ def define_platform(conf):
 	if conf.options.TOGLES:
 		conf.env.append_unique('DEFINES', ['TOGLES'])
 
+	if conf.options.TESTS:
+		conf.define('UNITTESTS', 1)
+
 	if conf.options.SDL and not conf.options.TESTS:
 		conf.env.SDL = 1
 		conf.define('USE_SDL', 1)
@@ -323,6 +328,20 @@ def check_deps(conf):
 			for i in a:
 				conf.check_cc(lib = i)
 
+	if conf.env.DEST_OS == "darwin":
+		conf.check(lib='iconv', uselib_store='ICONV')
+		conf.env.FRAMEWORK_APPKIT = "AppKit"
+		conf.env.FRAMEWORK_IOKIT = "IOKit"
+		conf.env.FRAMEWORK_FOUNDATION = "Foundation"
+		conf.env.FRAMEWORK_COREFOUNDATION = "CoreFoundation"
+		conf.env.FRAMEWORK_COREGRAPHICS = "CoreGraphics"
+		conf.env.FRAMEWORK_OPENGL = "OpenGL"
+		conf.env.FRAMEWORK_CARBON = "Carbon"
+		conf.env.FRAMEWORK_APPLICATIONSERVICES = "ApplicationServices"
+		conf.env.FRAMEWORK_CORESERVICES = "CoreServices"
+		conf.env.FRAMEWORK_COREAUDIO = "CoreAudio"
+		conf.env.FRAMEWORK_AUDIOTOOLBOX = "AudioToolbox"
+		conf.env.FRAMEWORK_SYSTEMCONFIGURATION = "SystemConfiguration"
 
 	if conf.options.TESTS:
 		return
@@ -361,21 +380,6 @@ def check_deps(conf):
 		conf.check(lib='android_support', uselib_store='ANDROID_SUPPORT')
 		conf.check(lib='opus', uselib_store='OPUS')
 
-	if conf.env.DEST_OS == "darwin":
-		conf.check(lib='iconv', uselib_store='ICONV')
-		conf.env.FRAMEWORK_APPKIT = "AppKit"
-		conf.env.FRAMEWORK_IOKIT = "IOKit"
-		conf.env.FRAMEWORK_FOUNDATION = "Foundation"
-		conf.env.FRAMEWORK_COREFOUNDATION = "CoreFoundation"
-		conf.env.FRAMEWORK_COREGRAPHICS = "CoreGraphics"
-		conf.env.FRAMEWORK_OPENGL = "OpenGL"
-		conf.env.FRAMEWORK_CARBON = "Carbon"
-		conf.env.FRAMEWORK_APPLICATIONSERVICES = "ApplicationServices"
-		conf.env.FRAMEWORK_CORESERVICES = "CoreServices"
-		conf.env.FRAMEWORK_COREAUDIO = "CoreAudio"
-		conf.env.FRAMEWORK_AUDIOTOOLBOX = "AudioToolbox"
-		conf.env.FRAMEWORK_SYSTEMCONFIGURATION = "SystemConfiguration"
-
 	if conf.env.DEST_OS == 'win32':
 		conf.check(lib='libz', uselib_store='ZLIB', define_name='USE_ZLIB')
 		# conf.check(lib='nvtc', uselib_store='NVTC')

Original file line number	Diff line number	Diff line change
`@@ -2224,7 +2224,7 @@ GLMDisplayDB *CSDLMgr::GetDisplayDB( void )`
`2224`	`2224`	`}`
`2225`	`2225`
`2226`	`2226`	`#ifndef OSX`
`2227`		`-# include "glmdisplaydb_linuxwin.inl"`
	`2227`	`+#include "glmdisplaydb_linuxwin.inl"`
`2228`	`2228`	`#endif`
`2229`	`2229`
`2230`	`2230`
Original file line number	Diff line number	Diff line change
`@@ -659,16 +659,16 @@ void CBaseFileSystem::InitAsync()`
`659`	`659`	`Msg( "Async I/O disabled from command line\n" );`
`660`	`660`	`return;`
`661`	`661`	`}`
`662`		`-`
	`662`	`+#ifndef UNITTESTS`
`663`	`663`	`if ( VCRGetMode() == VCR_Disabled )`
	`664`	`+#endif`
`664`	`665`	`{`
`665`	`666`	`// create the i/o thread pool`
`666`	`667`	`m_pThreadPool = CreateThreadPool();`
`667`	`668`
`668`	`669`	`ThreadPoolStartParams_t params;`
`669`	`670`	`params.iThreadPriority = 0;`
`670`	`671`	`params.bIOThreads = true;`
`671`		`- params.nThreadsMax = 4; // Limit count of IO threads to a maximum of 4.`
`672`	`672`	`if ( IsX360() )`
`673`	`673`	`{`
`674`	`674`	`// override defaults`
`@@ -678,11 +678,10 @@ void CBaseFileSystem::InitAsync()`
`678`	`678`	`params.bUseAffinityTable = true;`
`679`	`679`	`params.iAffinityTable[0] = XBOX_PROCESSOR_3;`
`680`	`680`	`}`
`681`		`- else if( IsPC() )`
	`681`	`+ else`
`682`	`682`	`{`
`683`		`- // override defaults`
`684`		`- // maximum # of async I/O thread on PC is 2`
`685`		`- params.nThreads = 1;`
	`683`	`+ params.nThreadsMax = MIN(params.nThreads, 4); // Limit count of IO threads to a maximum of 4.`
	`684`	`+ params.nStackSize = 256*1024;`
`686`	`685`	`}`
`687`	`686`
`688`	`687`	`if ( !m_pThreadPool->Start( params, "IOJob" ) )`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ bool CUnitTestApp::Create()`
`128`	`128`	`while ((dir = readdir(d)) != NULL)`
`129`	`129`	`{`
`130`	`130`	`int len = strlen(dir->d_name);`
`131`		`- if( len > 2 && strcmp(dir->d_name+len-3, ".so") == 0)`
	`131`	`+ if( len > 2 && strcmp(dir->d_name+len-strlen(DLL_EXT_STRING), DLL_EXT_STRING) == 0)`
`132`	`132`	`{`
`133`	`133`	`static char path[2048];`
`134`	`134`	`snprintf(path, sizeof(path), "tests/%s", dir->d_name);`