539a5dc0af
I was looking at conhost/OpenConsole and noticed it was being pretty inefficient with allocations due to some usages of std::deque and std::vector that didn't need to be done quite that way. So this uses std::vector for the TextBuffer's storage of ROW objects, which allows one allocation to contiguously reserve space for all the ROWs - on Desktop this is 9001 ROW objects which means it saves 9000 allocations that the std::deque would have done. Plus it has the benefit of increasing locality of the ROW objects since deque is going to chase pointers more often with its data structure. Then, within each ROW there are CharRow and ATTR_ROW objects that use std::vector today. This changes them to use Boost's small_vector, which is a variation of vector that allows for the so-called "small string optimization." Since we know the typical size of these vectors, we can pre-reserve the right number of elements directly in the CharRow/ATTR_ROW instances, avoiding any heap allocations at all for constructing these objects. There are a ton of variations on this "small_vector" concept out there in the world - this one in Boost, LLVM has one called SmallVector, Electronic Arts' STL has a small_vector, Facebook's folly library has one...there are a silly number of these out there. But Boost seems like it's by far the easiest to consume in terms of integration into this repo, the CI/CD pipeline, licensing, and stuff like that, so I went with the boost version. In terms of numbers, I measured the startup path of OpenConsole.exe on my dev box for Release x64 configuration. My box is an i7-6700k @ 4 Ghz, with 32 GB RAM, not that I think machine config matters much here: | | Allocation count | Allocated bytes | CPU usage (ms) | | ------ | ------------------- | ------------------ | -------------- | | Before | 29,461 | 4,984,640 | 103 | | After | 2,459 (-91%) | 4,853,931 (-2.6%) | 96 (-7%) | Along the way, I also fixed a dynamic initializer I happened to spot in the registry code, and updated some docs. ## Validation Steps Performed - Ran "runut", "runft" and "runuia" locally and confirmed results are the same as the main branch - Profiled the before/after numbers in the Visual Studio profiler, for the numbers shown in the table Co-authored-by: Austin Lamb <austinl@microsoft.com>
98 lines
2.6 KiB
C
98 lines
2.6 KiB
C
/*++
|
|
Copyright (c) Microsoft Corporation
|
|
Licensed under the MIT license.
|
|
|
|
Module Name:
|
|
- precomp.h
|
|
|
|
Abstract:
|
|
- Contains external headers to include in the precompile phase of console build process.
|
|
- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
|
|
--*/
|
|
|
|
#pragma once
|
|
|
|
#define DEFINE_CONSOLEV2_PROPERTIES
|
|
|
|
// Ignore checked iterators warning from VC compiler.
|
|
#define _SCL_SECURE_NO_WARNINGS
|
|
|
|
// Block minwindef.h min/max macros to prevent <algorithm> conflict
|
|
#define NOMINMAX
|
|
|
|
// This includes a lot of common headers needed by both the host and the propsheet
|
|
// including: windows.h, winuser, ntstatus, assert, and the DDK
|
|
#include "HostAndPropsheetIncludes.h"
|
|
|
|
// This includes support libraries from the CRT, STL, WIL, and GSL
|
|
#include "LibraryIncludes.h"
|
|
|
|
#define SCREEN_BUFFER_POINTER(X, Y, XSIZE, CELLSIZE) (((XSIZE * (Y)) + (X)) * (ULONG)CELLSIZE)
|
|
#include <shellapi.h>
|
|
|
|
#include <securityappcontainer.h>
|
|
|
|
#include <condrv.h>
|
|
|
|
#include <conmsgl1.h>
|
|
#include <conmsgl2.h>
|
|
#include <conmsgl3.h>
|
|
|
|
#include <propvarutil.h>
|
|
#include <UIAutomation.h>
|
|
|
|
#include <winuser.h>
|
|
#include <winconp.h>
|
|
#include <ntcon.h>
|
|
#include <windowsx.h>
|
|
#include <dde.h>
|
|
#include "conserv.h"
|
|
|
|
#include "conv.h"
|
|
|
|
#pragma prefast(push)
|
|
#pragma prefast(disable : 26071, "Range violation in Intsafe. Not ours.")
|
|
#define ENABLE_INTSAFE_SIGNED_FUNCTIONS // Only unsigned intsafe math/casts available without this def
|
|
#include <intsafe.h>
|
|
#pragma prefast(pop)
|
|
#include <strsafe.h>
|
|
#include <cwchar>
|
|
#include <mmsystem.h>
|
|
#include "utils.hpp"
|
|
|
|
// Including TraceLogging essentials for the binary
|
|
#include <TraceLoggingProvider.h>
|
|
#include <winmeta.h>
|
|
TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider);
|
|
#include <telemetry/ProjectTelemetry.h>
|
|
#include <TraceLoggingActivity.h>
|
|
#include "telemetry.hpp"
|
|
#include "tracing.hpp"
|
|
|
|
#ifdef BUILDING_INSIDE_WINIDE
|
|
#define DbgRaiseAssertionFailure() __int2c()
|
|
#endif
|
|
|
|
#include <ShellScalingApi.h>
|
|
#include "../propslib/conpropsp.hpp"
|
|
|
|
// Comment to build against the private SDK.
|
|
#define CON_BUILD_PUBLIC
|
|
|
|
#ifdef CON_BUILD_PUBLIC
|
|
#define CON_USERPRIVAPI_INDIRECT
|
|
#define CON_DPIAPI_INDIRECT
|
|
#endif
|
|
|
|
#include "../inc/contsf.h"
|
|
#include "../inc/operators.hpp"
|
|
#include "../inc/conattrs.hpp"
|
|
|
|
#include "boost/container/small_vector.hpp"
|
|
|
|
// TODO: MSFT 9355094 Find a better way of doing this. http://osgvsowi/9355094
|
|
[[nodiscard]] inline NTSTATUS NTSTATUS_FROM_HRESULT(HRESULT hr)
|
|
{
|
|
return NTSTATUS_FROM_WIN32(HRESULT_CODE(hr));
|
|
}
|