Build project on azure devops

Fixed a crash in JobManager
eXo-OpenSource · Jul 25, 2019 · d661695 · d661695
1 parent 61032fd
commit d661695
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 85 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
@@ -0,0 +1,38 @@
+stages:
+- stage: Build
+  jobs:
+  - job: Linux
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+    - script: chmod +x utils/premake5 && utils/premake5 gmake
+      displayName: 'Generate Makefile'
+    - script: cd Build && make -j 3 CXX=g++-7 CC=gcc-7 config=release_x64
+      displayName: 'Build project'
+    - script: mv $(Build.SourcesDirectory)/Bin/Release/libml_pathfind.so $(Build.SourcesDirectory)/Bin/Release/ml_pathfind.so
+    - publish: '$(Build.SourcesDirectory)/Bin/Release/ml_pathfind.so'
+      artifact: 'ml_pathfind_linux'
+  - job: Windows
+    pool:
+      vmImage: 'windows-2019'
+    strategy:
+      maxParallel: 2
+      matrix:
+        Win32:
+          platform: 'win32'
+        x64:
+          platform: 'x64'
+    variables:
+      solution: 'Build/pathfind.sln'
+      buildConfiguration: 'Release'
+    steps:
+    - script: utils\premake5 vs2019
+      displayName: 'Create Visual Studio 2019 Solution'
+    - task: VSBuild@1
+      inputs:
+        solution: '$(solution)'
+        configuration: '$(buildConfiguration)'
+        platform: '$(platform)'
+    - script: move /Y $(Build.SourcesDirectory)\Bin\Release\ml_pathfind.dll $(Build.SourcesDirectory)\Bin\Release\ml_pathfind_$(platform).dll
+    - publish: '$(Build.SourcesDirectory)\Bin\Release\ml_pathfind_$(platform).dll'
+      artifact: 'ml_pathfind_$(platform)'
diff --git a/module/CFunctions.cpp b/module/CFunctions.cpp
@@ -252,4 +252,4 @@ int CFunctions::GetNodeNeighbors(lua_State* luaVM)
 	Utils::GetNodeNeighbors(luaVM, node, depth);
 
 	return 1;
-}
+}
diff --git a/module/JobManager.h b/module/JobManager.h
@@ -41,7 +41,7 @@ class JobManager
 
 	void PushTask(Task task, TaskCompleteCallback completeCallback)
 	{
-		std::lock_guard<std::mutex> lock{ _mutex };
+		std::lock_guard<std::recursive_mutex> lock{ _mutex };
 
 		_tasks.push({ task, completeCallback });
 	}
@@ -68,14 +68,14 @@ class JobManager
 			TaskResult result = task.first();
 
 			// Put result into completed tasks list
-			std::lock_guard<std::mutex> lock{ _mutex };
+			std::lock_guard<std::recursive_mutex> lock{ _mutex };
 			_completedTasks.push_back({ result, task.second });
 		}
 	}
 
 	void SpreadResults()
 	{
-		std::lock_guard<std::mutex> lock{ _mutex };
+		std::lock_guard<std::recursive_mutex> lock{ _mutex };
 
 		if (_completedTasks.empty())
 			return;
@@ -96,5 +96,5 @@ class JobManager
 	std::queue<std::pair<Task, TaskCompleteCallback>> _tasks;
 	std::list<std::pair<TaskResult, TaskCompleteCallback>> _completedTasks;
 
-	std::mutex _mutex;
+	std::recursive_mutex _mutex;
 };
diff --git a/module/premake5.lua b/module/premake5.lua
@@ -1,5 +1,6 @@
 project "module"
 	language "C++"
+	cppdialect "C++14"
 	kind "SharedLib"
 	targetname "ml_pathfind"
 

diff --git a/pathfind/premake5.lua b/pathfind/premake5.lua
@@ -1,5 +1,6 @@
 project "pathfind"
 	language "C++"
+	cppdialect "C++14"
 	kind "StaticLib"
 
 	vpaths {

diff --git a/premake.bat b/premake.bat
diff --git a/premake5 b/premake5
diff --git a/premake5.exe b/premake5.exe
diff --git a/premake5.lua b/premake5.lua
@@ -4,7 +4,6 @@ solution "PathFind"
 	startproject "test"
 	targetdir "Bin/%{cfg.buildcfg}"
 
-	flags { "C++14" }
 	platforms { "x86", "x64" }
 	pic "On"
 	symbols "On"

diff --git a/test/premake5.lua b/test/premake5.lua
@@ -1,5 +1,6 @@
 project "test"
 	language "C++"
+	cppdialect "C++14"
 	kind "ConsoleApp"
 
 	links { "pathfind" }

diff --git a/utils/premake5 b/utils/premake5
diff --git a/utils/premake5-macos b/utils/premake5-macos
diff --git a/utils/premake5.exe b/utils/premake5.exe
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,4 +252,4 @@ int CFunctions::GetNodeNeighbors(lua_State* luaVM) @@
     	Utils::GetNodeNeighbors(luaVM, node, depth);
     	return 1;
-    }
+    }