Skip to content

Commit 7abce10

Browse files
committed
Merge branch 'master' into develop
# Conflicts: # docs/flow.md
2 parents 41dca58 + 344e932 commit 7abce10

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ to Gradle (in Preferences -> Build, Execution, Deployment -> Build Tools -> Grad
203203

204204
### Requirements
205205

206-
* JDK >= 1.8 referred to by the `JAVA_HOME` environment variable.
206+
* JDK >= 1.8 referred to by the `JAVA_HOME` environment variable. JDK must include JavaFX.
207207
* JDK 1.6 referred to by the `JDK_16` environment variable. It is okay to have `JDK_16` pointing to `JAVA_HOME` for external contributions.
208208

209209
## Contributions and releases

docs/exception-handling.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ Caught java.lang.AssertionError
145145
Cancellation is tightly bound with exceptions. Coroutines internally use `CancellationException` for cancellation, these
146146
exceptions are ignored by all handlers, so they should be used only as the source of additional debug information, which can
147147
be obtained by `catch` block.
148-
When a coroutine is cancelled using [Job.cancel] without a cause, it terminates, but it does not cancel its parent.
149-
Cancelling without cause is a mechanism for parent to cancel its children without cancelling itself.
148+
When a coroutine is cancelled using [Job.cancel], it terminates, but it does not cancel its parent.
150149

151150
<div class="sample" markdown="1" theme="idea" data-min-compiler-version="1.3">
152151

@@ -189,7 +188,7 @@ Parent is not cancelled
189188

190189
<!--- TEST-->
191190

192-
If a coroutine encounters exception other than `CancellationException`, it cancels its parent with that exception.
191+
If a coroutine encounters an exception other than `CancellationException`, it cancels its parent with that exception.
193192
This behaviour cannot be overridden and is used to provide stable coroutines hierarchies for
194193
[structured concurrency](https://github.com/Kotlin/kotlinx.coroutines/blob/master/docs/composing-suspending-functions.md#structured-concurrency-with-async) which do not depend on
195194
[CoroutineExceptionHandler] implementation.

kotlinx-coroutines-core/jvm/src/Dispatchers.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ public actual object Dispatchers {
101101
* "`kotlinx.coroutines.io.parallelism`" ([IO_PARALLELISM_PROPERTY_NAME]) system property.
102102
* It defaults to the limit of 64 threads or the number of cores (whichever is larger).
103103
*
104+
* Moreover, the maximum configurable number of threads is capped by the
105+
* `kotlinx.coroutines.scheduler.max.pool.size` system property.
106+
* If you need a higher number of parallel threads,
107+
* you should use a custom dispatcher backed by your own thread pool.
108+
*
104109
* This dispatcher shares threads with a [Default][Dispatchers.Default] dispatcher, so using
105110
* `withContext(Dispatchers.IO) { ... }` does not lead to an actual switching to another thread &mdash;
106111
* typically execution continues in the same thread.

0 commit comments

Comments
 (0)