You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
#lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3106449 on 2016/08/30 by Michael.Dupuis #jira UETOOL-229 Added generic command icons used in Edit Menu (including contextual menu) Change 3133997 on 2016/09/21 by Alex.Delesky #jira UE-34079 - FSceneView parameter for FBatchedElements::Draw is no longer an optional parameter. Change 3134132 on 2016/09/21 by Jamie.Dale Added the "unattended" flag when running the localzation commandlets via UAT Change 3134147 on 2016/09/21 by Frank.Fella Core - Add multitouch support to windows. Change 3134349 on 2016/09/21 by Michael.Dupuis #jira UE-36151 Update the title bar to display the branch also Change 3134355 on 2016/09/21 by Michael.Dupuis #jira UE-36041 When initially creating a projet and trying to add everything to source control, also add the uproject file Change 3134447 on 2016/09/21 by Alexis.Matte #jira UE-36064 The SpriteComponent is now properly reused when duplicating a light. Change 3134451 on 2016/09/21 by Alexis.Matte #jira UE-22782 Make sure when we re-import we dont try to match the mesh name if the option bCombineToSingle is true Change 3134457 on 2016/09/21 by Jamie.Dale FInternationalization::Leetify now deals with escape sequences correctly. This also changes it to mark all leetified text with the start and end marker, and the unit tests have been updated accordingly. Change 3134685 on 2016/09/21 by Matt.Kuhlenschmidt Cleaned up some of the UI for the new material slot workflow (part 1) Change 3134743 on 2016/09/21 by Matt.Kuhlenschmidt Fix crash clicking OK to the import mesh dialog in persona when a path is not selected. The OK button is now disabled until a valid path is selected Change 3134760 on 2016/09/21 by Matt.Kuhlenschmidt Guard against cascade crash if cascade was shutdown but there is an old cascade particle system component in the undo buffer that attempts to refresh cascade Change 3134837 on 2016/09/21 by Matt.Kuhlenschmidt Fix static analysis warnings in this file Change 3134939 on 2016/09/21 by Nick.Darnell Automation - Moving the functional testing hooks for the editor into a plugin, the goal is to make it so you don't have to see all the extra stuff automation adds to the editor until the game project needs it. Refactoring the way automation messages are serialized, no longer relying on a comma delimited string to serialize automation data. Improving the filter for automation window so it lets you put in a path, and find it that way. Fixing RunTests from the commandline so that it properly finds the tests, instead of jumping out of the loop as soon as it finds any one match. Change 3134941 on 2016/09/21 by Nick.Darnell Automation - Functional tests now support warnings as errors on a per test basis. Continued itteration on screenshot comparison. Change 3135051 on 2016/09/21 by Matt.Kuhlenschmidt Fixed size of material slots in persona details panel Change 3135076 on 2016/09/21 by Nick.Darnell Automation - Adding a missing file. Change 3135584 on 2016/09/22 by Gareth.Martin Removed unused ULandscapeInfo::BeginDestroy Slight cleanup to FLandscapeEditDataInterface::DeleteLayer Change 3135585 on 2016/09/22 by Gareth.Martin New Count algo Const'd Copy/Accumulate/Transform Change 3135599 on 2016/09/22 by Gareth.Martin Resolve crash if a Landscape Layer Info object is force deleted while it is in use :( #jira UE-35709 Change 3135724 on 2016/09/22 by Michael.Dupuis #jira UE-32662 Remove old migration code that was causing this side effect Change 3135726 on 2016/09/22 by Nick.Darnell Slate - Removing the SLATE_PRE_MULTIPLY macro. Change 3135730 on 2016/09/22 by Nick.Darnell UMG - Exposing the 2D hit location that the WidgetInteractionComponent hit on the WidgetComponent. Change 3135738 on 2016/09/22 by Matt.Kuhlenschmidt Ensure any handles to the backbuffer are released before the backbuffer is resized https://jira.it.epicgames.net/browse/UE-30488 Change 3135810 on 2016/09/22 by Ben.Marsh Build: Compile tools before running automated tests. Change 3135993 on 2016/09/22 by Matt.Kuhlenschmidt Ensure you can unpause after toggling play/pause with a keyboard shortcut. We were processing the keybinding on key down AND up which caused the unpause to instantly pause again https://jira.it.epicgames.net/browse/UE-36276 Change 3136257 on 2016/09/22 by Matt.Kuhlenschmidt Fixed assign of materials to components not working if you multi-select multiple components of a blueprint and assign the material. The construction script was running before all the material had been set on all components. Change 3136318 on 2016/09/22 by Alex.Delesky #jira UE-7405 - Forcing the mouse cursor to show and then clicking inside the viewport will no longer cause the mouse to lose focus Change 3136494 on 2016/09/22 by Matt.Kuhlenschmidt Fix crash restarting a mission in Odin Change 3136741 on 2016/09/22 by Cody.Albert Fixed SButton and SWidget to not multiply color and opacity, since that's already being done by SCompoundWidget #jira UE-36322 Change 3137711 on 2016/09/23 by Matt.Kuhlenschmidt Added guard against slate rendering with deleted materials. In this will now be caught with a looged with the deleted material name. Change 3137713 on 2016/09/23 by Matt.Kuhlenschmidt Removed the pooled draw elements stuff which is not used Change 3137791 on 2016/09/23 by Nick.Darnell MediaPlayer - Removing .png from one of the style files, as that's not required. Was causing warnings to be logged on load. Change 3137793 on 2016/09/23 by Nick.Darnell Localization - Adjusting some log statements to say with instead of w/ Change 3137796 on 2016/09/23 by Nick.Darnell Slate - Adding missing and replacing corrupted style files in the editor. Change 3137864 on 2016/09/23 by Matt.Kuhlenschmidt Fixed "actors are referenced are you sure you want to delete" dialog appearing when you are copying a lot of actors to another level Change 3137876 on 2016/09/23 by Jamie.Dale Added allocation tagging to MProf2 This hooks into the existing FScopeCycleCounterUObject used by the stats system to track object tags (object, package, and class) when an allocation is made. Tags should be in the format "Category:Tag", and the "Tag" part may include "/" to create levels in the tag hierarchy (as shown in the MProf2 tool). #jira UETOOL-950 Change 3137982 on 2016/09/23 by Gareth.Martin Added Invoke() support to CopyIf Change 3137983 on 2016/09/23 by Gareth.Martin Added ULandscapeInfo::ForAllLandscapeProxies to clean up a lot of horrible code - Removed some dependencies on ALandscape and ALandscapeStreamingProxy in the process :) Also made FLandscapeEditorLayerSettings's constructor explicit to clean up some other horrible code Change 3138053 on 2016/09/23 by Matt.Kuhlenschmidt Fixed Child Actor Template properties not visible after changing Child Actor Class Change 3138079 on 2016/09/23 by Jamie.Dale Fixing some Clang warnings Change 3138087 on 2016/09/23 by Jamie.Dale Added GetResourceSizeEx and GetResourceSizeBytes, and deprecated GetResourceSize GetResourceSizeEx populates a struct which reports not only how much memory is allocated, but also which arenas the memory was allocated from. GetResourceSizeBytes just wraps a call to GetResourceSizeEx and returns the total size from all arenas (this has the same behavior as the now deprecated GetResourceSize). Classes that used to override GetResourceSize should instead override GetResourceSizeEx and report their allocations as appropriate. #jira UETOOL-952 Change 3138127 on 2016/09/23 by Gareth.Martin Fixed crash when merging levels containing landscape #jira UE-36267 Change 3138821 on 2016/09/23 by Stephan.Jiang Fixes "Select all input node" doesn't work properly on output node. #jira UE-36335 Change 3138915 on 2016/09/23 by Stephan.Jiang Disable "select all linked nodes" for output nodes in material editor Change 3139341 on 2016/09/25 by Nick.Darnell Automation - Moving the Blueprint Compiler Tests into the RuntimeTests plugin, and making the context client only since that's the only valid place to runt these tests. Change 3139342 on 2016/09/25 by Nick.Darnell Landscape - Fixing some compiler errors on mac. Change 3139345 on 2016/09/25 by Nick.Darnell Automation - Spelling and cleanup. Change 3139346 on 2016/09/25 by Nick.Darnell Engine - Changing a check to an ensure, there's no reason to crash if this happens. Change 3139347 on 2016/09/25 by Nick.Darnell Automation - Making EFunctionalTestResult a BlueprintType Change 3139348 on 2016/09/25 by Nick.Darnell Automation - Adding another test map. Change 3139676 on 2016/09/26 by Michael.Dupuis #jira UE-32335 If we are a config object simply permit the transaction for undo/redo Change 3139702 on 2016/09/26 by Nick.Darnell UMG - Making GetLocalHitLocation on UWidgetComponent virtual. Change 3139760 on 2016/09/26 by Alexis.Matte Make sure we remove override materials from the list when the mesh point by the component has less materials. #jira UE-28845 Change 3139761 on 2016/09/26 by Alex.Delesky Added additional validation code to FPropertyNode to now properly validate TMap value and key nodes. #jira none Change 3139843 on 2016/09/26 by Alex.Delesky #jira UE-36066 - Clearing all options from a ComboBox String when selecting an option will now also clear out the selected text correctly. Change 3139880 on 2016/09/26 by Frank.Fella QAGame - Update multitouch test with less crashy assets? Change 3139908 on 2016/09/26 by Matt.Kuhlenschmidt Fix selections having the potential to be out of sync after undo/redo Change 3139928 on 2016/09/26 by Nick.Darnell Automation - tweaking the test maps some more. Change 3140646 on 2016/09/26 by Matt.Kuhlenschmidt Fix false positive with the test for vaild materials being rendered by slate. Change 3140912 on 2016/09/26 by Frank.Fella Core - Fix multitouch ifdef which was preventing it from actually being enabled.Also update test level blueprint so that it's actually testable. Change 3141218 on 2016/09/27 by Matt.Kuhlenschmidt PR #2798: BP open anim interferes with mouse movement (Contributed by projectgheist) Change 3141223 on 2016/09/27 by Jamie.Dale Updated UTextProperty::Identical to no longer compare display strings all the time It was supposed to compare the identity at runtime as the display string can change at runtime. This was preventing FText properties from being used in TSet/TMap as the hash needs to be consistent. #jira UE-36456 Change 3141242 on 2016/09/27 by Richard.TalbotWatkin Fixed various issues where making changes to components in the Blueprint Editor could cause a crash if there is an active component in the component visualizer. #jira UE-36402 - Editor crash when adding a spline component after having deleted another spline component Duplicated CL 3139370 from //UE4/Release-4.13 Duplicated CL 3139878 from //UE4/Release-4.13 Change 3141323 on 2016/09/27 by Michael.Dupuis #jira UE-35081 Enable bDisplayEngineVersionInBadge by default Change 3141798 on 2016/09/27 by tim.gautier Added UMG_DisplayWidget Change 3143038 on 2016/09/28 by Jamie.Dale Added extra context to FTableRowBase::OnPostDataImport It now takes the owning data table and the row name as parameters. This allows is to do more useful fix-up that depends on the context of where it's used (such as stabilized text keys). Change 3143039 on 2016/09/28 by Jamie.Dale Optimized UTextProperty::Identical to use a pointer comparison rather than read out the identity Only texts which have the same display string pointer can have the same identity, so this is a much faster check. Change 3143098 on 2016/09/28 by Gareth.Martin Fixed crash when loading duplicated landscape levels #jira UE-34890 Change 3143300 on 2016/09/28 by Gareth.Martin Fixed crash when duplicating a level containing a landscape through the content browser #jira UE-34890 Change 3143389 on 2016/09/28 by Jamie.Dale LastResort is no longer staged in shipping builds You can now use the Content/SlateDebug folder to store any Slate resources that shouldn't be used in a shipping build (either for the Engine or for a game). This also removes the old bUsesSlateEditorStyle hack as everything should have migrated away from that now. Change 3143565 on 2016/09/28 by Matt.Kuhlenschmidt Fixed this file Change 3143717 on 2016/09/28 by Michael.Dupuis Fixed lowercase Change 3143798 on 2016/09/28 by Matt.Kuhlenschmidt Fixed StreamingPauseRendering code to not attempt to tick the scene viewport on the slate loading thread while where are blocked on level streaming. The viewport is rendered once and the render target is passed to slate instead of the entire viewport Change 3143820 on 2016/09/28 by Alexis.Matte Use the PersonaToolikit to get the mesh Change 3143833 on 2016/09/28 by Matt.Kuhlenschmidt Added guard for UE-36499 Change 3144144 on 2016/09/28 by Matt.Kuhlenschmidt Fix constructor init order Change 3144821 on 2016/09/29 by Jamie.Dale Fixed feedback loop in FSlateEditableTextLayout::ComputeDesiredSize If the wrapping width is less than the scrollbar width, the scrollbar could constantly re-appear and then disappear. Change 3144867 on 2016/09/29 by Matt.Kuhlenschmidt Added a commandlet to allow command line importing of any asset type the engine supports. - Intermediate checkin Change 3144875 on 2016/09/29 by Nick.Darnell Automation - Adding CornellBox example map, fixing some additional tests, removing the Movement Test. Change 3144975 on 2016/09/29 by Matt.Kuhlenschmidt Disable auto-applying of scalability settings The user will still be asked if the settings should be applied but if they do nothing the notification will just go away without setting stuff. Change 3145274 on 2016/09/29 by Jamie.Dale New asset menu no longer has a scrollbar on most displays Change 3146004 on 2016/09/29 by Matt.Barnes Adding two FBX test files to help facilitate QA coverage on the new material/section workflow. Change 3146377 on 2016/09/30 by Gareth.Martin Fixed landscape rendering errors after using the "change component size" tool - also affected initial import of a landscape+weightmaps #jira UE-34518 Change 3146455 on 2016/09/30 by Jamie.Dale Fixing more menus that had scrollbars due to only being able to use half the vertical resolution Change 3146466 on 2016/09/30 by Gareth.Martin Fixed not being able to erase foliage attached to BSP #jira UE-36297 Change 3146471 on 2016/09/30 by Jamie.Dale Can no longer localize sequences via the Content Browser Change 3146569 on 2016/09/30 by Jamie.Dale Fixed UGatherTextFromSourceCommandlet::ParseSourceText being able to underflow while parsing Change 3147116 on 2016/09/30 by Michael.Dupuis #jira UE-33068 Update selection once after the bulk operation so the AssetContextMenu will have a proper selection, but only perform this if we're not in UserSearchingMode (which mean AssetPicker) Change 3148091 on 2016/10/01 by Matt.Barnes Adding a map and relevant assets to facilitate testing around the new material blueprint nodes - GetMaterialSlotNames, GetMaterialIndex, and SetMaterialByName, respectively Change 3148714 on 2016/10/03 by Nick.Darnell PR #2770: [Git plugin] Fix bug where history and merging do not work if the user has format.pretty settings in their gitconfig (Contributed by SRombauts) #jira UE-35568 Change 3148793 on 2016/10/03 by Nick.Darnell Automation - TPS for SM_Cornellbox Change 3148801 on 2016/10/03 by Nick.Darnell PR #2820: [WidgetBlueprintLibrary] Throwing Essential-Functionality-Understanding PIE Errors when Player Controller ptr not supplied (Contributed by EverNewJoy) #jira UE-36711 Change 3148805 on 2016/10/03 by Nick.Darnell PR #2822: Add missing base includes and forward declarations for UProgressBar and UTextBlock (Contributed by error454) #jira UE-36715 Change 3148813 on 2016/10/03 by Nick.Darnell UMG - The retainer now contains the SVirtualWindow directly in the hierarchy. This should now make it possible to reliably focus elements inside the retainer widget. Change 3148855 on 2016/10/03 by Gareth.Martin Fixed performance regression when importing landscape heightmaps #jira UE-36659 Change 3149482 on 2016/10/03 by Cody.Albert Added link to Support landing page to Help menu #jira UE-36603 Change 3149520 on 2016/10/03 by tim.gautier Edited UMG_Behavior - Collapsed now has a toggleable state to demonstrate functionality. Change 3149945 on 2016/10/04 by Gareth.Martin Fixed invisible landscape components when using tessellation on landscape material #jira UE-35494 Change 3149951 on 2016/10/04 by Gareth.Martin Reduced material update log spam when creating and editing landscapes - Some will remain, landscape fundementally manipulates a lot of material instances #jira UE-34440 Change 3150143 on 2016/10/04 by Matt.Kuhlenschmidt Fix not crashing when trying to clear objects which have a specific class filter in the property settings https://jira.it.epicgames.net/browse/UE-36692 Change 3150614 on 2016/10/04 by Nick.Darnell Git - Disabling some logging in non-debug builds of the git source control plugin. Change 3151647 on 2016/10/05 by Matt.Kuhlenschmidt Fix loc warnings in these files (duplicate loc keys) Change 3151679 on 2016/10/05 by Nick.Darnell Editor - Fixing the build, removing the VREditor module from the dynamically loaded list. Change 3151722 on 2016/10/05 by Gareth.Martin Fix breakage to LandscapeEdModeSplineTools.cpp caused by Dev-VREditor from main integration Change 3151816 on 2016/10/05 by Gareth.Martin Fixed more breakage to Landscape caused by Dev-VREditor from main integration [CL 3152072 by Matt Kuhlenschmidt in Main branch]
583 lines
19 KiB
C#
583 lines
19 KiB
C#
/**
|
|
* Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
|
|
*/
|
|
using System;
|
|
using System.IO;
|
|
using System.Collections.Generic;
|
|
using System.Text;
|
|
using System.Reflection;
|
|
using System.Diagnostics;
|
|
|
|
namespace MemoryProfiler2
|
|
{
|
|
/// <summary> The lower 2 bits of a pointer are piggy-bagged to store what kind of data follows it. This enum lists the possible types. </summary>
|
|
public enum EProfilingPayloadType
|
|
{
|
|
TYPE_Malloc = 0,
|
|
TYPE_Free = 1,
|
|
TYPE_Realloc = 2,
|
|
TYPE_Other = 3,
|
|
// Don't add more than 4 values - we only have 2 bits to store this.
|
|
}
|
|
|
|
/// <summary>
|
|
/// The the case of TYPE_Other, this enum determines the subtype of the token.
|
|
/// Mirrored in FMallocProfiler.h
|
|
/// </summary>
|
|
public enum EProfilingPayloadSubType
|
|
{
|
|
// Core marker types
|
|
|
|
/// <summary> Marker used to determine when malloc profiler stream has ended. </summary>
|
|
SUBTYPE_EndOfStreamMarker = 0,
|
|
|
|
/// <summary> Marker used to determine when we need to read data from the next file. </summary>
|
|
SUBTYPE_EndOfFileMarker = 1,
|
|
|
|
/// <summary> Marker used to determine when a snapshot has been added. </summary>
|
|
SUBTYPE_SnapshotMarker = 2,
|
|
|
|
/// <summary> Marker used to determine when a new frame has started. </summary>
|
|
SUBTYPE_FrameTimeMarker = 3,
|
|
|
|
/// <summary> Not used. Only for backward compatibility. Use a new snapshot marker instead. </summary>
|
|
SUBTYPE_TextMarker = 4,
|
|
|
|
// Marker types for periodic non-GMalloc memory status updates. Only for backward compatibility, replaced with SUBTYPE_MemoryAllocationStats
|
|
|
|
/// <summary> Marker used to store the total amount of memory used by the game. </summary>
|
|
SUBTYPE_TotalUsed = 5,
|
|
|
|
/// </summary> Marker used to store the total amount of memory allocated from the OS. </summary>
|
|
SUBTYPE_TotalAllocated = 6,
|
|
|
|
/// <summary> Marker used to store the allocated in use by the application virtual memory. </summary>
|
|
SUBTYPE_CPUUsed = 7,
|
|
|
|
/// <summary> Marker used to store the allocated from the OS/allocator, but not used by the application. </summary>
|
|
SUBTYPE_CPUSlack = 8,
|
|
|
|
/// <summary> Marker used to store the alignment waste from a pooled allocator plus book keeping overhead. </summary>
|
|
SUBTYPE_CPUWaste = 9,
|
|
|
|
/// <summary> Marker used to store the allocated in use by the application physical memory. </summary>
|
|
SUBTYPE_GPUUsed = 10,
|
|
|
|
/// <summary> Marker used to store the allocated from the OS, but not used by the application. </summary>
|
|
SUBTYPE_GPUSlack = 11,
|
|
|
|
/// <summary> Marker used to store the alignment waste from a pooled allocator plus book keeping overhead. </summary>
|
|
SUBTYPE_GPUWaste = 12,
|
|
|
|
/// <summary> Marker used to store the overhead of the operating system. </summary>
|
|
SUBTYPE_OSOverhead = 13,
|
|
|
|
/// <summary> Marker used to store the size of loaded executable, stack, static, and global object size. </summary>
|
|
SUBTYPE_ImageSize = 14,
|
|
|
|
/// Version 3
|
|
// Marker types for automatic snapshots.
|
|
|
|
/// <summary> Marker used to determine when engine has started the cleaning process before loading a new level. </summary>
|
|
SUBTYPE_SnapshotMarker_LoadMap_Start = 21,
|
|
|
|
/// <summary> Marker used to determine when a new level has started loading. </summary>
|
|
SUBTYPE_SnapshotMarker_LoadMap_Mid = 22,
|
|
|
|
/// <summary> Marker used to determine when a new level has been loaded. </summary>
|
|
SUBTYPE_SnapshotMarker_LoadMap_End = 23,
|
|
|
|
/// <summary> Marker used to determine when garbage collection has started. </summary>
|
|
SUBTYPE_SnapshotMarker_GC_Start = 24,
|
|
|
|
/// <summary> Marker used to determine when garbage collection has finished. </summary>
|
|
SUBTYPE_SnapshotMarker_GC_End = 25,
|
|
|
|
/// <summary> Marker used to determine when a new streaming level has been requested to load. </summary>
|
|
SUBTYPE_SnapshotMarker_LevelStream_Start = 26,
|
|
|
|
/// <summary> Marker used to determine when a previously streamed level has been made visible. </summary>
|
|
SUBTYPE_SnapshotMarker_LevelStream_End = 27,
|
|
|
|
/// <summary> Marker used to store a generic malloc statistics. @see FMallocProfiler::WriteMemoryAllocationStats </summary>
|
|
SUBTYPE_MemoryAllocationStats = 31,
|
|
|
|
/// <summary> Start licensee-specific subtypes from here. </summary>
|
|
SUBTYPE_LicenseeBase = 50,
|
|
|
|
/// <summary> Unknown the subtype of the token. </summary>
|
|
SUBTYPE_Unknown,
|
|
};
|
|
|
|
/// <summary>
|
|
/// Struct used to hold platform memory stats and allocator stats. Valid only for MemoryProfiler2.FProfileDataHeader.Version >= 4.
|
|
/// @see FGenericPlatformMemory::GetStatsForMallocProfiler
|
|
/// @see FMalloc::GetAllocatorStats
|
|
/// @todo add support for non-generic platform memory stats.
|
|
/// </summary>
|
|
public class FMemoryAllocationStatsV4
|
|
{
|
|
// Names of generic platform memory stats. @see FGenericPlatformMemory::GetStatsForMallocProfiler / GenericPlatformMemory.cpp
|
|
|
|
/// <summary> The amount of actual physical memory, in bytes. </summary>
|
|
static public string PlatformTotalPhysical = "Total Physical";
|
|
|
|
/// <summary> The amount of virtual memory, in bytes. </summary>
|
|
static public string PlatformTotalVirtual = "Total Virtual";
|
|
|
|
/// <summary> The size of a page, in bytes. </summary>
|
|
static public string PlatformPageSize = "Page Size";
|
|
|
|
/// <summary> Approximate physical RAM in GB"; 1 on everything except PC. Used for "course tuning", like FPlatformMisc::NumberOfCores(). </summary>
|
|
static public string PlatformTotalPhysicalGB = "Total Physical GB";
|
|
|
|
/// <summary> The amount of physical memory currently available, in bytes. </summary>
|
|
static public string PlatformAvailablePhysical = "Available Physical";
|
|
|
|
/// <summary> The amount of virtual memory currently available, in bytes. </summary>
|
|
static public string PlatformAvailableVirtual = "Available Virtual";
|
|
|
|
/// <summary> The amount of physical memory used by the process, in bytes. </summary>
|
|
static public string PlatformUsedPhysical = "Used Physical";
|
|
|
|
/// <summary> The peak amount of physical memory used by the process, in bytes. </summary>
|
|
static public string PlatformPeakUsedPhysical = "Peak Used Physical";
|
|
|
|
/// <summary> Total amount of virtual memory used by the process. </summary>
|
|
static public string PlatformUsedVirtual = "Used Virtual";
|
|
|
|
/// <summary> The peak amount of virtual memory used by the process. </summary>
|
|
static public string PlatformPeakUsedVirtual = "Peak Used Virtual";
|
|
|
|
static public string MemoryProfilingOverhead = "Memory Profiling Overhead";
|
|
|
|
// Names of malloc binned memory stats. @see FMallocBinned.GetAllocatorStats / MallocBinned.h
|
|
|
|
static public string BinnedWasteCurrent = "Binned Waste Current";
|
|
static public string BinnedUsedCurrent = "Binned Used Current";
|
|
static public string BinnedSlackCurrent = "Binned Slack Current";
|
|
|
|
private Dictionary<string, Int64> _Stats;
|
|
|
|
public FMemoryAllocationStatsV4()
|
|
{
|
|
_Stats = new Dictionary<string, Int64>();
|
|
}
|
|
|
|
public FMemoryAllocationStatsV4( FMemoryAllocationStatsV4 Other )
|
|
{
|
|
this._Stats = new Dictionary<string, Int64>( Other._Stats );
|
|
}
|
|
|
|
public Int64 this[string StatName]
|
|
{
|
|
get
|
|
{
|
|
Int64 Value = 0;
|
|
_Stats.TryGetValue(StatName, out Value);
|
|
return Value;
|
|
}
|
|
set
|
|
{
|
|
_Stats[StatName] = value;
|
|
}
|
|
}
|
|
|
|
public Int64 NumStats()
|
|
{
|
|
return _Stats.Count;
|
|
}
|
|
|
|
/// <summary> Returns a difference between old and new platform memory stats. </summary>
|
|
public static FMemoryAllocationStatsV4 Diff( FMemoryAllocationStatsV4 Old, FMemoryAllocationStatsV4 New )
|
|
{
|
|
FMemoryAllocationStatsV4 Diff = new FMemoryAllocationStatsV4();
|
|
|
|
var Keys = Old._Stats.Keys;
|
|
|
|
foreach( string KeyValue in Keys )
|
|
{
|
|
Int64 OldValue = Old[KeyValue];
|
|
Int64 NewValue = New[KeyValue];
|
|
|
|
Diff[KeyValue] = NewValue - OldValue;
|
|
}
|
|
|
|
return Diff;
|
|
}
|
|
|
|
/// <summary> Creates a new copy of this class. </summary>
|
|
public FMemoryAllocationStatsV4 DeepCopy()
|
|
{
|
|
FMemoryAllocationStatsV4 Copy = new FMemoryAllocationStatsV4(this);
|
|
return Copy;
|
|
}
|
|
|
|
/// <summary> Converts this memory allocation statistics to its equivalent string representation. </summary>
|
|
public override string ToString()
|
|
{
|
|
StringBuilder StrBuilder = new StringBuilder( 1024 );
|
|
|
|
foreach( KeyValuePair<string, Int64> KeyPairValue in _Stats )
|
|
{
|
|
StrBuilder.AppendLine( string.Format( " {0}: {1}", KeyPairValue.Key, MainWindow.FormatSizeString2( KeyPairValue.Value ) ) );
|
|
}
|
|
|
|
return StrBuilder.ToString();
|
|
}
|
|
|
|
|
|
};
|
|
|
|
/// <summary>
|
|
/// Variable sized token emitted by capture code. The parsing code ReadNextToken deals with this and updates
|
|
/// internal data. The calling code is responsible for only accessing member variables associated with the type.
|
|
/// </summary>
|
|
public class FStreamToken
|
|
{
|
|
// Parsing configuration
|
|
|
|
/// <summary> Mask of pointer field to get a real pointer (the two LSB are type fields, and the top bits may be a pool index. </summary>
|
|
public static UInt64 PointerMask = 0xFFFFFFFFFFFFFFFCUL;
|
|
|
|
public const UInt64 TypeMask = 0x3UL;
|
|
public static int PoolShift = 64;
|
|
|
|
/// <summary> Whether to decode the script callstacks. </summary>
|
|
public static bool bDecodeScriptCallstacks;
|
|
|
|
/// <summary> Version of the stream, same as FProfileDataHeader.Version </summary>
|
|
public static uint Version;
|
|
|
|
/// <summary> Position in the stream. </summary>
|
|
public ulong StreamIndex = 0;
|
|
|
|
/// <summary> Type of token. </summary>
|
|
public EProfilingPayloadType Type;
|
|
|
|
/// <summary> Subtype of token if it's of TYPE_Other. </summary>
|
|
public EProfilingPayloadSubType SubType;
|
|
|
|
/// <summary> Pointer in the case of alloc / free. </summary>
|
|
public UInt64 Pointer;
|
|
|
|
/// <summary> Old pointer in the case of realloc. </summary>
|
|
public UInt64 OldPointer;
|
|
|
|
/// <summary> New pointer in the case of realloc. </summary>
|
|
public UInt64 NewPointer;
|
|
|
|
/// <summary> Index into callstack array. </summary>
|
|
public Int32 CallStackIndex;
|
|
|
|
/// <summary> Index into tags array. </summary>
|
|
public Int32 TagsIndex;
|
|
|
|
/// <summary> Size of allocation in alloc / realloc case. </summary>
|
|
public Int32 Size;
|
|
|
|
/// <summary> Payload if type is TYPE_Other. </summary>
|
|
public UInt32 Payload;
|
|
|
|
/// <summary> Payload data if type is TYPE_Other and subtype is SUBTYPE_SnapshotMarker or SUBTYPE_TextMarker. Index into array of unique names. </summary>
|
|
public int TextIndex;
|
|
|
|
/// <summary> Payload data if type is TYPE_Other and subtype is SUBTYPE_FrameTimeMarker. Current delta time in seconds. </summary>
|
|
public float DeltaTime;
|
|
|
|
/// <summary> Total time, increased every time DeltaTime has been read. </summary>
|
|
public float TotalTime = 0.0f;
|
|
|
|
/// <summary> Time between two consecutive snapshot markers. </summary>
|
|
public float ElapsedTime = 0.0f;
|
|
|
|
/// <summary> Memory pool. </summary>
|
|
public EMemoryPool Pool;
|
|
|
|
/// <summary> Platform dependent memory metrics. </summary>
|
|
public List<long> Metrics = new List<long>();
|
|
|
|
/// <summary> A list of indices into the name table, one for each loaded level including persistent level. </summary>
|
|
public List<int> LoadedLevels = new List<int>();
|
|
|
|
/// <summary> Generic memory allocation stats for V4. </summary>
|
|
public FMemoryAllocationStatsV4 MemoryAllocationStats4 = new FMemoryAllocationStatsV4();
|
|
|
|
/// <summary> Index into script callstack array. </summary>
|
|
public int ScriptCallstackIndex;
|
|
|
|
/// <summary> Index into script-object type array. </summary>
|
|
public int ScriptObjectTypeIndex;
|
|
|
|
/// <summary> Reads a script callstack. </summary>
|
|
/// <param name="BinaryStream"> Stream to serialize data from </param>
|
|
void ReadScriptCallstack( BinaryReader BinaryStream )
|
|
{
|
|
if( bDecodeScriptCallstacks )
|
|
{
|
|
ScriptCallstackIndex = BinaryStream.ReadUInt16();
|
|
bool bAllocatingScriptObject = ( ScriptCallstackIndex & 0x8000 ) != 0;
|
|
|
|
ScriptCallstackIndex = ScriptCallstackIndex & 0x7FFF;
|
|
if( ScriptCallstackIndex == 0x7FFF )
|
|
{
|
|
ScriptCallstackIndex = -1;
|
|
}
|
|
|
|
if( bAllocatingScriptObject )
|
|
{
|
|
int ScriptObjectTypeCompactedName = BinaryStream.ReadInt32();
|
|
ScriptObjectTypeIndex = ScriptObjectTypeCompactedName & 0x00FFFFFF;
|
|
// Number is always 0.
|
|
int ScriptObjectTypeNumber = ( ScriptObjectTypeCompactedName & 0x7FFFFFFF ) >> 24;
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary> Reads additional data required for GCM callstacks. </summary>
|
|
/// <param name="BinaryStream"> Stream to serialize data from </param>
|
|
bool ReadGCMData(BinaryReader BinaryStream, ref UInt32 UnsignedSize )
|
|
{
|
|
// @see FMallocGcmProfiler.h
|
|
const UInt32 GCM_MEMORY_PROFILER_ID_BIT = 0x80000000;
|
|
bool bHasGCMData = false;
|
|
|
|
if( ( UnsignedSize & GCM_MEMORY_PROFILER_ID_BIT ) == GCM_MEMORY_PROFILER_ID_BIT )
|
|
{
|
|
// Lower five bits are EAllocationType, upper three bits are EMemoryPool
|
|
byte AllocationType = BinaryStream.ReadByte();
|
|
Pool = FMemoryPoolInfo.ConvertToMemoryPoolFlag( ( EMemoryPoolSerialized )( AllocationType & 0xe0 ) );
|
|
|
|
UnsignedSize &= ~GCM_MEMORY_PROFILER_ID_BIT;
|
|
|
|
bHasGCMData = true;
|
|
}
|
|
|
|
return bHasGCMData;
|
|
}
|
|
|
|
/// <summary> Reads platform dependent memory metrics. </summary>
|
|
/// <param name="BinaryStream"> Stream to serialize data from </param>
|
|
void ReadMetrics(BinaryReader BinaryStream)
|
|
{
|
|
// Read the metrics
|
|
int NumMetrics = BinaryStream.ReadByte();
|
|
for (int i = 0; i < NumMetrics; i++)
|
|
{
|
|
Metrics.Add(BinaryStream.ReadInt64());
|
|
}
|
|
}
|
|
|
|
/// <summary> Reads names of all loaded levels. </summary>
|
|
/// <param name="BinaryStream"> Stream to serialize data from </param>
|
|
void ReadLoadedLevels( BinaryReader BinaryStream )
|
|
{
|
|
// Read the currently loaded levels
|
|
int NumLevels = BinaryStream.ReadInt16();
|
|
for( int LevelIndex = 0; LevelIndex < NumLevels; LevelIndex++ )
|
|
{
|
|
int LevelNameIndex = BinaryStream.ReadInt32();
|
|
|
|
LoadedLevels.Add( LevelNameIndex );
|
|
}
|
|
}
|
|
|
|
/// <summary> Reads generic memory allocations stats. </summary>
|
|
/// <param name="BinaryStream"> Stream to serialize data from </param>
|
|
private void ReadMemoryAllocationsStats( BinaryReader BinaryStream )
|
|
{
|
|
// Read Platform Memory and Allocator Stats
|
|
// @see FMallocProfiler::WriteMemoryAllocationStats
|
|
int StatsNum = BinaryStream.ReadByte();
|
|
|
|
for( int StatIndex = 0; StatIndex < StatsNum; StatIndex++ )
|
|
{
|
|
int NameIndex = BinaryStream.ReadInt32();
|
|
Int64 StatValue = BinaryStream.ReadInt64();
|
|
string StatName = FStreamInfo.GlobalInstance.NameArray[NameIndex];
|
|
|
|
MemoryAllocationStats4[StatName] = StatValue;
|
|
}
|
|
}
|
|
|
|
/// <summary> Updates the token with data read from passed in stream and returns whether we've reached the end. </summary>
|
|
/// <param name="BinaryStream"> Stream to serialize data from </param>
|
|
public bool ReadNextToken( BinaryReader BinaryStream )
|
|
{
|
|
bool bReachedEndOfStream = false;
|
|
|
|
// Initialize to defaults.
|
|
SubType = EProfilingPayloadSubType.SUBTYPE_Unknown;
|
|
TextIndex = -1;
|
|
|
|
// Read the pointer and convert to token type by looking at lowest 2 bits. Pointers are always
|
|
// 4 byte aligned so need to clear them again after the conversion.
|
|
UInt64 RawPointerData = BinaryStream.ReadUInt64();
|
|
|
|
Pool = EMemoryPool.MEMPOOL_Main;
|
|
Type = (EProfilingPayloadType)(RawPointerData & TypeMask);
|
|
Pointer = RawPointerData & PointerMask;
|
|
|
|
Metrics.Clear();
|
|
LoadedLevels.Clear();
|
|
CallStackIndex = -1;
|
|
TagsIndex = -1;
|
|
ScriptCallstackIndex = -1;
|
|
ScriptObjectTypeIndex = -1;
|
|
|
|
NewPointer = 0;
|
|
OldPointer = 0;
|
|
Size = -1;
|
|
Payload = 0;
|
|
DeltaTime = -1.0f;
|
|
|
|
// Serialize based on token type.
|
|
switch( Type )
|
|
{
|
|
// Malloc
|
|
case EProfilingPayloadType.TYPE_Malloc:
|
|
{
|
|
// Get the call stack index.
|
|
CallStackIndex = BinaryStream.ReadInt32();
|
|
|
|
// Get the tags index.
|
|
if (Version >= 7)
|
|
{
|
|
TagsIndex = BinaryStream.ReadInt32();
|
|
}
|
|
|
|
// Get the size of an allocation.
|
|
UInt32 UnsignedSize = BinaryStream.ReadUInt32();
|
|
|
|
// Read GCM data if any.
|
|
bool bHasGCMData = ReadGCMData( BinaryStream, ref UnsignedSize );
|
|
|
|
// If GCM doesn't exist read script callstack.
|
|
if( bHasGCMData == false )
|
|
{
|
|
ReadScriptCallstack( BinaryStream );
|
|
}
|
|
Size = ( int )UnsignedSize;
|
|
break;
|
|
}
|
|
|
|
|
|
// Free
|
|
case EProfilingPayloadType.TYPE_Free:
|
|
{
|
|
break;
|
|
}
|
|
|
|
// Realloc
|
|
case EProfilingPayloadType.TYPE_Realloc:
|
|
{
|
|
OldPointer = Pointer;
|
|
NewPointer = BinaryStream.ReadUInt64();
|
|
CallStackIndex = BinaryStream.ReadInt32();
|
|
|
|
// Get the tags index.
|
|
if (Version >= 7)
|
|
{
|
|
TagsIndex = BinaryStream.ReadInt32();
|
|
}
|
|
|
|
UInt32 UnsignedSize = BinaryStream.ReadUInt32();
|
|
bool bHasGCMData = ReadGCMData( BinaryStream, ref UnsignedSize );
|
|
if( bHasGCMData == false )
|
|
{
|
|
ReadScriptCallstack( BinaryStream );
|
|
}
|
|
Size = ( int )UnsignedSize;
|
|
break;
|
|
}
|
|
|
|
|
|
// Other
|
|
case EProfilingPayloadType.TYPE_Other:
|
|
{
|
|
SubType = ( EProfilingPayloadSubType )BinaryStream.ReadInt32();
|
|
Payload = BinaryStream.ReadUInt32();
|
|
|
|
// Read subtype.
|
|
switch( SubType )
|
|
{
|
|
// End of stream!
|
|
case EProfilingPayloadSubType.SUBTYPE_EndOfStreamMarker:
|
|
{
|
|
ReadMemoryAllocationsStats( BinaryStream );
|
|
ReadLoadedLevels( BinaryStream );
|
|
bReachedEndOfStream = true;
|
|
break;
|
|
}
|
|
|
|
|
|
case EProfilingPayloadSubType.SUBTYPE_EndOfFileMarker:
|
|
{
|
|
break;
|
|
}
|
|
|
|
case EProfilingPayloadSubType.SUBTYPE_SnapshotMarker_LoadMap_Start:
|
|
case EProfilingPayloadSubType.SUBTYPE_SnapshotMarker_LoadMap_Mid:
|
|
case EProfilingPayloadSubType.SUBTYPE_SnapshotMarker_LoadMap_End:
|
|
case EProfilingPayloadSubType.SUBTYPE_SnapshotMarker_GC_Start:
|
|
case EProfilingPayloadSubType.SUBTYPE_SnapshotMarker_GC_End:
|
|
case EProfilingPayloadSubType.SUBTYPE_SnapshotMarker_LevelStream_Start:
|
|
case EProfilingPayloadSubType.SUBTYPE_SnapshotMarker_LevelStream_End:
|
|
case EProfilingPayloadSubType.SUBTYPE_SnapshotMarker:
|
|
{
|
|
TextIndex = ( int )Payload;
|
|
|
|
ReadMemoryAllocationsStats( BinaryStream );
|
|
ReadLoadedLevels( BinaryStream );
|
|
break;
|
|
}
|
|
|
|
|
|
case EProfilingPayloadSubType.SUBTYPE_FrameTimeMarker:
|
|
{
|
|
DeltaTime = BitConverter.ToSingle( System.BitConverter.GetBytes( Payload ), 0 );
|
|
TotalTime += DeltaTime;
|
|
ElapsedTime += DeltaTime;
|
|
break;
|
|
}
|
|
|
|
case EProfilingPayloadSubType.SUBTYPE_TextMarker:
|
|
{
|
|
TextIndex = ( int )Payload;
|
|
break;
|
|
}
|
|
|
|
case EProfilingPayloadSubType.SUBTYPE_MemoryAllocationStats:
|
|
{
|
|
ReadMemoryAllocationsStats( BinaryStream );
|
|
break;
|
|
}
|
|
|
|
case EProfilingPayloadSubType.SUBTYPE_TotalUsed:
|
|
case EProfilingPayloadSubType.SUBTYPE_TotalAllocated:
|
|
case EProfilingPayloadSubType.SUBTYPE_CPUUsed:
|
|
case EProfilingPayloadSubType.SUBTYPE_CPUSlack:
|
|
case EProfilingPayloadSubType.SUBTYPE_CPUWaste:
|
|
case EProfilingPayloadSubType.SUBTYPE_GPUUsed:
|
|
case EProfilingPayloadSubType.SUBTYPE_GPUSlack:
|
|
case EProfilingPayloadSubType.SUBTYPE_GPUWaste:
|
|
case EProfilingPayloadSubType.SUBTYPE_ImageSize:
|
|
case EProfilingPayloadSubType.SUBTYPE_OSOverhead:
|
|
{
|
|
break;
|
|
}
|
|
|
|
default:
|
|
{
|
|
throw new InvalidDataException();
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
return !bReachedEndOfStream;
|
|
}
|
|
}
|
|
}
|