izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify command line arguments when running COTF with Zen loader/storage server

Browse Source 
- changed Cooker arguments from -CookOnTheFly -IoStore to -CookOnTheFly -ZenStore
- changed Zen host argument from -StorageServerHost to -ZenStoreHost
- updated UAT to support running CBTB with -ZenStore
- updated StorageServerConnection to handle multiple hosts from command line

Cooker:
  CBTB: -ZenStore
  COTF: -ZenStore -CookOnTheFly

Game:
  CBTB: -ZenStoreHost=<ip> or <ip1,ip2>
  COTF: -ZenStoreHost=<ip> or <ip1,ip2> -CookOnTheFly

#rb CarlMagnus.Nordin
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 16849969 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16849982 by per larsson in ue5-release-engine-test branch]
This commit is contained in:
per larsson
2021-07-14 10:40:16 -04:00
parent e600629c4e
commit e29cc6c467
19 changed files with 187 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/StorageServerClient/Public/StorageServerConnection.h
+4 -2
View File
@@ -112,7 +112,7 @@ public:
STORAGESERVERCLIENT_API FStorageServerConnection();
STORAGESERVERCLIENT_API ~FStorageServerConnection();
STORAGESERVERCLIENT_API bool Initialize(const TCHAR* Host, int32 Port, const TCHAR* ProjectNameOverride = nullptr, const TCHAR* PlatformNameOverride = nullptr);
STORAGESERVERCLIENT_API bool Initialize(TArrayView<const FString> HostAddresses, int32 Port, const TCHAR* ProjectNameOverride = nullptr, const TCHAR* PlatformNameOverride = nullptr);
STORAGESERVERCLIENT_API void FileManifestRequest(TFunctionRef<void(FIoChunkId Id, FStringView Path)> Callback);
STORAGESERVERCLIENT_API int64 FileSizeRequest(int32 FileIndex);
@@ -121,12 +121,14 @@ public:
STORAGESERVERCLIENT_API bool ReadChunkRequest(const FIoChunkId& ChunkId, uint64 Offset, uint64 Size, TFunctionRef<void(FStorageServerResponse&)> OnResponse);
STORAGESERVERCLIENT_API FStorageServerChunkBatchRequest NewChunkBatchRequest();
STORAGESERVERCLIENT_API FString GetHostAddr() const;
private:
friend class FStorageServerRequest;
friend class FStorageServerResponse;
friend class FStorageServerChunkBatchRequest;
int32 HandshakeRequest();
int32 HandshakeRequest(TArrayView<const TSharedPtr<FInternetAddr>> HostAddresses);
FSocket* AcquireSocket();
void ReleaseSocket(FSocket* Socket, bool bKeepAlive);