Merge in 64 bit types branch to master by Cekis · Pull Request #23 · SWG-Source/src

Cekis · 2022-01-25T07:58:30Z

Ready to be reviewed. This work is mostly for a future 64 bit transition in the future, but all work has been made compatible with our 32 bit builds. Has been tested by QA as well (@langelusse).

…ustment

… Server package overrun

Mega thanks to Apathy for his help in making the 64 bit version happen. Without his knowledge and super-special ability to act as a mega sounding board. Thanks for letting me ramble and lose my mind!

… 64-bit-types

…ilation

…or 64 bits

AlecH92

Looks good to me. I skipped over the new Crypto library files.

Cekis · 2022-01-26T18:52:52Z

@AlecH92 Cool... yes, most of the line changes are from adding the updated Crypto++ Lib. Thanks for looking it over!

AconiteX · 2022-01-26T22:56:03Z

engine/server/application/LoginServer/src/shared/LoginServer.cpp

+                if(!found) {
+                    DEBUG_REPORT_LOG(true, ("Tried to remove a connection server that wasn't in our list.\n"));
+                }
                m_clusterStatusChanged = true;


i mean ok but why

Because the DEBUG_REPORT_LOG() doesn't "use" the found var so the compiler thinks it's a wasted value. Doing this "uses" the found var and therefore shuts up the compiler.

AconiteX · 2022-01-26T23:15:35Z

engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/linux/Types.h

 #define BASE_LINUX_TYPES_H

-#include <sys/bitypes.h>
+//#include <sys/bitypes.h>


at some point we should probably refactor this so Types.h is always using the Types.h in sharedFoundation instead of maintaining multiple

AconiteX · 2022-01-26T23:20:44Z

engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp

-    GenericValueTypeMessage < std::pair < std::pair < unsigned
-    long, unsigned
-    long > , std::pair < int, int32 > > >
+    GenericValueTypeMessage < std::pair < std::pair < uint32_t, uint32_t > , std::pair < int, int32 > > >


we really ought to just deprecate feature bit messages all together they don't have any purpose anymore and were already purged from dsrc in 3.1

AconiteX · 2022-01-26T23:21:37Z

engine/server/application/LoginServer/src/shared/SessionApiClient.cpp

 	{
 		// attempt to validate a CS Tool associated with this request.
-		CSToolConnection::validateCSTool( ( uint32 )userData, result, session );
+		CSToolConnection::validateCSTool( ( uint64 )userData, result, session );


CSToolConnection::validateCSTool takes a uint32 as its first param and doesn't seem to be updated in this changeset so we're casting userData to uint64 but the method to handle it only takes a uint32 so we expanding this to a uint64 because...? (was CS Tool connection tested w/ this change?)

also this originates as void * so can't it just be an uintptr_t? (I'm not actually sure that's a question)

This likely needs updating a bit deeper. It's being cast as a uint64 because the calling method has userData as a void * type. Because of 64 bits, a void * becomes a 64 bit value. The calling method needs to be updated to not accept a void if at all possible and all callers of the calling method should also be updated. Great catch!

AconiteX · 2022-01-26T23:31:57Z

engine/server/application/LoginServer/src/shared/TaskCreateCharacter.h

+		DB::BindableInt32         cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32         station_id; //lint !e1925 // public data member
 		DB::BindableString<127>  character_name; //lint !e1925 // public data member
 		DB::BindableNetworkId    character_id; //lint !e1925 // public data member


something for later but BindableNetworkId should be able to be replaced with BindableInt64 I think

It honestly could be - however, after looking at this closer, BindableNetworkId isn't a straight mirror of BindableInt64. There are manipulations done to it after receiving the value.

AconiteX · 2022-01-27T00:24:39Z

engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp


-std::string const &GameNetworkMessage::getCmdName(unsigned long cmdCrc) // static
+std::string const &GameNetworkMessage::getCmdName(uint32_t cmdCrc) // static
 {


didn't we talk about crc being weirdly sometimes signed and sometimes unsigned

Yes, however, this particular method used the unsigned version. Just keeping it as it is (unsigned) such that we don't break anything.

AconiteX · 2022-01-27T00:25:35Z

engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp


-	uint32 const cs_freeFillPattern         = 0xEFEFEFEF; // this should match MemoryManager's free fill pattern.
+	uint64_t const cs_freeFillPattern         = 0xEFEFEFEFEFEFEFEF; // this should match MemoryManager's free fill pattern.



The ref to MemoryManager is probably(?) obsolete given the deprecation of MemoryManager

AconiteX · 2022-01-27T00:26:10Z

engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp

 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-	float const  cs_schedulerTicksPerSecond = 1000.0f;  // # schedule ticks per second.  Frame rates will not be able to exceed this.
+	float const  cs_schedulerTicksPerSecond = 2000.0f;  // # schedule ticks per second.  Frame rates will not be able to exceed this.


We should probably config value this

AconiteX · 2022-01-27T00:27:28Z

engine/shared/library/sharedRandom/src/shared/FastRandomGenerator.h

@@ -16,18 +16,18 @@ class FastRandomGenerator
 {
 public:


this whole thing can probably be replaced with a std native lib since its not 1999 STLPort anymore

AconiteX · 2022-01-27T00:30:27Z

external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeClasses.h

+		stream[BYTE6] = (data>>40)&0xff;
+		stream[BYTE7] = (data>>48)&0xff;
+		stream[BYTE8] = (data>>56)&0xff;
 		return sizeof(int64);


VChatAPI is deprecated, isn't it? can we just delete whatever cancer this is

Deprecated? What's being used in replacement? Discord? Would be an effort to remove it properly.

Nothing is being used as its replacement we don't have the Vivox libs so there's no support for Voice Chat and even to re-add it with something like Discord we wouldn't use the VChatAPI wrapper afaik it'd just be through ChatServer handling.

Cekis

These changes need to be made or in some cases just verified.

engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp

engine/server/library/serverGame/src/shared/core/GameServer.cpp

engine/server/library/serverGame/src/shared/core/GameServer.h

engine/server/library/serverGame/src/shared/object/PlayerObject.cpp

engine/shared/library/sharedGame/src/shared/core/TextManager.cpp

engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp

external/ours/library/localization/src/shared/LocalizedStringTable.h

external/ours/library/localizationArchive/src/shared/StringIdArchive.cpp

game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp

…quest progresses

…bit.

Cekis and others added 30 commits October 21, 2021 17:45

Compiling 100% with Types change approach - still does not build.

60c8c1f

Added Crypto++ v8.6 - does not yet build as a whole

0139fd8

Progress on updating Crypto++

e172d41

Adjusting CMake files

7700a7c

Compiling 100% - Execution still broken - DataTable tool may need adj…

88bdd17

…ustment

Datatables now compiling correctly

ac1f374

Fixed issues loading string tables.

f059a84

Fixed issue with profanity filter

5889d7e

Fixed timeout issue with server startup.

45e474e

Removed native methods that no longer exist.

05e9202

Fixed some incorrect sizing on network messages.

6725ce7

Reworked Archive package for standard data types and fixed issue with…

26b6f83

… Server package overrun

Fixed issue with PlayerQuestData parsing - server is RUNNING

a4367ad

Updated readme and added recognition to Apathy

62db74b

Mega thanks to Apathy for his help in making the 64 bit version happen. Without his knowledge and super-special ability to act as a mega sounding board. Thanks for letting me ramble and lose my mind!

Update README.md

ebe78d3

Adjusted a few more data types to fix communication issues.

0945252

Merge branch '64-bit-types' of https://github.com/SWG-Source/src into…

d49e30c

… 64-bit-types

Fixed size issue with ByteStream and removed some debug output

7e13b95

Back port to 32 bit to take advantage of 64 bit adjustments

3fad517

Updating badly chosen replacement data type

c87b327

Removed old crypto lib

8be3a30

Added adjustments that allow compiling with CLang 9.0.1 or GCC 10

5c88dd7

Fixed compiler warnings for mixing Strings with char *

f41c6ec

Added Oracle 21 paths and fixed issue with naming

966c7ee

Fixed issues with CMake configuration

a4e3f44

Fixed issue for newer compilers and adjusted Oracle and chat for comp…

78959d8

…ilation

Updated CMake build flags

66fc6c4

Adjusted DbBindableLong to be 64 bits if needed and adjusted timing f…

4d7c0de

…or 64 bits

Refactored DbBindableLong to be more appropriately named DbBindableInt32

a638773

Updating CMake build files to be more reliable and readable.

c3c081b

Cekis added 3 commits January 19, 2022 14:55

Added comments and removed setting defaults again for CMake

7957b54

Addressed several compiler warnings from GCC

f8aaa0e

Merged in master branch

0689560

Cekis requested review from AconiteX, AlecH92, DarthArgus, langelusse and swglockhart January 25, 2022 07:58

Cekis self-assigned this Jan 25, 2022

AlecH92 approved these changes Jan 25, 2022

View reviewed changes

Cekis requested a review from apathyboy January 26, 2022 18:51

AconiteX reviewed Jan 27, 2022

View reviewed changes

This was referenced Jan 27, 2022

Deprecate All Feature Bit Messages #24

Open

Update all calling methods of SessionApiClient::OnSessionValidate() #25

Open

Create configuration values for Scheduler #26

Open

Updated method as userData is actually a 32 bit integer

16bf8e1

Cekis commented Jan 31, 2022

View reviewed changes

Cekis and others added 10 commits February 1, 2022 23:08

Fixed issues found in my own review.

1f36461

Adjustments to issues when compiling in 64 bits

552af24

Backed out bad commit and added cleaner logging to mIFF.

487ddee

Removed extra line break on mIFF compiler

97e1954

Interim commit checkpoint - starts up but failure to read data after …

aea98a2

…quest progresses

Merge branch 'master' into 64-bit-types

8624c44

Added static casts to BindableLongs when storing data

1cadfc2

Organized CMake file a bit better

eee557e

Removed problematic compiler flags

73ecb88

Fixed bugs related to database inconsistencies between 32 bit and 64 …

8fbee78

…bit.


		uint32 const cs_freeFillPattern = 0xEFEFEFEF; // this should match MemoryManager's free fill pattern.
		uint64_t const cs_freeFillPattern = 0xEFEFEFEFEFEFEFEF; // this should match MemoryManager's free fill pattern.

Conversation

Cekis commented Jan 25, 2022

Uh oh!

AlecH92 left a comment

Choose a reason for hiding this comment

Uh oh!

Cekis commented Jan 26, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Cekis left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants