Z991239-1585 #comment guardian路径及名称（exe）和Tool目录添加 修改 other:guardian路径及名称（exe）修改和Tool目录添加

Tool/CMakeLists.txt

@@ -0,0 +1,13 @@
+if(SIMULATE_ON)
+	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
+endif(SIMULATE_ON)
+
+file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
+
+foreach(dir ${all_valid_subdirs})
+	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
+		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
+		message(STATUS "Adding other component ${dir_trimmed}")
+		add_subdirectory(${dir_trimmed})
+	endif()
+endforeach(dir)

Tool/guardian/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required (VERSION 3.8)
+
+project(guardian)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+include_directories(../GuardianBase ${RVC_COMMON_INCLUDE_DIR})
+add_executable(guardian guardian.cpp guardian.h)

Tool/guardian/guardian.cpp

@@ -250,8 +250,8 @@ bool VersionRollback()
 	string strActiveTxtPath, strVersionDatPath;
 #ifdef linux
 	//todo oiltestlinux
-	strActiveTxtPath = "/home/vtmsc001/run/version/active.txt";
-	strVersionDatPath = "/home/vtmsc001/run/runinfo/runcfg/version.dat";
+	strActiveTxtPath = "/opt/run/version/active.txt";
+	strVersionDatPath = "/opt/run/runinfo/runcfg/version.dat";
 #else
 	string strDisk(chDisk);
 	strActiveTxtPath = strDisk + ":\\Run\\version\\active.txt";
@@ -372,7 +372,7 @@ bool ReadRuninfoContent(string &strData)
 	string strGdRuninfoPath;
 #ifdef linux
 	//todo oiltestlinux
-	strGdRuninfoPath = "/home/vtmsc001/run/runinfo/runcfg/gdruninfo";
+	strGdRuninfoPath = "/opt/run/runinfo/runcfg/gdruninfo";
 #else
 	string strDisk(chDisk);
 	strGdRuninfoPath = strDisk + ":\\Run\\runinfo\\runcfg\\gdruninfo";
@@ -401,7 +401,7 @@ bool WriteRunInfoContent(const char* pData)
 	string strGdRuninfoPath;
 #ifdef linux
 	//todo oiltestlinux
-	strGdRuninfoPath = "/home/vtmsc001/run/runinfo/runcfg/gdruninfo";
+	strGdRuninfoPath = "/opt/run/runinfo/runcfg/gdruninfo";
 #else
 	string strDisk(chDisk);
 	strGdRuninfoPath = strDisk + ":\\Run\\runinfo\\runcfg\\gdruninfo";
@@ -422,7 +422,7 @@ bool IsStartTimeFileExist()
 	string strStartTimePath;
 #ifdef linux
 	//todo oiltestlinux
-	strStartTimePath = "/home/vtmsc001/run/runinfo/runcfg/starttime.dat";
+	strStartTimePath = "/opt/run/runinfo/runcfg/starttime.dat";
 #else
 	string strDisk(chDisk);
 	strStartTimePath = strDisk + ":\\Run\\runinfo\\runcfg\\starttime.dat";
@@ -1249,6 +1249,11 @@ void CheckGuardianDbgDirAndCreateDbgFile(bool bChangeDay = false)
 }
 int main()
 {
+	//attach file descriptors 0,1,2 to /dev/null(for deamon app)
+	int fd0, fd1, fd2;
+	fd0 = open("/dev/null", O_RDWR);
+	fd1 = dup(0);
+	fd2 = dup(0);
 	g_bFrameOnline = true;
 #ifdef linux
 	pthread_mutex_init(&g_cs_event,NULL);