Commit Graph

622 Commits

Author SHA1 Message Date
sarah noonan
1a993b9ada *Remove per-frame caching of stats from FPlaformMemory::GetStats and move caching into helper function.
*Update common callers of FPlaformMemory::GetStats to use the helper.
[REVIEW] [at]matt.peters

[CL 22596606 by sarah noonan in ue5-main branch]
2022-10-18 07:22:43 -04:00
evgenii babinets
528585a552 Merging with resolved conflicts on behalf of sarah.noonan. Original CL description:
*Make FPlatformMemory::GetStats cache memory stats per frame to prevent multiple costly platform calls per frame ( by default, has option to request non-cached values ).
*Update some calls to FPlatformMemory::GetStats to specifically request non-cached values.
[REVIEW] [at]evgenii.babinets [at]andrew.ladenberger


#preflight 634a04c0907f4749392d75d0

[CL 22545788 by evgenii babinets in ue5-main branch]
2022-10-14 21:13:08 -04:00
robert seiver
3834d0cab8 Replaced the (commented out) line making the write pipe non-blocking with a comment
#fyi Brandon.Schaefer, Josh.Adams
#preflight none

[CL 22006750 by robert seiver in ue5-main branch]
2022-09-14 10:12:12 -04:00
Josh Adams
ae0776b338 - Fixed MacPlatformProcess child write pips to block so it doesn't blow the buffer for spammy comands
- Fixed Mac Perforce exe location discovery code for when there are multiple p4's found
#rb brandon.schaefer
#preflight 6321074729254beccb943f5f

[CL 21995231 by Josh Adams in ue5-main branch]
2022-09-13 18:50:03 -04:00
axel riffard
c64aa2de93 Catalina, iOS 14 removal
Metal 2.3 removed, Metal 3.0 added for Mac

#jira UE-163352
#rb adam.kinge bertrand.carre
#preflight 631ea7eb94758d0bf2008668

[CL 21960671 by axel riffard in ue5-main branch]
2022-09-11 23:47:08 -04:00
marc audy
7a197a6e66 Fix include path
#horde 209999
[FYI] Bryan.Sefcik

[CL 21916312 by marc audy in ue5-main branch]
2022-09-09 01:57:29 -04:00
chris constantinescu
d784634072 Mac extra built commandlets (bBuileAdditionalConsoleApp=true) are placed 3 directories up relative to the non-commandlet packaged app.
#jira UE-162903
#rnx
#preflight 6317b52fd135b61bc5875fe8

[CL 21829377 by chris constantinescu in ue5-main branch]
2022-09-06 17:11:08 -04:00
axel riffard
494b98c831 Remove Catalina support and Metal 2.2 from Mac.
#jira UE-149923
#rb jack.porter
#preflight 6315c60bf448dc6e58121822

[CL 21790515 by axel riffard in ue5-main branch]
2022-09-05 06:05:22 -04:00
chris constantinescu
b11fde5cd2 Mac: Apply UE_RELATIVE_BASE_DIR to BaseDir for console apps.
This will ensure correct Engine/Binaries/Mac path is returned for these types of apps.
#preflight 6310090d556fc14dcea7639c, 6310090198103d4521dc5ddd, 630ee874660db81edba910ca
#jira UE-161547
#rb Josh.Adams, Jerome.Delattre

[CL 21740699 by chris constantinescu in ue5-main branch]
2022-09-01 10:36:59 -04:00
calvin zheng
58c3415305 UE-154432
Fix crash handler for Apple Silicon
The infinite loop workaround is no longer needed. Arm64 is now capable of generating the same level of crash report as x86_64 counterpart.

#jira UE-154432: Fix crash handler for Apple Silicon
#rb Brandon.Schaefer, Zack.Neyland
#preflight 630fbe70e54ec9d581b8da5c

[CL 21727728 by calvin zheng in ue5-main branch]
2022-08-31 16:29:58 -04:00
Jack Porter
d55771931d Undo single //UE5/Main/Engine/Source/Runtime/Core/Private/Mac/MacPlatformProcess.cpp revision 21 from CL 21090810
This change was used for debugging and was triggering Horde warnings
#fyi Axel.Riffard, Will.Damon, Adam.Kinge
#jira UE-159618
#rb None
#preflight None

[CL 21143935 by Jack Porter in ue5-main branch]
2022-07-18 04:55:50 -04:00
axel riffard
721377f8e7 Fix error displaying when loading library fails on Mac
#jira UE-157345
#rb none
#fyi jack.porter will.damon adam.kinge
#preflight n/a

[CL 21090810 by axel riffard in ue5-main branch]
2022-07-14 10:38:57 -04:00
will damon
94c9153e44 Fix for long pathnames resulting in UE failing to load dynamic libraries on macOS.
#rb adam.kinge
#jira none
#rnx
#preflight n/a

[CL 21084506 by will damon in ue5-main branch]
2022-07-13 19:18:35 -04:00
Devin Doucette
2961cd5dca Logging: Restored and deprecated a deleted function and tweaked the affected names
#preflight 62c84b80b3789302b1ebd675
#rb Zousar.Shaker
#rnx
#fyi Jack.Porter

[CL 21009006 by Devin Doucette in ue5-main branch]
2022-07-08 12:23:44 -04:00
Jack Porter
e5cba9bf11 Replace uses of master in OutputDeviceRedirector
#jira UE-158659
#rb Florin.Pascu
#preflight 62c7e8666003a9b045822d62

[CL 21004289 by Jack Porter in ue5-main branch]
2022-07-08 04:33:35 -04:00
Joe Kirchoff
97ff292084 Resolve mac\ios typecast warnings
#rb none
#rnx
#preflight 62be2fbeb44711888819413e

[CL 20907452 by Joe Kirchoff in ue5-main branch]
2022-06-30 19:36:01 -04:00
Devin Doucette
4b99be9d9e Avoid calling GLog->TearDown() from RequestExit as it may deadlock
#preflight 627ec8eebb2c29688c468c8f
#rb Tim.Smith
#rnx

[CL 20224709 by Devin Doucette in ue5-main branch]
2022-05-16 11:06:18 -04:00
Devin Doucette
c8db2d77fe Logging: Added a workaround to log callstacks for failed assertions
#preflight 626ac3c5b17dd9121b406186
#rb Josh.Adams

[CL 19966435 by Devin Doucette in ue5-main branch]
2022-04-28 14:52:11 -04:00
Devin Doucette
292008ea35 Logging: Replaced GLog->PanicFlush() with GLog->Panic()
Panic allows only one thread to become the panic thread. In panic mode, logs are only sent to panic-safe output devices. Each call to Panic flushes buffered logs to panic-safe output devices, and flushes panic-safe output devices.

#jira UE-147152
#preflight 62424814292f228e09d8a612
#rb Zousar.Shaker
#fyi Brandon.Schaefer

[CL 19545093 by Devin Doucette in ue5-main branch]
2022-03-29 13:31:48 -04:00
chris constantinescu
7c6ec4c494 Revert basedir path changes for Mac in 19498448
#jira UE-147176
#rnx
#preflight N/A

[CL 19543301 by chris constantinescu in ue5-main branch]
2022-03-29 11:50:06 -04:00
chris constantinescu
ae281656f2 Tests converted from 18848115 made to work multi-platform.
Not all were converted because they were designed for packaged applications whereas low level tests are designed to run as "native" non-packaged applications.
- reporting support for non-desktop platforms, for the moment Catch2 report type "console" is used that is sent to a .out file
- most number of tests possible running multi platform, slower tests excluded on incremental builds
- slow tests are moved to run on the monolithic build
- Catch2 report failure event listener such that Horde detects them as build errors. Must add new Horde matcher for Catch2 failures

#rb Mark.Lintott
#preflight 623c8de389625f0612dabd64

[CL 19498448 by chris constantinescu in ue5-main branch]
2022-03-24 13:28:25 -04:00
Devin Doucette
c8d64e3c97 Logging: Added and migrated to GLog->PanicFlush() for crash handling
#preflight 623a433a10251d53d5796835
#rb Zousar.Shaker

[CL 19478551 by Devin Doucette in ue5-main branch]
2022-03-23 09:39:18 -04:00
jack porter
0340e664c9 Fix for iPhone device names with apostrophes appearing as ???? on Mac
#jira UE-112753
#rb Will.Damon
#preflight None

#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 19153534 in //UE5/Release-5.0/... via CL 19159210
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19161398 by jack porter in ue5-main branch]
2022-02-25 19:44:03 -05:00
michael sartain
a5e79b5414 Fix Mac compilation error with _NSGetArgc & _NSGetArgv
#jira none
[FYI] Will.Damon
#preflight trivial

#ROBOMERGE-AUTHOR: michael.sartain
#ROBOMERGE-SOURCE: CL 18817804 in //UE5/Release-5.0/... via CL 18817810 via CL 18822866
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v910-18824042)

[CL 18824700 by michael sartain in ue5-main branch]
2022-02-02 07:58:33 -05:00
michael sartain
6f95a3686b Use _NSGetArgc / _NSGetArgv in FMacPlatformMemory::BaseAllocator
These functions don't allocate memory like "NSArray *Args = [[NSProcessInfo processInfo] arguments];" does.

This fixes initialization crash in UnrealLightmass:

  * Embree has a global ctor embree::registerRegressionTest which adds to a std::vector which does an operator new.
  * That called FMemory::Malloc and FMacPlatformMemory::BaseAllocator for the first time.
  * BaseAllocator does an allocation here:
     - NSArray *Args = [[NSProcessInfo processInfo] arguments];
  * And now we're in a spot where CFAllocatorAllocate calls malloc_zone_malloc to alloc some memory where:
     - __CFAllocatorCustomMalloc --> CFAllocatorAllocate --> malloc_zone_malloc --> __CFAllocatorCustomMalloc --> rinse, lather, repeat...

And we're in recursive death.

[REVIEW] [at]Will.Damon
[FYI] Juan.Canada
#jira UE-126266
#preflight trivial

#ROBOMERGE-AUTHOR: michael.sartain
#ROBOMERGE-SOURCE: CL 18813604 in //UE5/Release-5.0/... via CL 18813614 via CL 18822764
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v910-18824042)

[CL 18824297 by michael sartain in ue5-main branch]
2022-02-02 07:35:43 -05:00