changed title-name for process

kingjeffli · Nov 6, 2016 · 5b231d0 · 5b231d0
1 parent 86bf9fc
commit 5b231d0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 31 deletions.
diff --git a/NFComm/NFPluginLoader/NFPluginLoader.cpp b/NFComm/NFPluginLoader/NFPluginLoader.cpp
@@ -33,6 +33,7 @@ std::string strArgvList;
 std::string strPluginName;
 std::string strAppName;
 std::string strAppID;
+std::string strTitleName;
 
 #if NF_PLATFORM == NF_PLATFORM_WIN
 
@@ -220,6 +221,12 @@ void ProcessParameter(int argc, char* argv[])
         }
 	}
 
+	strTitleName = strAppName + "[" + strAppID + "] PID[" + NFGetPID() + "]";
+#if NF_PLATFORM == NF_PLATFORM_WIN
+	SetConsoleTitle(strTitleName.c_str());
+#else
+	setproctitle(strTitleName.c_str());
+#endif
 }
 
 int main(int argc, char* argv[])

diff --git a/NFComm/NFPluginModule/NFPlatform.h b/NFComm/NFPluginModule/NFPlatform.h
@@ -272,8 +272,12 @@ typedef int64_t NFINT64;
 //#define GOOGLE_GLOG_DLL_DECL=
 
 ///////////////////////////////////////////////////////////////
+#include <string>
+#include <algorithm>
+#include <cmath>
 #include <time.h>
 #include <sstream>
+#include <common/lexical_cast.hpp>
 
 #ifndef _MSC_VER
 #include <sys/time.h>
@@ -282,6 +286,7 @@ typedef int64_t NFINT64;
 #else
 #include <windows.h>
 #include <time.h>
+#include <process.h>
 #define EPOCHFILETIME 11644473600000000Ui64
 #endif
 
@@ -290,10 +295,12 @@ typedef int64_t NFINT64;
 #define NFSPRINTF sprintf_s
 #define NFSTRICMP stricmp
 #define NFSLEEP(s) Sleep(s)
+#define NFGetPID() lexical_cast<std::string>(getpid())
 #else
 #define NFSPRINTF snprintf
 #define NFSTRICMP strcasecmp
 #define NFSLEEP(s) usleep(s)
+#define NFGetPID() lexical_cast<std::string>(getpid())
 #endif
 
 #ifndef NF_DYNAMIC_PLUGIN
@@ -326,10 +333,7 @@ typedef int64_t NFINT64;
 #define NF_SHARE_PTR std::shared_ptr
 #define NF_NEW new
 
-#include <string>
-#include <algorithm>
-#include <cmath>
-#include <common/lexical_cast.hpp>
+
 template<typename DTYPE>
 bool NF_StrTo(const std::string& strValue, DTYPE& nValue)
 {

diff --git a/NFServer/NFGameServerPlugin/NFGameServerPlugin.cpp b/NFServer/NFGameServerPlugin/NFGameServerPlugin.cpp
@@ -18,11 +18,7 @@
 
 NF_EXPORT void DllStartPlugin(NFIPluginManager* pm)
 {
-#if NF_PLATFORM == NF_PLATFORM_WIN
-    SetConsoleTitle("NFGameServer");
-#endif // NF_PLATFORM
     CREATE_PLUGIN(pm, NFGameServerPlugin)
-
 };
 
 NF_EXPORT void DllStopPlugin(NFIPluginManager* pm)

diff --git a/NFServer/NFLoginLogicPlugin/NFLoginLogicPlugin.cpp b/NFServer/NFLoginLogicPlugin/NFLoginLogicPlugin.cpp
@@ -15,11 +15,7 @@
 
 NF_EXPORT void DllStartPlugin(NFIPluginManager* pm)
 {
-#if NF_PLATFORM == NF_PLATFORM_WIN
-    SetConsoleTitle("NFLoginServer");
-#endif
     CREATE_PLUGIN(pm, NFLoginLogicPlugin)
-
 };
 
 NF_EXPORT void DllStopPlugin(NFIPluginManager* pm)

diff --git a/NFServer/NFMasterServerPlugin/NFMasterServerPlugin.cpp b/NFServer/NFMasterServerPlugin/NFMasterServerPlugin.cpp
@@ -16,13 +16,7 @@
 
 NF_EXPORT void DllStartPlugin(NFIPluginManager* pm)
 {
-#if NF_PLATFORM == NF_PLATFORM_WIN
-    SetConsoleTitle("NFMasterServer");
-#endif
-
     CREATE_PLUGIN(pm, NFMasterServerPlugin)
-
-    //std::cout << "DllStartPlugin::thread id=" << GetCurrentThreadId() << std::endl;
 };
 
 NF_EXPORT void DllStopPlugin(NFIPluginManager* pm)

diff --git a/NFServer/NFProxyLogicPlugin/NFCProxyLogicPlugin.cpp b/NFServer/NFProxyLogicPlugin/NFCProxyLogicPlugin.cpp
@@ -10,17 +10,11 @@
 #include "NFCProxyLogicPlugin.h"
 #include "NFCProxyLogicModule.h"
 
-//
-//
 #ifdef NF_DYNAMIC_PLUGIN
 
 NF_EXPORT void DllStartPlugin(NFIPluginManager* pm)
 {
-#if NF_PLATFORM == NF_PLATFORM_WIN
-    SetConsoleTitle("NFProxyServer");
-#endif
     CREATE_PLUGIN(pm, NFProxyLogicPlugin)
-
 };
 
 NF_EXPORT void DllStopPlugin(NFIPluginManager* pm)

diff --git a/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.cpp b/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.cpp
@@ -17,9 +17,6 @@
 
 NF_EXPORT void DllStartPlugin(NFIPluginManager* pm)
 {
-#if NF_PLATFORM == NF_PLATFORM_WIN
-    SetConsoleTitle("NFWorldServer");
-#endif // NF_PLATFORM
     CREATE_PLUGIN(pm, NFWorldLogicPlugin)
 };
 

diff --git a/Tutorial/Tutorial3/Tutorial3Plugin.cpp b/Tutorial/Tutorial3/Tutorial3Plugin.cpp
@@ -5,11 +5,7 @@
 
 NF_EXPORT void DllStartPlugin(NFIPluginManager* pm)
 {
-#if NF_PLATFORM == NF_PLATFORM_WIN
-    SetConsoleTitle("Tutorial3");
-#endif
     CREATE_PLUGIN(pm, Tutorial3Plugin)
-
 };
 
 NF_EXPORT void DllStopPlugin(NFIPluginManager* pm)