mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-30 15:10:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Issue 20160 - ThreadInfo.cleanup() clears local thread's

Browse source 
registered names instead of "this"'s
This commit is contained in:
Bernhard Seckinger 2019-12-11 14:19:09 +01:00
parent 50205ebeb7
commit c8331f13a0
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
std/concurrency.d
View file

@ -994,18 +994,17 @@ private @property Mutex registryLock()
return impl; return impl;
} }
private void unregisterMe() private void unregisterMe(ref ThreadInfo me)
{ {
auto me = thisInfo.ident; if (me.ident != Tid.init)
if (thisInfo.ident != Tid.init)
{ {
synchronized (registryLock) synchronized (registryLock)
{ {
if (auto allNames = me in namesByTid) if (auto allNames = me.ident in namesByTid)
{ {
foreach (name; *allNames) foreach (name; *allNames)
tidByName.remove(name); tidByName.remove(name);
namesByTid.remove(me); namesByTid.remove(me.ident);
} }
} }
} }
@ -1128,7 +1127,18 @@ struct ThreadInfo
_send(MsgType.linkDead, tid, ident); _send(MsgType.linkDead, tid, ident);
if (owner != Tid.init) if (owner != Tid.init)
_send(MsgType.linkDead, owner, ident); _send(MsgType.linkDead, owner, ident);
unregisterMe(); // clean up registry entries unregisterMe(this); // clean up registry entries
}
// issue 20160
@system unittest
{
register("main_thread", thisTid());
ThreadInfo t;
t.cleanup();
assert(locate("main_thread") == thisTid());
} }
} }