Skip to content

osthread: suspend() and resume() code deduplication #23361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denizzzka wants to merge 6 commits into
base: master
Choose a base branch
from
+97 −76
Open

osthread: suspend() and resume() code deduplication #23361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b14dd8
osthread: gettid() alias added
denizzzka Jul 4, 2026
d70d1de
suspendThreadImpl added, implemented for Darwin, Solaris, Posix and W…
denizzzka Jul 4, 2026
1be2cd1
WASI: gettid and suspendThreadImpl stubs added
denizzzka Jul 4, 2026
4da9cc7
osthread: suspend() is unified for all OSes, loadStackAndRegInfo impl…
denizzzka Jul 4, 2026
eb3b45b
osthread: resumeThreadImpl implemented for all platforms
denizzzka Jul 4, 2026
ad9e418
osthread: resume() code deduplication
denizzzka Jul 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 61 additions & 76 deletions druntime/src/core/thread/osthread.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,33 @@ private extern(D) void* getStackBottom() nothrow @nogc
static assert(false, "Platform not supported.");
}


// Returns true on success
// TODO: move to posix_impl module

@denizzzka denizzzka Jul 4, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment it is difficult to do this: it clings to other symbols that have not yet been transferred to posix_impl

version (Posix)
package bool suspendThreadImpl(Thread t) @nogc nothrow
{
version (Darwin)
return thread_suspend(t.m_tmach) == KERN_SUCCESS;
else version (Solaris)
return thr_suspend(t.m_addr) == 0;
else
return pthread_kill(t.m_addr, suspendSignalNumber) == 0;
}

// Returns true on success
// TODO: move to posix_impl module
version (Posix)
package bool resumeThreadImpl(Thread t) @nogc nothrow
{
version (Darwin)
return thread_resume(t.m_tmach) == KERN_SUCCESS;
else version (Solaris)
return thr_continue(t.m_addr) == 0;
else
return pthread_kill(t.m_addr, resumeSignalNumber) == 0;
}

/**
* Suspend the specified thread and load stack and register information for
* use by thread_scanAll. If the supplied thread is the calling thread,
Expand All @@ -1153,18 +1180,31 @@ private extern (D) bool suspend( Thread t ) nothrow @nogc
return false;
}

version (Windows)
const sameThread = t.m_addr == gettid();

if (!sameThread)
{
if ( t.m_addr != GetCurrentThreadId() && SuspendThread( t.m_hndl ) == 0xFFFFFFFF )
if (!suspendThreadImpl(t))
{
if ( !t.isRunning )
if (t.isRunning)

@denizzzka denizzzka Jul 7, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I inverted condition here to match the functions description in the DDoc comment.

onThreadError( "Unable to suspend thread" );
else
{
Thread.remove( t );
return false;
}
onThreadError( "Unable to suspend thread" );
}
}

loadStackAndRegInfo(t, sameThread);

return true;
}

private void loadStackAndRegInfo(Thread t, const bool sameThread) nothrow @nogc
{
version (Windows)
{
CONTEXT context = void;
context.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL;

Expand Down Expand Up @@ -1214,16 +1254,6 @@ private extern (D) bool suspend( Thread t ) nothrow @nogc
}
else version (Darwin)
{
if ( t.m_addr != pthread_self() && thread_suspend( t.m_tmach ) != KERN_SUCCESS )
{
if ( !t.isRunning )
{
Thread.remove( t );
return false;
}
onThreadError( "Unable to suspend thread" );
}

version (X86)
{
x86_thread_state32_t state = void;
Expand Down Expand Up @@ -1339,18 +1369,8 @@ private extern (D) bool suspend( Thread t ) nothrow @nogc
}
else version (Solaris)
{
if (t.m_addr != pthread_self())
if (!sameThread)
{
if (thr_suspend(t.m_addr) != 0)
{
if (!t.isRunning)
{
Thread.remove(t);
return false;
}
onThreadError("Unable to suspend thread");
}

static int getLwpStatus(ulong lwpid, out lwpstatus_t status)
{
import core.sys.posix.fcntl : open, O_RDONLY;
Expand Down Expand Up @@ -1476,19 +1496,7 @@ private extern (D) bool suspend( Thread t ) nothrow @nogc
}
else version (Posix)
{
if ( t.m_addr != pthread_self() )
{
if ( pthread_kill( t.m_addr, suspendSignalNumber ) != 0 )
{
if ( !t.isRunning )
{
Thread.remove( t );
return false;
}
onThreadError( "Unable to suspend thread" );
}
}
else if ( !t.m_lock )
if (sameThread && !t.m_lock)
{
t.m_curr.tstack = getStackTop();
}
Expand All @@ -1499,7 +1507,6 @@ private extern (D) bool suspend( Thread t ) nothrow @nogc
}
else
static assert(0, "unsupported os");
return true;
}

/**
Expand Down Expand Up @@ -1615,70 +1622,48 @@ extern (C) void thread_suspendAll() nothrow
private extern (D) void resume(ThreadBase _t) nothrow @nogc
{
Thread t = _t.toThread;
const sameThread = t.m_addr == gettid();

version (Windows)
if (!sameThread)
{
if ( t.m_addr != GetCurrentThreadId() && ResumeThread( t.m_hndl ) == 0xFFFFFFFF )
if (!resumeThreadImpl(t))
{
if ( !t.isRunning )
if (t.isRunning)
onThreadError( "Unable to resume thread" );
else
{
Thread.remove( t );
return;
}
onThreadError( "Unable to resume thread" );
}
}

storeStackAndRegInfo(t, sameThread);
}

private void storeStackAndRegInfo(Thread t, const bool sameThread) nothrow @nogc
{
version (Windows)
{
if ( !t.m_lock )
t.m_curr.tstack = t.m_curr.bstack;
t.m_reg[0 .. $] = 0;
}
else version (Darwin)
{
if ( t.m_addr != pthread_self() && thread_resume( t.m_tmach ) != KERN_SUCCESS )
{
if ( !t.isRunning )
{
Thread.remove( t );
return;
}
onThreadError( "Unable to resume thread" );
}

if ( !t.m_lock )
t.m_curr.tstack = t.m_curr.bstack;
t.m_reg[0 .. $] = 0;
}
else version (Solaris)
{
if (t.m_addr != pthread_self() && thr_continue(t.m_addr) != 0)
{
if (!t.isRunning)
{
Thread.remove(t);
return;
}
onThreadError("Unable to resume thread");
}

if (!t.m_lock)
t.m_curr.tstack = t.m_curr.bstack;
t.m_reg[0 .. $] = 0;
}
else version (Posix)
{
if ( t.m_addr != pthread_self() )
{
if ( pthread_kill( t.m_addr, resumeSignalNumber ) != 0 )
{
if ( !t.isRunning )
{
Thread.remove( t );
return;
}
onThreadError( "Unable to resume thread" );
}
}
else if ( !t.m_lock )
if (sameThread && !t.m_lock)
{
t.m_curr.tstack = t.m_curr.bstack;
}
Expand Down
2 changes: 2 additions & 0 deletions druntime/src/core/thread/posix_impl.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,3 +584,5 @@ class Thread : ThreadBase
sched_yield();
}
}

package alias gettid = imported!"core.sys.posix.pthread".pthread_self;
20 changes: 20 additions & 0 deletions druntime/src/core/thread/wasi_impl.d
View file
Open in desktop
Comment thread
denizzzka marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,23 @@ class Thread : ThreadBase
// do nothing
}
}

package ThreadID gettid() @nogc nothrow
{
onThreadError( "Unable to get WASI thread ID" );
assert(0);
}

// Returns true on success
package bool suspendThreadImpl(Thread t) @nogc nothrow
{
onThreadError( "Unable to suspend thread" );
assert(0);
}

// Returns true on success
package bool resumeThreadImpl(Thread t) @nogc nothrow
{
onThreadError( "Unable to resume thread" );
assert(0);
}
14 changes: 14 additions & 0 deletions druntime/src/core/thread/windows_impl.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,17 @@ class Thread : ThreadBase
SwitchToThread();
}
}

package alias gettid = imported!"core.sys.windows.winbase".GetCurrentThreadId;

// Returns true on success
package bool suspendThreadImpl(Thread t) @nogc nothrow
{
return SuspendThread(t.m_hndl) != 0xFFFFFFFF;
}

// Returns true on success
package bool resumeThreadImpl(Thread t) @nogc nothrow
{
return ResumeThread(t.m_hndl) != 0xFFFFFFFF;
}
Loading