This repository was archived by the owner on Oct 12, 2022. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 411
Fix crash in destructor of detached thread #2334
Merged
dlang-bot
merged 2 commits into
dlang:stable
from
mihails-strasuns:fix-detach-termination
Oct 25, 2018
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,50 @@ | ||
| import core.sys.posix.pthread; | ||
| import core.memory; | ||
| import core.thread; | ||
|
|
||
| extern (C) void rt_moduleTlsCtor(); | ||
| extern (C) void rt_moduleTlsDtor(); | ||
|
|
||
| extern(C) | ||
| void* entry_point(void*) | ||
| void* entry_point1(void*) | ||
| { | ||
| // try collecting - GC must ignore this call because this thread | ||
| // is not registered in runtime | ||
| GC.collect(); | ||
| return null; | ||
| } | ||
|
|
||
| extern(C) | ||
| void* entry_point2(void*) | ||
| { | ||
| // This thread gets registered in druntime, does some work and gets | ||
| // unregistered to be cleaned up manually | ||
| thread_attachThis(); | ||
| rt_moduleTlsCtor(); | ||
|
|
||
| auto x = new int[10]; | ||
|
|
||
| rt_moduleTlsDtor(); | ||
| thread_detachThis(); | ||
| return null; | ||
| } | ||
|
|
||
| void main() | ||
| { | ||
| // allocate some garbage | ||
| auto x = new int[1000]; | ||
|
|
||
| pthread_t thread; | ||
| auto status = pthread_create(&thread, null, &entry_point, null); | ||
| assert(status == 0); | ||
| pthread_join(thread, null); | ||
| { | ||
| pthread_t thread; | ||
| auto status = pthread_create(&thread, null, &entry_point1, null); | ||
| assert(status == 0); | ||
| pthread_join(thread, null); | ||
| } | ||
|
|
||
| { | ||
| pthread_t thread; | ||
| auto status = pthread_create(&thread, null, &entry_point2, null); | ||
| assert(status == 0); | ||
| pthread_join(thread, null); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems that this was used previously to see if the thread was detached. You can either replace this
with
if (t.m_detached == false)or use this in the destructor directly.