Commit Graph

43 Commits

Author SHA1 Message Date
Zousar Shaker
eac62026c9 Ensure that when subprocesses are launched (turnkey or launcher) that the ZenDataPath is inherited from the parent process. This avoids errors experienced in the CookOnTheFly flow when the parent process and subprocess differ in their expectation for Zen arguments.
#rb devin.doucette
#jira UE-154809
#robomerge EngineMerge
#rnx
#preflight 62a8d353cf54a658ee26ce9d

[CL 20655173 by Zousar Shaker in ue5-main branch]
2022-06-14 15:37:29 -04:00
Zousar Shaker
d34d74fad2 Avoid compiling in desktop-only Zen functionality for Stadia due to the use of PLATORM_UNIX instead of PLATFORM_LINUX.
#rb devin.doucette
#fyi martin.ridgers
#preflight 62967ef3261e39f6206b0a82

[CL 20444919 by Zousar Shaker in ue5-main branch]
2022-05-31 20:12:27 -04:00
Zousar Shaker
edf8ae1f0b 2nd submit:
Switch Zen cache store to use the HTTP request codepath in the Jupiter cache store while taking some of the improvements that had been made when that code was branched off to make the Zen HTTP codepath.  This is a precursor for getting Zen cache store using non-blocking operations like Jupiter cache store - this has started to be stubbed in with the EnqueueAsyncRpc methods that are stubbed in but not used from the Zen cache store.  Eventually I'd like this HTTP code to move out of the DerivedDataCache module and be usable elsewhere and supplant the HTTP code currently in the Zen module, but this will require some decisions about whether IRequestOwner should move out of the DerivedDataCache module or not.

Tested Zen operation using ShooterGame editor.
Tested Jupiter operation using CitySample editor (empty local cache).

#rb devin.doucette
#fyi stefan.boberg
#preflight 62953e65401169f78c57c298
#preflight 629642a1be0ae0b33a46d012

[CL 20438549 by Zousar Shaker in ue5-main branch]
2022-05-31 12:42:17 -04:00
Zousar Shaker
77f51a02b9 [Backout] - CL20433163
#fyi Zousar.Shaker
Original CL Desc
-----------------------------------------------------------------
Switch Zen cache store to use the HTTP request codepath in the Jupiter cache store while taking some of the improvements that had been made when that code was branched off to make the Zen HTTP codepath.  This is a precursor for getting Zen cache store using non-blocking operations like Jupiter cache store - this has started to be stubbed in with the EnqueueAsyncRpc methods that are stubbed in but not used from the Zen cache store.  Eventually I'd like this HTTP code to move out of the DerivedDataCache module and be usable elsewhere and supplant the HTTP code currently in the Zen module, but this will require some decisions about whether IRequestOwner should move out of the DerivedDataCache module or not.

Tested Zen operation using ShooterGame editor.
Tested Jupiter operation using CitySample editor (empty local cache).

#rb devin.doucette
#fyi stefan.boberg
#preflight 62953e65401169f78c57c298

[CL 20433363 by Zousar Shaker in ue5-main branch]
2022-05-30 19:32:59 -04:00
Zousar Shaker
2f6cbf5012 Switch Zen cache store to use the HTTP request codepath in the Jupiter cache store while taking some of the improvements that had been made when that code was branched off to make the Zen HTTP codepath. This is a precursor for getting Zen cache store using non-blocking operations like Jupiter cache store - this has started to be stubbed in with the EnqueueAsyncRpc methods that are stubbed in but not used from the Zen cache store. Eventually I'd like this HTTP code to move out of the DerivedDataCache module and be usable elsewhere and supplant the HTTP code currently in the Zen module, but this will require some decisions about whether IRequestOwner should move out of the DerivedDataCache module or not.
Tested Zen operation using ShooterGame editor.
Tested Jupiter operation using CitySample editor (empty local cache).

#rb devin.doucette
#fyi stefan.boberg
#preflight 62953e65401169f78c57c298

[CL 20433163 by Zousar Shaker in ue5-main branch]
2022-05-30 18:14:02 -04:00
David Harvey
b5840fed7f removing several PLATFORM_HOLOLENS references, mostly around WindowsHWrapper etc.
#jira UE-149794
#rnx
#preflight 628f7a4df622d972b5db8318
#rb pending

[CL 20391626 by David Harvey in ue5-main branch]
2022-05-27 07:04:22 -04:00
devin doucette
b2a07ea03e DDC: Merge from UE5/Main
#preflight 6288ff678828ea88c8af7034
#preflight 628ab5d93246d5019db76ed2
#rb none
#rnx

#ROBOMERGE-OWNER: devin.doucette
#ROBOMERGE-AUTHOR: Devin.Doucette
#ROBOMERGE-SOURCE: CL 20353148 via CL 20353832 via CL 20353839
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v948-20297126)

[CL 20355348 by devin doucette in ue5-main branch]
2022-05-24 16:40:25 -04:00
Zousar Shaker
d64ab67c15 Increase the time window that ZenServer has to launch within before it becomes an error for unattended executions.
#rb none
#rnx
#preflight 626f65bd332a0b0e0b283c4f

[CL 20006381 by Zousar Shaker in ue5-main branch]
2022-05-02 01:05:46 -04:00
Zousar Shaker
773d501638 Move ZenLogPath and ZenCfgPath commandline arguments to "non-transient" arguments that will influence whether their modification causes a running instance of zenserver should be stopped/started.
#rb none
#rnx
#preflight 626c5e05320b2198448e71c3

[CL 19987200 by Zousar Shaker in ue5-main branch]
2022-04-29 18:10:02 -04:00
Zousar Shaker
c54c86c43f Add command-line option for passing config file path when launching ZenServer.
#rb none,Trivial
#rnx
#preflight 626772dd820fbeb9a4e16c3e

[CL 19915984 by Zousar Shaker in ue5-main branch]
2022-04-26 00:23:58 -04:00
Devin Doucette
748e39e3c0 Replaced uses of _SV with TEXTVIEW
#preflight 6266da740634d0904ce6de29
#rb Steve.Robb
#rnx

[CL 19905760 by Devin Doucette in ue5-main branch]
2022-04-25 13:56:30 -04:00
Devin Doucette
92a888c1f6 Replaced uses of _ASV with ANSITEXTVIEW
#preflight 6266acf50634d0904cdfe91c
#rb Steve.Robb
#rnx

[CL 19903251 by Devin Doucette in ue5-main branch]
2022-04-25 11:31:36 -04:00
Per Larsson
dc0583348b Zen - experimental web socket client
#rb paul.chipchase
#rnx
#preflight 6231d4bcac0173aa412c8706

[CL 19405005 by Per Larsson in ue5-main branch]
2022-03-16 09:17:31 -04:00
zousar shaker
625a874551 Resolve compile issue in UE Zen client caused by including an Internal header from a Public header.
This is being resolved by cherrypicking 19196840 by mark.lintott from UE5/Main (see original changelist details at the end of this cl description).  On top of the cherrypick, there was a change made to re-use a single Http request when fetching stats.  This avoids the overhead of doing name resolution repeatedly if the zen instance has a name instead of IP address.

Tested by:
- Running ShooterGame editor & observing UnrealInsights for ZenHttp_CurlPerform timers and ensuring they are not happening on the game thread when the editor is sitting idle (they are on background threads instead)
-Terminating ZenServer.exe while the editor is running and observing whether the framerate of the editor is negatively affected

#rb matt.peters
[FYI] mark.lintott
#jira UE-132849
#jira UE-143182
#lockdown aurel.cordonnier
#preflight 6220038831454c90cc13a123

Original changelist:
============
Blocking Zen HTTP stats request now runs async using futures
#rb Andriy.Tylychko
#[fyi] Zousar.Shaker
#jira UE-132849
#preflight 621e0c71e15c51d8c5bd5967

#ushell-cherrypick of 19196840 by mark.lintott

#ROBOMERGE-OWNER: zousar.shaker
#ROBOMERGE-AUTHOR: zousar.shaker
#ROBOMERGE-SOURCE: CL 19234318 in //UE5/Release-5.0/... via CL 19236659
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19237357 by zousar shaker in ue5-main branch]
2022-03-02 22:10:10 -05:00
steve robb
288f3de432 Fixes for the implicit conversion of ints and chars to TCHARs in UTF-8 mode.
#rb trivial
#preflight 621ed0b4e15c51d8c5e5d081

#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 19219816 via CL 19220283 via CL 19220288 via CL 19223679
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19227684 by steve robb in ue5-main branch]
2022-03-02 15:30:50 -05:00
mark lintott
dc0bd9e876 Blocking Zen HTTP stats request now runs async using futures
#rb Andriy.Tylychko
#fyi Zousar.Shaker
#jira UE-132849
#preflight 621e0c71e15c51d8c5bd5967

[CL 19196840 by mark lintott in ue5-main branch]
2022-03-01 07:20:31 -05:00
Martin Ridgers
9aaaa5b445 Fixed IncludeTool warning.
#rb trivial
#rnx
#preflight 621ded73f1206ae3ea3bcc01

[CL 19196283 by Martin Ridgers in ue5-main branch]
2022-03-01 05:06:05 -05:00
Martin Ridgers
db99164288 - Enable Zen on Mac and Linux.
- Updated zenserver binaries to 4ae4f1f

#rnx
#preflight 621ddbb0313c8c01033b88ae

[CL 19195911 by Martin Ridgers in ue5-main branch]
2022-03-01 03:56:00 -05:00
steve robb
33c800a605 TEXT(""_SV) changed to TEXTVIEW("") for UTF-8 support.
#rb trivial

#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 19135062 via CL 19136099 via CL 19136620 via CL 19138526
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19155676 by steve robb in ue5-main branch]
2022-02-25 15:48:16 -05:00
Martin Ridgers
856328e1f4 Missing include.
#rb trivial
#preflight trivial

[CL 19032123 by Martin Ridgers in ue5-main branch]
2022-02-17 03:38:49 -05:00
zousar shaker
7846956c1b Fix bug when parsing URL for Zen containing colons (eg: ::1).
#rb devin.doucette
#jira UE-142437
#lockdown julien.marchand
#preflight 620b4e3a483ff0ae5ea7f565

#ROBOMERGE-OWNER: zousar.shaker
#ROBOMERGE-AUTHOR: zousar.shaker
#ROBOMERGE-SOURCE: CL 18995738 in //UE5/Release-5.0/... via CL 18996038 via CL 18996374
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)

[CL 18996395 by zousar shaker in ue5-main branch]
2022-02-15 10:52:53 -05:00
zousar shaker
a1f07eb040 Fix NonUnity compile error in ZenServerHttp.h.
#rb none
#jira none
#preflight none
#lockdown Aurel.Cordonnier

#ROBOMERGE-OWNER: zousar.shaker
#ROBOMERGE-AUTHOR: zousar.shaker
#ROBOMERGE-SOURCE: CL 18992965 in //UE5/Release-5.0/... via CL 18993161 via CL 18993193
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)

[CL 18996322 by zousar shaker in ue5-main branch]
2022-02-15 10:49:29 -05:00
zousar shaker
204349bdd1 Fix excessive thread spawning caused by name resolving of "localhost" at high frequency by the Zen stats code.
Re-use Curl request when gathering stats.  Rate limit it to no more than 2/second.  Still keeping it synchronous and blocking for now.
Avoid using "localhost" and prefer the IPV6 loopback address of [::1] to avoid name resolution penalty for localhost.
Keep DNS cache in Curl permanently for a given request.

#rb devin.doucette
#jira UE-142437
#preflight 620a7d7b6e5d06a542963178

#ROBOMERGE-AUTHOR: zousar.shaker
#ROBOMERGE-SOURCE: CL 18980515 in //UE5/Release-5.0/... via CL 18980843 via CL 18981187
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)

[CL 18981362 by zousar shaker in ue5-main branch]
2022-02-14 12:19:59 -05:00
Martin Ridgers
277e8c810e Moved lock file existence checks into a function. Implemented lock testing and lock file reading for POSIX-based platforms.
#rb zs
#rnx
#preflight 6204d2b3a8129f65b75563bc

[CL 18933249 by Martin Ridgers in ue5-main branch]
2022-02-10 03:58:29 -05:00
Martin Ridgers
11809b49b1 Fixed unresolved symbol errors. An inlined and exported function is very portable. MSVC respects the export, while Apple Clang favours the inline and fails on symbols the inlined body references that aren't exported.
#rb zs
#rnx
#preflight 6204cc3ca8129f65b755250a

[CL 18933112 by Martin Ridgers in ue5-main branch]
2022-02-10 03:30:55 -05:00