diff options
| author | Siri Hansen <[email protected]> | 2011-04-28 12:44:05 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-04-28 12:44:05 +0200 |
| commit | fbe3499614deb0165e93d03e6d84cfd8a3510958 (patch) | |
| tree | 407a63fd0ed2b6e421483430f04f95f316ae3984 /system/doc | |
| parent | 269f663aa051a1de83ee51d46a09cf62cde3d55b (diff) | |
| parent | 1a8341595c1bca1f46aa0afee8e5f01675379980 (diff) | |
| download | otp-fbe3499614deb0165e93d03e6d84cfd8a3510958.tar.gz otp-fbe3499614deb0165e93d03e6d84cfd8a3510958.tar.bz2 otp-fbe3499614deb0165e93d03e6d84cfd8a3510958.zip | |
Merge branch 'siri/stdlib/supervisor-terminate_child-simple_one_for_one/OTP-9201' into dev
* siri/stdlib/supervisor-terminate_child-simple_one_for_one/OTP-9201:
Add terminate_child(Sup, Pid) for simple_one_for_one
Allow supervisor:terminate_child(SupRef,Pid) for simple_one_for_one
Diffstat (limited to 'system/doc')
| -rw-r--r-- | system/doc/design_principles/sup_princ.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml index 067fd31961..2748f21bbe 100644 --- a/system/doc/design_principles/sup_princ.xml +++ b/system/doc/design_principles/sup_princ.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>1997</year><year>2009</year> + <year>1997</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -335,6 +335,12 @@ supervisor:start_child(Pid, [id1])</code> <c>apply(call, start_link, []++[id1])</c>, or actually:</p> <code type="none"> call:start_link(id1)</code> + <p>A child under a <c>simple_one_for_one</c> supervisor can be terminated + with</p> + <code type="none"> +supervisor:terminate_child(Sup, Pid)</code> + <p>where <c>Sup</c> is the pid, or name, of the supervisor and + <c>Pid</c> is the pid of the child.</p> </section> <section> |