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

Speculative fix for crashes in native Perforce library. Also change build script to create output artifacts rather than submitting files directly.

Browse Source 
See notes on these pages:

https://www.perforce.com/manuals/v23.1/p4api/Content/P4API/p4libraries.html
https://www.perforce.com/manuals/v23.1/p4api/Content/P4API/chapter.clientprogramming.signaler.html

[FYI] Carl.Bystrom
#jira UE-155503
#rnx

[CL 32886145 by ben marsh in ue5-main branch]
This commit is contained in:
ben marsh
2024-04-11 08:56:00 -04:00
parent 3538c32935
commit 9383479ac4
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Engine/Source/Programs/Shared/EpicGames.Perforce.Native/BuildLibrary.xml
View File

@@ -10,6 +10,7 @@
<Sign Files="#FilesToSign" Tag="#BinariesWin64"/>
<Log Message="Files:" Files="#BinariesWin64"/>
</Node>
<Artifact Name="Binaries (Win64)" Tag="#BinariesWin64"/>
</Agent>
<Agent Name="DotNetPerforceLib Mac" Type="Mac">
@@ -20,6 +21,7 @@
<Compile Target="DotNetPerforceLib" Configuration="Shipping" Platform="Mac" Tag="#BinariesMac"/>
<Log Message="Files:" Files="#BinariesMac"/>
</Node>
<Artifact Name="Binaries (Mac)" Tag="#BinariesMac"/>
</Agent>
<Agent Name="DotNetPerforceLib Linux" Type="Linux">
@@ -30,15 +32,9 @@
<Compile Target="DotNetPerforceLib" Configuration="Shipping" Platform="Linux" Tag="#BinariesLinux"/>
<Log Message="Files:" Files="#BinariesLinux"/>
</Node>
</Agent>
<Agent Name="DotNetPerforceLib Submit" Type="Win64">
<Node Name="Submit DotNetPerforceLib Binaries" Requires="#BinariesWin64;#BinariesMac;#BinariesLinux">
<Tag Files="#BinariesWin64;#BinariesMac;#BinariesLinux" Filter="Engine/Binaries/DotNET/EpicGames.Perforce.Native/..." With="#FilesToSubmit"/>
<Submit Files="#FilesToSubmit" Description="Rebuilt DotNetPerforceLib binaries for CL $(Change)\n\n#okforgithub public\n#jira none\n#submittool bypass"/>
</Node>
<Artifact Name="Binaries (Linux)" Tag="#BinariesLinux"/>
</Agent>
<Aggregate Name="DotNetPerforceLib" Requires="Submit DotNetPerforceLib Binaries"/>
<Aggregate Name="DotNetPerforceLib" Requires="#BinariesWin64;#BinariesMac;#BinariesLinux"/>
</BuildGraph>

16
Engine/Source/Programs/Shared/EpicGames.Perforce.Native/Client.cpp
View File

@@ -13,8 +13,11 @@ THIRD_PARTY_INCLUDES_START
#include "p4/i18napi.h"
#include "p4/charset.h"
#include "p4/md5.h"
#include "p4/p4libs.h"
#include "p4/signaler.h"
#include "ThirdParty/gzip.h"
#pragma warning(pop)
#include <signal.h>
#include <assert.h>
THIRD_PARTY_INCLUDES_END
@@ -709,8 +712,21 @@ public:
}
};
struct FClientGlobalInit
{
FClientGlobalInit()
{
Error e;
P4Libraries::Initialize(P4LIBRARIES_INIT_ALL, &e);
signal(SIGINT, SIG_DFL); // unset the default set by global signaler in C++ so it does not exit
signaler.Disable(); // disable the global signaler memory tracking at runtime
}
};
extern "C" NATIVE_API FClient* Client_Create(const FSettings* Settings, FWriteBuffer* WriteBuffer, FOnBufferReadyFn* OnBufferReady)
{
static FClientGlobalInit GlobalInit;
FClient* Client = new FClient(WriteBuffer, OnBufferReady);
if (Settings != nullptr)