Merge pull request #1513 from dgelessus/reduce_pnutils

Move most pnUtils code into more appropriate places

Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt

@@ -25,7 +25,6 @@ target_link_libraries(
     PRIVATE
         pnAsyncCoreExe # Implementation is here
         pnNetBase
-        pnUtils
         plStatusLog # :(
 )
 

Sources/Plasma/NucleusLib/pnAsyncCore/Pch.h

@@ -52,7 +52,6 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 
 #include <thread>
 
-#include "pnUtils/pnUtils.h"
 #include "plProduct.h"
 #include "pnNetBase/pnNetBase.h"
 #include "Private/pnAcAllIncludes.h"

Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcThread.h

@@ -54,7 +54,6 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 #include <thread>
 
 #include "pnNetBase/pnNbError.h"
-#include "pnUtils/pnUtils.h"
 
 
 /****************************************************************************

Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt

@@ -26,7 +26,7 @@ target_link_libraries(
         CoreLib
         pnAsyncCore
         pnNetBase
-        pnUtils
+        pnNucleusInc
         ASIO::ASIO
         $<$<BOOL:${USE_VLD}>:${VLD_LIBRARY}>
 )

Sources/Plasma/NucleusLib/pnAsyncCoreExe/Pch.h

@@ -68,10 +68,10 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 
 #include "Private/pnAceInt.h"
 #include "hsThread.h"
+#include "hsTimer.h"
 #include "plProduct.h"
 #include "pnAsyncCore/pnAsyncCore.h"
 #include "pnNetBase/pnNetBase.h"
-#include "pnUtils/pnUtils.h"
 
 #ifdef USE_VLD
 #include <vld.h>

Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceSocket.cpp

@@ -274,7 +274,7 @@ static bool SocketInitConnect(ConnectOperation& op)
     // This steals ownership of op->fSock
     auto sock = std::make_unique<AsyncSocketStruct>(op);
 
-    sock->initTimeMs = TimeGetMs();
+    sock->initTimeMs = hsTimer::GetMilliSeconds<unsigned>();
 
     asio::error_code err;
     sock->fSock.non_blocking(true, err);
@@ -422,7 +422,7 @@ static bool SocketQueueAsyncWrite(AsyncSocket conn, const void* data, size_t byt
     // check for data backlog
     if (!conn->fWriteOps.empty()) {
         WriteOperation* firstQueuedWrite = conn->fWriteOps.front();
-        unsigned currTimeMs = TimeGetMs();
+        unsigned currTimeMs = hsTimer::GetMilliSeconds<unsigned>();
         if (((long)(currTimeMs - firstQueuedWrite->queueTimeMs) >= (long)kBacklogFailMs) && ((long)(currTimeMs - conn->initTimeMs) >= (long)kBacklogInitMs)) {
             PerfAddCounter(kAsyncPerfSocketDisconnectBacklog, 1);
 
@@ -464,7 +464,7 @@ static bool SocketQueueAsyncWrite(AsyncSocket conn, const void* data, size_t byt
         op->fNotify.buffer = membuf + sizeof(WriteOperation);
         op->fNotify.bytes = bytes;
         op->fNotify.bytesProcessed = 0;
-        op->queueTimeMs = TimeGetMs();
+        op->queueTimeMs = hsTimer::GetMilliSeconds<unsigned>();
         memcpy(op->fNotify.buffer, data, bytes);
 
         PerfAddCounter(kAsyncPerfSocketBytesWaitQueued, bytes);

Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceThread.cpp

@@ -73,9 +73,10 @@ static void CreateThreadProc(AsyncThreadRef thread)
 //============================================================================
 void ThreadDestroy(unsigned exitThreadWaitMs)
 {
-    unsigned bailAt = TimeGetMs() + exitThreadWaitMs;
-    while (AsyncPerfGetCounter(kAsyncPerfThreadsCurr) && signed(bailAt - TimeGetMs()) > 0)
+    unsigned bailAt = hsTimer::GetMilliSeconds<unsigned>() + exitThreadWaitMs;
+    while (AsyncPerfGetCounter(kAsyncPerfThreadsCurr) && hsTimer::GetMilliSeconds<unsigned>() < bailAt) {
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
 }
 
 //============================================================================

Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt

@@ -2,13 +2,15 @@ set(pnEncryption_SOURCES
     plBigNum.cpp
     plChallengeHash.cpp
     plChecksum.cpp
+    plEncryption.cpp
     plSha0.cpp
 )
 
 set(pnEncryption_HEADERS
     plBigNum.h
     plChallengeHash.h
     plChecksum.h
+    plEncryption.h
     plSha0.h
     plRandom.h
 )

Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp → Sources/Plasma/NucleusLib/pnEncryption/plEncryption.cpp

@@ -39,17 +39,8 @@ You can contact Cyan Worlds, Inc. by email [email protected]
       Mead, WA   99021
 
 *==LICENSE==*/
-/*****************************************************************************
-*
-*   $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp
-*   
-***/
-
-#include "Pch.h"
 
-#include "pnUtCrypt.h"
-#include "pnUtStr.h"
-#include "pnUtTime.h"
+#include "plEncryption.h"
 
 #include <openssl/rc4.h>
 

Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.h → Sources/Plasma/NucleusLib/pnEncryption/plEncryption.h

@@ -39,16 +39,11 @@ You can contact Cyan Worlds, Inc. by email [email protected]
       Mead, WA   99021
 
 *==LICENSE==*/
-/*****************************************************************************
-*
-*   $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.h
-*   
-***/
 
-#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCRYPT_H
-#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTCRYPT_H
+#ifndef PL_ENCRYPTION_H
+#define PL_ENCRYPTION_H
 
-#include "pnEncryption/plChecksum.h"
+#include "plChecksum.h"
 
 /*****************************************************************************
 *

Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt

@@ -20,7 +20,6 @@ target_link_libraries(
     PRIVATE
         pnAsyncCore
         pnNetBase
-        pnUtils
         pnUUID
 )
 

Sources/Plasma/NucleusLib/pnNetCli/Pch.h

@@ -51,7 +51,6 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETCLI_PCH_H
 
 
-#include "pnUtils/pnUtils.h"
 #include "pnNetBase/pnNetBase.h"
 #include "pnAsyncCore/pnAsyncCore.h"
 #include "pnEncryption/plBigNum.h"

Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp

@@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 
 #include "hsWindows.h"
 #include "pnEncryption/plChallengeHash.h"
+#include "pnEncryption/plEncryption.h"
 #include "pnUUID/pnUUID.h"
 #include "hsLockGuard.h"
 #include <mutex>

Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt

@@ -39,6 +39,7 @@ target_link_libraries(
     pnNetProtocol
     PUBLIC
         CoreLib
+        pnEncryption
         pnNetBase
         pnUUID
     PRIVATE

Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h

@@ -51,7 +51,6 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETPROTOCOL_PCH_H
 
 #include "HeadSpin.h"
-#include "pnUtils/pnUtils.h"
 #include "pnNetBase/pnNetBase.h"
 #include "pnAsyncCore/pnAsyncCore.h"
 #include "pnNetCli/pnNetCli.h"

Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp

@@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 ***/
 
 #include "../Pch.h"
+
+#include "pnUtils/pnUtStr.h"
 #include "pnUUID/pnUUID.h"
 
 #include <string>

Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h

@@ -64,6 +64,8 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 
 #ifdef USES_NETCLI
 
+#include "pnEncryption/plChecksum.h"
+
 const NetMsgField kNetMsgFieldAccountName   = NET_MSG_FIELD_STRING(kMaxAccountNameLength);
 const NetMsgField kNetMsgFieldPlayerName    = NET_MSG_FIELD_STRING(kMaxPlayerNameLength);
 const NetMsgField kNetMsgFieldShaDigest     = NET_MSG_FIELD_RAW_DATA(sizeof(ShaDigest));

Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt

@@ -1,31 +1,16 @@
 set(pnUtils_HEADERS
-    Pch.h
-    pnUtils.h
-    pnUtCoreLib.h
-    pnUtAllIncludes.h
-    pnUtCrypt.h
     pnUtStr.h
-    pnUtTime.h
 )
 
 set(pnUtils_SOURCES
-    pnUtCrypt.cpp
     pnUtStr.cpp
-    pnUtTime.cpp
 )
 
-plasma_library(pnUtils
-    SOURCES ${pnUtils_HEADERS} ${pnUtils_SOURCES}
-    PRECOMPILED_HEADERS Pch.h
-    UNITY_BUILD
-)
+plasma_library(pnUtils SOURCES ${pnUtils_HEADERS} ${pnUtils_SOURCES})
 target_link_libraries(
     pnUtils
     PUBLIC
         CoreLib
-        pnEncryption
-    PRIVATE
-        OpenSSL::Crypto
 )
 
 source_group("Header Files" FILES ${pnUtils_HEADERS})