Return

README.md

@@ -1,14 +1,87 @@
 # SMS - Server Monitoring Service
 
-### (this project is not a finished project.)
-### Server Monitoring Service
-#### > SMS Agent
-#### > Data Server
-#### > Web Server (Visualization)
-###
 
+### **Server Monitoring Service (SMS)**
+>#### SMS Agent
+>#### Data Server
+>#### Web Server (Visualization)
 ---
+##### 현재 이 프로젝트는 개발중 입니다.
+##### this project is work in progress.
+##### 크로스 플랫폼 지원 예정입니다. 현재는 윈도우만 지원중
+##### Cross-platform support is being planned. Currently, only Windows is supported.
 
-##### Cross-platform support be expected. Currently, only Windows is supported.
+## List Collected by Agent
 
+* Cpu
+  * CpuUsage
+  * CpuIdle
+  * CpuModel
+* Memory
+  * MemoryLoadPercent
+  * MemoryUsedByte
+  * MemoryFreeByte
+  * MemoryTotalByte
+* System Info
+  * UserName
+  * ComputerName
+  * OsVersionName
+* Disk
+  * Path
+  * Name
+  * FileFormat
+  * UsedBytes
+  * TotalBytes
+  * FreeBytes
+  * Type
+  * DiskPerformance
+  * ReadSec
+  * WriteSec
+  * DiskCount
+* Process
+  * PID
+  * CommandLine
+  * Name
+  * Path
+  * Owner
+  * CreateTime
+  * HandleCount
+  * ThreadCount
+  * MemoryUsage
+  * CpuUsage
+  * TotalThreadCount
+* Network Connection Info
+  * ProtocolType
+  * LocalEndpoint
+    * IPV4
+    * IPV6
+    * Port
+  * RemoteEndpoint
+    * IPV4
+    * IPV6
+    * Port
+  * State
+  * ProcessID
+  * CreateTime
+  * OwnerInfo
+  * NetworkConnectionCount
+* Network Adapter Info
+  * AdapterCount
+
+## Network Protocol
+
+#### SMS Agent -> (TCP)
+#### (TCP) Data Server -> (WebSocket)
+#### (WebSocket) Web Server
+
+## Used Library
+| Library Name | Link | License |
+| :---------------: | :-----------------: | :-------------------: |
+| RapidJson      | <https://github.com/miloyip/rapidjson/> | MIT |
+| LZ4 | <https://github.com/lz4/lz4> | BSD |
+
+## Commit Message
+https://gitmoji.carloscuesta.me/
+
+## Info
 [![npm](https://img.shields.io/badge/email-bg0820%40naver.com-red.svg)]()

ServerMonitoringService/ServerMonitoringService Server/ServerMonitoringService Server.vcxproj

@@ -118,6 +118,7 @@
     <ClCompile Include="network socket\NetworkManager.cpp" />
     <ClCompile Include="util\Log.cpp" />
     <ClCompile Include="util\StopWatch.cpp" />
+    <ClCompile Include="util\Thread.cpp" />
     <ClCompile Include="util\Util.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -127,6 +128,7 @@
     <ClInclude Include="network socket\NetworkManager.hpp" />
     <ClInclude Include="util\Log.hpp" />
     <ClInclude Include="util\StopWatch.hpp" />
+    <ClInclude Include="util\Thread.hpp" />
     <ClInclude Include="util\Util.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

ServerMonitoringService/ServerMonitoringService Server/ServerMonitoringService Server.vcxproj.filters

@@ -39,6 +39,9 @@
     <ClCompile Include="data\ClientManager.cpp">
       <Filter>소스 파일</Filter>
     </ClCompile>
+    <ClCompile Include="util\Thread.cpp">
+      <Filter>소스 파일</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="util\StopWatch.hpp">
@@ -62,5 +65,8 @@
     <ClInclude Include="data\Client.hpp">
       <Filter>헤더 파일</Filter>
     </ClInclude>
+    <ClInclude Include="util\Thread.hpp">
+      <Filter>헤더 파일</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

ServerMonitoringService/ServerMonitoringService Server/data/ClientManager.cpp

@@ -15,7 +15,7 @@ Client* ClientManager::add(SOCKADDR_IN paramAddr, SOCKET paramClientSocket)
 		client->recvBytes = 0;
 		client->sendBytes = 0;
 
-		clientList.insert(hash_map<string, Client*>::value_type(ip, client));
+		clientList.insert(unordered_map<string, Client*>::value_type(ip, client));
 
 		string str = Util::format("Client Connected [%s], Count : %d", ip.c_str(), getCount());
 		Log::printLog(str);

ServerMonitoringService/ServerMonitoringService Server/data/ClientManager.hpp

@@ -5,15 +5,14 @@
 
 #include "../util/Log.hpp"
 #include <Windows.h>
-#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS 1
-#include <hash_map>
+#include <unordered_map>
 
 using namespace std;
 
 class ClientManager
 {
 private:
-	hash_map<string, Client*> clientList;
+	unordered_map<string, Client*> clientList;
 	int clientCount = 0;
 public:
 	Client* add(SOCKADDR_IN paramAddr, SOCKET paramClientSocket);

ServerMonitoringService/ServerMonitoringService Server/network socket/NetworkListener.cpp

@@ -1,8 +1,10 @@
 #include "NetworkListener.hpp"
 
 
-DWORD WINAPI NetworkListener::threadProc(LPVOID hIOCP)
+DWORD NetworkListener::callbackProc(LPVOID hIOCP)
 {
+	NetworkListener * instance = reinterpret_cast <NetworkListener *> (hIOCP);
+
 	HANDLE threadHandler = *((HANDLE *)hIOCP);
 	DWORD receiveBytes;
 	DWORD sendBytes;
@@ -258,13 +260,12 @@ int NetworkListener::Init(SOCKET &paramSocket, SOCKADDR_IN &parmAddr, int &param
 	HANDLE hIOCP = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
 	ULONG threadId;
 
-
 	// Create Thread
 	for (int i = 0; i < this->threadCount; i++)
 	{
-		// [&]() {networkProc(serverSocket, addr);
-
-		hThread[i] = CreateThread(NULL, 0, std::bind(threadProc, this), &hIOCP, 0, &threadId);
+		// 
+		ThreadWrapper *threadWrapper = new ThreadWrapper(std::bind(&NetworkListener::callbackProc, this), &hIOCP);
+		//hThread[i] = CreateThread(NULL, 0, std::bind(&NetworkListener::threadProc, this), &hIOCP, 0, &threadId);
 	}
 
 	handle = hIOCP;

ServerMonitoringService/ServerMonitoringService Server/network socket/NetworkListener.hpp

@@ -10,6 +10,10 @@
 #include "../data/Client.hpp"
 #include "../data/ClientManager.hpp"
 #include <atlstr.h>
+/*
+	Thread Class
+*/
+#include "../util/Thread.hpp"
 
 #pragma comment(lib, "ws2_32.lib") // WinSock2 Lib
 
@@ -48,7 +52,7 @@ class NetworkListener
 private:
 	int Init(SOCKET &pSocket, SOCKADDR_IN &paramAddr, int &paramRetValue, HANDLE &handle);
 	void initSocketAddr(BOOLEAN IPv6);
-	DWORD WINAPI threadProc(LPVOID hIOCP);
+	DWORD callbackProc(LPVOID hIOCP);
 public:
 	NetworkListener(TCHAR *ip, USHORT port) : serverIp(ip), serverPort(port)
 	{

ServerMonitoringService/ServerMonitoringService Server/util/Thread.cpp

@@ -0,0 +1,31 @@
+#include "Thread.hpp"
+
+DWORD WINAPI ThreadWrapper::threadProc(LPVOID lpParameter)
+{
+	// copy
+	ThreadWrapper* obj = (ThreadWrapper*)lpParameter;
+
+	if (obj->func)
+		obj->func(obj->lpParam);
+
+	return 1;
+}
+
+void ThreadWrapper::run()
+{
+	if (this->threadHandle) // timer is exist
+		abort();
+
+	ULONG threadID;
+	this->threadHandle= CreateThread(NULL, 0, threadProc, (PVOID)this, 0, &threadID);
+	this->threadID = threadID;
+}
+
+void ThreadWrapper::abort()
+{
+	DWORD result = 0;
+	GetExitCodeThread(this->threadHandle, &result);
+
+	if (threadHandle)
+		CloseHandle(threadHandle);
+}

ServerMonitoringService/ServerMonitoringService Server/util/Thread.hpp

@@ -0,0 +1,40 @@
+#ifndef _THREAD_H_
+#define _THREAD_H_
+
+#include <functional>
+#include <Windows.h>
+#include <thread>
+
+using namespace std;
+
+class ThreadWrapper
+{
+private:
+	static UINT threadCount;
+	HANDLE threadHandle = NULL;
+	//HANDLE timerQueue = NULL;
+	UINT threadID = 0;
+	LPVOID lpParam;
+	//UINT interval = 0;
+	static DWORD WINAPI threadProc(LPVOID lpParameter);
+public:
+	function<void(LPVOID)> func = NULL;
+public:
+	ThreadWrapper(function<void(LPVOID)> paramFunc, HANDLE lpParam)
+	{
+		this->threadCount++;
+		this->func = paramFunc;
+		this->lpParam = lpParam;
+	}
+
+	~ThreadWrapper()
+	{
+		if (threadHandle)
+			abort();
+	}
+
+	void run();
+	void abort();
+};
+
+#endif // !_THREAD_H_