Skip to content

Commit 898b8a7

Browse files
author
Michael Blome
committed
merge stuff
2 parents 33d44fd + 3641bbd commit 898b8a7

File tree

4 files changed

+1
-10
lines changed

4 files changed

+1
-10
lines changed

docs/atl-mfc-shared/reference/crect-class.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,6 @@ rect.SetRectEmpty();
14531453
// rect is now (0, 0, 0, 0)
14541454
ASSERT(rect.IsRectEmpty());
14551455
```
1456-
14571456
14581457
## <a name="crect__size"></a> CRect::Size
14591458
The `cx` and `cy` members of the return value contain the height and width of `CRect`.

docs/atl/reference/ccomcurrency-class.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class CComCurrency
8383
|[CComCurrency::operator ==](#ccomcurrency__operator_eq_eq)|This operator compares two `CComCurrency` objects for equality.|
8484
|[CComCurrency::operator >](#ccomcurrency__operator_gt)|This operator compares two `CComCurrency` objects to determine the larger.|
8585
|[CComCurrency::operator >=](#ccomcurrency__operator_gt_eq)|This operator compares two `CComCurrency` objects to determine equality or the larger.|
86-
>>>>>>> master
8786
|[CComCurrency::operator CURRENCY](#ccomcurrency__operator_currency)|Casts a `CURRENCY` object.|
8887

8988
### Public Data Members

docs/parallel/concrt/scheduler-policies.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ This document describes the role of scheduler policies in the Concurrency Runtim
4040
> [!TIP]
4141
> The Concurrency Runtime provides a default scheduler. Therefore, you don't have to create one in your application. Because the Task Scheduler helps you fine-tune the performance of your applications, we recommend that you start with the [Parallel Patterns Library (PPL)](../../parallel/concrt/parallel-patterns-library-ppl.md) or the [Asynchronous Agents Library](../../parallel/concrt/asynchronous-agents-library.md) if you are new to the Concurrency Runtime.
4242
43-
4443
When you use the [concurrency::CurrentScheduler::Create](reference/currentscheduler-class.md#currentscheduler__create_method), [concurrency::Scheduler::Create](reference/scheduler-class.md#scheduler__create_method), or [concurrency::Scheduler::SetDefaultSchedulerPolicy](reference/scheduler-class.md#scheduler__setdefaultschedulerpolicy_method) method to create a scheduler instance, you provide a [concurrency::SchedulerPolicy](../../parallel/concrt/reference/schedulerpolicy-class.md) object that contains a collection of key-value pairs that specify the behavior of the scheduler. The `SchedulerPolicy` constructor takes a variable number of arguments. The first argument is the number of policy elements that you are about to specify. The remaining arguments are key-value pairs for each policy element. The following example creates a `SchedulerPolicy` object that specifies three policy elements. The runtime uses default values for the policy keys that are not specified.
4544

4645

@@ -53,7 +52,6 @@ This document describes the role of scheduler policies in the Concurrency Runtim
5352
|----------------|-----------------|-------------------|
5453
|`SchedulerKind`|A [concurrency::SchedulerType](reference/concurrency-namespace-enums.md#schedulertype_enumeration) value that specifies the type of threads to use to schedule tasks.|`ThreadScheduler` (use normal threads). This is the only valid value for this key.|
5554
|`MaxConcurrency`|An `unsigned int` value that specifies the maximum number of concurrency resources that the scheduler uses.|[concurrency::MaxExecutionResources](reference/concurrency-namespace-constants1.md#maxexecutionresources_constant)|
56-
5755
|`MinConcurrency`|An `unsigned int` value that specifies the minimum number of concurrency resources that the scheduler uses.|`1`|
5856
|`TargetOversubscriptionFactor`|An `unsigned int` value that specifies how many threads to allocate to each processing resource.|`1`|
5957
|`LocalContextCacheSize`|An `unsigned int` value that specifies the maximum number of contexts that can be cached in the local queue of each virtual processor.|`8`|
@@ -62,17 +60,16 @@ This document describes the role of scheduler policies in the Concurrency Runtim
6260

6361
|`SchedulingProtocol`|A [concurrency::SchedulingProtocolType](reference/concurrency-namespace-enums.md#schedulingprotocoltype_enumeration) value that specifies the scheduling algorithm to use.|`EnhanceScheduleGroupLocality`|
6462
|`DynamicProgressFeedback`|A [concurrency::DynamicProgressFeedbackType](reference/concurrency-namespace-enums.md#dynamicprogressfeedbacktype_enumeration) value that specifies whether to rebalance resources according to statistics-based progress information.<br /><br /> **Note** Do not set this policy to `ProgressFeedbackDisabled` because it is reserved for use by the runtime.|`ProgressFeedbackEnabled`|
63+
6564

6665
Each scheduler uses its own policy when it schedules tasks. The policies that are associated with one scheduler do not affect the behavior of any other scheduler. In addition, you cannot change the scheduler policy after you create the `Scheduler` object.
6766

6867
> [!IMPORTANT]
6968
> Use only scheduler policies to control the attributes for threads that the runtime creates. Do not change the thread affinity or priority of threads that are created by the runtime because that might cause undefined behavior.
7069
71-
7270
The runtime creates a default scheduler for you if you do not explicitly create one. If you want to use the default scheduler in your application, but you want to specify a policy for that scheduler to use, call the [concurrency::Scheduler::SetDefaultSchedulerPolicy](reference/scheduler-class.md#scheduler__setdefaultschedulerpolicy_method) method before you schedule parallel work. If you do not call the `Scheduler::SetDefaultSchedulerPolicy` method, the runtime uses the default policy values from the table.
7371

7472
Use the [concurrency::CurrentScheduler::GetPolicy](reference/currentscheduler-class.md#currentscheduler__getpolicy_method) and the [concurrency::Scheduler::GetPolicy](reference/scheduler-class.md#scheduler__getpolicy_method) methods to retrieve a copy of the scheduler policy. The policy values that you receive from these methods can differ from the policy values that you specify when you create the scheduler.
75-
7673

7774
## Example
7875
To examine examples that use specific scheduler policies to control the behavior of the scheduler, see [How to: Specify Specific Scheduler Policies](../../parallel/concrt/how-to-specify-specific-scheduler-policies.md) and [How to: Create Agents that Use Specific Scheduler Policies](../../parallel/concrt/how-to-create-agents-that-use-specific-scheduler-policies.md).

docs/parallel/concrt/walkthrough-adapting-existing-code-to-use-lightweight-tasks.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ Parameters = 50, 100
7777

7878
[!code-cpp[concrt-migration-lwt#5](../../parallel/concrt/codesnippet/cpp/walkthrough-adapting-existing-code-to-use-lightweight-tasks_5.cpp)]
7979

80-
8180
5. Replace the call to `CreateThread` with a call to the [concurrency::CurrentScheduler::ScheduleTask](reference/currentscheduler-class.md#currentscheduler__scheduletask_method) method.
8281

8382

@@ -86,7 +85,6 @@ Parameters = 50, 100
8685

8786
6. Replace the call to `WaitForSingleObject` with a call to the [concurrency::event::wait](reference/event-class.md#event__wait_method) method to wait for the task to finish.
8887

89-
9088
[!code-cpp[concrt-migration-lwt#7](../../parallel/concrt/codesnippet/cpp/walkthrough-adapting-existing-code-to-use-lightweight-tasks_7.cpp)]
9189

9290
7. Remove the call to `CloseHandle`.
@@ -96,8 +94,6 @@ Parameters = 50, 100
9694
[!code-cpp[concrt-migration-lwt#8](../../parallel/concrt/codesnippet/cpp/walkthrough-adapting-existing-code-to-use-lightweight-tasks_8.cpp)]
9795

9896
9. At the end of the `MyThreadFunction` function, call the [concurrency::event::set](reference/event-class.md#event__set_method) method to signal to the main application that the task has finished.
99-
100-
10197

10298
[!code-cpp[concrt-migration-lwt#9](../../parallel/concrt/codesnippet/cpp/walkthrough-adapting-existing-code-to-use-lightweight-tasks_9.cpp)]
10399

0 commit comments

Comments
 (0)