Skip to content

Commit 3ce78c9

Browse files
committed
Merge branch 'docs/md-updates' into feature/metric-list-generate
2 parents bce5ce9 + 0275ffa commit 3ce78c9

File tree

8 files changed

+87
-83
lines changed

8 files changed

+87
-83
lines changed

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Note: if you only want to build the PresentData/ library, or the PresentMon Cons
2626
2727
2. Build the Chromium Embedded Framework (CEF)
2828
29-
1. Download the CEF 114.2.11 distribution and extract it to a local folder (e.g., CefDir): https://cef-builds.spotifycdn.com/index.html
29+
1. Download the CEF 122.1.13 distribution and extract it to a local folder (e.g., CefDir): https://cef-builds.spotifycdn.com/index.html
3030
3131
- The "Minimal Distribution" is sufficient.
3232

IntelPresentMon/AppCef/Web/BlockLists/TargetBlockList.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ wowup.exe
295295
wpfsurface.exe
296296
wsl2distromanager.exe
297297
wudfhost.exe
298-
wwahostexe
298+
wwahost.exe
299+
xboxgamebarwidgets.exe
299300
xboxapp.exe
300301
xboxpcapp.exe
301302
xdesproc.exe

IntelPresentMon/CommonUtilities/cli/CliFramework.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ namespace pmon::util::cli
2727
ConvertedNarrowOptions_(int argc, const wchar_t* const* wargv);
2828
~ConvertedNarrowOptions_();
2929
const char* const* GetRawPointerArray() const;
30+
31+
ConvertedNarrowOptions_(const ConvertedNarrowOptions_&) = delete;
32+
ConvertedNarrowOptions_ & operator=(const ConvertedNarrowOptions_&) = delete;
33+
ConvertedNarrowOptions_(ConvertedNarrowOptions_&&) = delete;
34+
ConvertedNarrowOptions_ & operator=(ConvertedNarrowOptions_&&) = delete;
35+
3036
private:
3137
std::vector<char*> stringPointerArray;
3238
};

IntelPresentMon/PresentMonMiddleware/source/FrameEventQuery.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ struct PM_FRAME_QUERY
4040
void GatherToBlob(const Context& ctx, uint8_t* pDestBlob) const;
4141
size_t GetBlobSize() const;
4242
std::optional<uint32_t> GetReferencedDevice() const;
43+
44+
PM_FRAME_QUERY(const PM_FRAME_QUERY&) = delete;
45+
PM_FRAME_QUERY& operator=(const PM_FRAME_QUERY&) = delete;
46+
PM_FRAME_QUERY(PM_FRAME_QUERY&&) = delete;
47+
PM_FRAME_QUERY& operator=(PM_FRAME_QUERY&&) = delete;
48+
4349
private:
4450
// functions
4551
std::unique_ptr<pmon::mid::GatherCommand_> MapQueryElementToGatherCommand_(const PM_QUERY_ELEMENT& q, size_t pos);

README-CaptureApplication.md

Lines changed: 67 additions & 76 deletions
Large diffs are not rendered by default.

README-ConsoleApplication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The PresentMon/ directory contains source for a standalone console application t
55
CSV file(s).
66

77
A binary of the console application is provided in the release, e.g.:
8-
[PresentMon-2.0.0-x64.exe](releases/download/v2.0.0/PresentMon-2.0.0-x64.exe).
8+
[PresentMon-1.10.0-x64.exe](releases/download/v1.10.0/PresentMon-1.10.0-x64.exe).
99

1010
## Command line options
1111

README-Service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PresentMon Service
22

3-
**PresentMon Service** is a service that provides access to the *PresentMon SDK* functionality as well as other metrics. It acts as an aggregator service that provides an API for multiple clients to consume shared metrics data. e.g., [PresentMon Capture Application](README-CaptureApplication.md) and [PresentMon CLI](IntelPresentMon\PresentMonCli\README.md) are both *PresentMon Service* clients.
3+
**PresentMon Service** is a service that provides access to the *PresentMon SDK* functionality as well as other metrics. It acts as an aggregator service that provides an API for multiple clients to consume shared metrics data. e.g., the [PresentMon Capture Application](README-CaptureApplication.md) is a *PresentMon Service* clients.
44

55
![Architecture](IntelPresentMon/docs/images/PresentMonServiceArchitecture.PNG)
66

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This repository contains several components:
1212

1313
- The PresentData/ directory contains the **PresentMon Collection and Analysis library**: a library that performs the lowest-level collection and analysis of [ETW](https://msdn.microsoft.com/en-us/library/windows/desktop/bb968803%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396) events. See [PresentData/PresentMonTraceConsumer.hpp](PresentData/PresentMonTraceConsumer.hpp) for more information.
1414

15-
- The PresentMon/ directory contains the **PresentMon Console Application**: a standalone console application that can be used to collect CSV data from target applications. See [README-ConsoleAppliation.md](README-ConsoleApplication.md) for more information.
15+
- The PresentMon/ directory contains the **PresentMon Console Application**: a standalone console application that can be used to collect CSV data from target applications. See [README-ConsoleApplication.md](README-ConsoleApplication.md) for more information.
1616

17-
- The IntelPresentMon/ directory contains the **PresentMon Service** and **PresentMon Capture Application**: an easy-to-use GUI that can be used to collect and analyze target applications. See [README-Service.md](README-Service.md) and [README-CaptureAppliation.md](README-CaptureApplication.md) for more information.
17+
- The IntelPresentMon/ directory contains the **PresentMon Service** and **PresentMon Capture Application**: an easy-to-use GUI that can be used to collect and analyze target applications. See [README-Service.md](README-Service.md) and [README-CaptureApplication.md](README-CaptureApplication.md) for more information.
1818

1919
There are also several other programs that build on this functionality and/or help visualize the resulting data. For example, see:
2020

@@ -32,7 +32,7 @@ See [BUILDING.md](BUILDING.md) for information on how to build PresentMon compon
3232

3333
## License
3434

35-
Copyright (C) 2017-2023 Intel Corporation
35+
Copyright (C) 2017-2024 Intel Corporation
3636

3737
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
3838

0 commit comments

Comments
 (0)