From 1fd49a571338b6c946bb05dcdf59ec1468df5c50 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 목, 22 12월 2022 12:31:43 +0900
Subject: [PATCH] ongoing50 #4403 CF AOI Reveiw TACT 지연 개선 1. 일정 시간 유지 신호 처리 시 동기화로 인한 불합리 개선 - 일정 시간 유지 필요 시 스래드풀 작업큐를 이용하여 루프처리 방식으로 변경 - 유지 신호 처리 중 출력 신호 발생 시 작업큐에 등록하여 유지 신호와 결합하여 출력 처리 2. FDC 보고 항목 중 SW 버전 체크 루프 불합리 개선 - 프로그램 시작 시 연동 프로그램 버전 체크 간 실행되지 않는 프로그램이 있는 경우 무한 루프 발생 - 무한 루프로 인한 CPU 점유 상승->루프 중간 Sleep추가 및 코드 간소화 3. 로그 메시지에 시간 ms단위 추가(황만수SM 작업 내역 병합)
---
ReviewSystem/ReviewSystem/ReviewInterface.cpp | 246 +++++++++++++++++++++++++++++++------------------
1 files changed, 155 insertions(+), 91 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.cpp b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
index 1b652cd..c1b86eb 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.cpp
@@ -585,110 +585,174 @@
void CReviewInterface::threadSet3rdPartyProgramVersion(void* pArg)
{
CReviewInterface* pThis = (CReviewInterface*)pArg;
- //LYW0412
- BOOL bReturn, bRetFTPUploader = FALSE, bRetGRM = FALSE, bRetSync = FALSE;
- CFileFind finder;
- CTime timeLastWrite;
- TCHAR currentPath[MAX_PATH];
- DWORD dwPid;
- HWND hWnd;
- HANDLE hHandle;
- CString strTemp;
+ /*< SWK 20221222 - #4403 MOD Start >*/
+// //LYW0412
+// BOOL bReturn, bRetFTPUploader = FALSE, bRetGRM = FALSE, bRetSync = FALSE;
+// CFileFind finder;
+// CTime timeLastWrite;
+// TCHAR currentPath[MAX_PATH];
+// DWORD dwPid;
+// HWND hWnd;
+// HANDLE hHandle;
+// CString strTemp;
+//
+// while ((bRetFTPUploader&bRetGRM&bRetSync) != TRUE)
+// {
+// bReturn = FALSE;
+//
+// //FTPUploader S/W Version Start
+// if (bRetFTPUploader == FALSE)
+// {
+// dwPid = 0;
+// hWnd = ::FindWindow(NULL, _T("FTPUploader"));
+// GetWindowThreadProcessId(hWnd, &dwPid);
+// hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid);
+// ZeroMemory(currentPath, MAX_PATH);
+// GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH);
+//
+// bReturn = finder.FindFile(currentPath);
+// }
+//
+// while (bReturn)
+// {
+// bReturn = finder.FindNextFile();
+//
+// if (finder.IsDots()) continue;
+// if (finder.IsDirectory()) continue;
+//
+// finder.GetLastWriteTime(timeLastWrite);
+// strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay());
+// pThis->m_nFDCFTPUploaderSWVersion = atoi(strTemp);
+// g_pLog->DisplayMessage(_T("FDCFTPUploaderSWVersion = %d "), pThis->m_nFDCFTPUploaderSWVersion);
+// bRetFTPUploader = TRUE;
+// }
+// //FTPUploader S/W Version End
+//
+// bReturn = FALSE;
+//
+// //Dit Glass Raw Messenger S/W Version Start
+// if (bRetGRM == FALSE)
+// {
+// dwPid = 0;
+// hWnd = ::FindWindow(NULL, _T("Dit Glass Raw Messenger"));
+// GetWindowThreadProcessId(hWnd, &dwPid);
+// hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid);
+// ZeroMemory(currentPath, MAX_PATH);
+// GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH);
+//
+// bReturn = finder.FindFile(currentPath);
+// }
+//
+// while (bReturn)
+// {
+// bReturn = finder.FindNextFile();
+//
+// if (finder.IsDots()) continue;
+// if (finder.IsDirectory()) continue;
+//
+// finder.GetLastWriteTime(timeLastWrite);
+// strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay());
+// pThis->m_nFDCGRMSWVersion = atoi(strTemp);
+// g_pLog->DisplayMessage(_T("FDCGRMSWVersion = %d "), pThis->m_nFDCGRMSWVersion);
+// bRetGRM = TRUE;
+// }
+// //Dit Glass Raw Messenger S/W Version End
+//
+// bReturn = FALSE;
+//
+// //Dit Shared Memory Sync Client S/W Version Start
+// if (bRetSync == FALSE)
+// {
+// dwPid = 0;
+// hWnd = ::FindWindow(NULL, _T("Dit Shared Memory Sync Client"));
+// GetWindowThreadProcessId(hWnd, &dwPid);
+// hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid);
+// ZeroMemory(currentPath, MAX_PATH);
+// GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH);
+//
+// bReturn = finder.FindFile(currentPath);
+// }
+//
+// while (bReturn)
+// {
+// bReturn = finder.FindNextFile();
+//
+// if (finder.IsDots()) continue;
+// if (finder.IsDirectory()) continue;
+//
+// finder.GetLastWriteTime(timeLastWrite);
+// strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay());
+// pThis->m_nFDCSyncSWVersion = atoi(strTemp);
+// g_pLog->DisplayMessage(_T("FDCSyncSWVersion = %d "), pThis->m_nFDCSyncSWVersion);
+// bRetSync = TRUE;
+// }
+// //Dit Shared Memory Sync Client S/W Version End
+// }
+//
+// finder.Close();
- while ((bRetFTPUploader&bRetGRM&bRetSync) != TRUE)
+ auto GetModuleFileLastTime = [](LPCTSTR strWindowTitle)->long {
+ long nLastTime = 0;
+ DWORD dwPid = 0;
+
+ HWND hWnd = ::FindWindow(NULL, strWindowTitle);
+ if (hWnd == INVALID_HANDLE_VALUE)
+ return nLastTime;
+
+ GetWindowThreadProcessId(hWnd, &dwPid);
+ HANDLE hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid);
+ TCHAR currentPath[MAX_PATH];
+ ZeroMemory(currentPath, MAX_PATH);
+ GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH);
+
+ CFileFind finder;
+ if (finder.FindFile(currentPath))
+ {
+ finder.FindNextFile();
+
+ if (finder.IsDirectory() || finder.IsDots())
+ return nLastTime;
+
+ CTime timeLastWrite;
+ finder.GetLastWriteTime(timeLastWrite);
+ nLastTime = atoi(timeLastWrite.Format(_T("%Y%m%d")));
+ }
+ return nLastTime;
+ };
+
+ BOOL bRetFTPUploader = FALSE, bRetGRM = FALSE, bRetSync = FALSE;
+ while ((bRetFTPUploader&bRetGRM&bRetSync) != TRUE)
{
- bReturn = FALSE;
-
- //FTPUploader S/W Version Start
+ //FTPUploader S/W Version
if (bRetFTPUploader == FALSE)
{
- dwPid = 0;
- hWnd = ::FindWindow(NULL, _T("FTPUploader"));
- GetWindowThreadProcessId(hWnd, &dwPid);
- hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid);
- ZeroMemory(currentPath, MAX_PATH);
- GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH);
-
- bReturn = finder.FindFile(currentPath);
+ if (pThis->m_nFDCFTPUploaderSWVersion = GetModuleFileLastTime(_T("FTPUploader")))
+ {
+ g_pLog->DisplayMessage(_T("FDCFTPUploaderSWVersion = %d "), pThis->m_nFDCFTPUploaderSWVersion);
+ bRetFTPUploader = TRUE;
+ }
}
-
- while (bReturn)
- {
- bReturn = finder.FindNextFile();
-
- if (finder.IsDots()) continue;
- if (finder.IsDirectory()) continue;
-
- finder.GetLastWriteTime(timeLastWrite);
- strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay());
- pThis->m_nFDCFTPUploaderSWVersion = atoi(strTemp);
- g_pLog->DisplayMessage(_T("FDCFTPUploaderSWVersion = %d "), pThis->m_nFDCFTPUploaderSWVersion);
- bRetFTPUploader = TRUE;
- }
- //FTPUploader S/W Version End
-
- bReturn = FALSE;
-
- //Dit Glass Raw Messenger S/W Version Start
+ //Dit Glass Raw Messenger S/W Version
if (bRetGRM == FALSE)
{
- dwPid = 0;
- hWnd = ::FindWindow(NULL, _T("Dit Glass Raw Messenger"));
- GetWindowThreadProcessId(hWnd, &dwPid);
- hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid);
- ZeroMemory(currentPath, MAX_PATH);
- GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH);
-
- bReturn = finder.FindFile(currentPath);
+ if (pThis->m_nFDCGRMSWVersion = GetModuleFileLastTime(_T("Dit Glass Raw Messenger")))
+ {
+ g_pLog->DisplayMessage(_T("FDCGRMSWVersion = %d "), pThis->m_nFDCGRMSWVersion);
+ bRetGRM = TRUE;
+ }
}
-
- while (bReturn)
- {
- bReturn = finder.FindNextFile();
-
- if (finder.IsDots()) continue;
- if (finder.IsDirectory()) continue;
-
- finder.GetLastWriteTime(timeLastWrite);
- strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay());
- pThis->m_nFDCGRMSWVersion = atoi(strTemp);
- g_pLog->DisplayMessage(_T("FDCGRMSWVersion = %d "), pThis->m_nFDCGRMSWVersion);
- bRetGRM = TRUE;
- }
- //Dit Glass Raw Messenger S/W Version End
-
- bReturn = FALSE;
-
//Dit Shared Memory Sync Client S/W Version Start
if (bRetSync == FALSE)
{
- dwPid = 0;
- hWnd = ::FindWindow(NULL, _T("Dit Shared Memory Sync Client"));
- GetWindowThreadProcessId(hWnd, &dwPid);
- hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid);
- ZeroMemory(currentPath, MAX_PATH);
- GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH);
-
- bReturn = finder.FindFile(currentPath);
+ if (pThis->m_nFDCSyncSWVersion = GetModuleFileLastTime(_T("Dit Shared Memory Sync Client")))
+ {
+ g_pLog->DisplayMessage(_T("FDCSyncSWVersion = %d "), pThis->m_nFDCSyncSWVersion);
+ bRetSync = TRUE;
+ }
}
-
- while (bReturn)
- {
- bReturn = finder.FindNextFile();
-
- if (finder.IsDots()) continue;
- if (finder.IsDirectory()) continue;
-
- finder.GetLastWriteTime(timeLastWrite);
- strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay());
- pThis->m_nFDCSyncSWVersion = atoi(strTemp);
- g_pLog->DisplayMessage(_T("FDCSyncSWVersion = %d "), pThis->m_nFDCSyncSWVersion);
- bRetSync = TRUE;
- }
- //Dit Shared Memory Sync Client S/W Version End
+ Sleep(1);
}
-
- finder.Close();
+ /*< SWK 20221222 - #4403 MOD End >*/
}
void CReviewInterface::SetReviewProgramVersion()
--
Gitblit v1.9.3