Skip to content

Commit

Permalink
sync: move Mutex to internal/task
Browse files Browse the repository at this point in the history
The mutex implementation needs a different implementation once support
for threading lands. This implementation just moves code to the
internal/task package to centralize these algorithms.
  • Loading branch information
aykevl committed Jan 13, 2025
1 parent 194438c commit 35fa5cf
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 45 deletions.
43 changes: 43 additions & 0 deletions src/internal/task/mutex-cooperative.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package task

type Mutex struct {
locked bool
blocked Stack
}

func (m *Mutex) Lock() {
if m.locked {
// Push self onto stack of blocked tasks, and wait to be resumed.
m.blocked.Push(Current())
Pause()
return
}

m.locked = true
}

func (m *Mutex) Unlock() {
if !m.locked {
panic("sync: unlock of unlocked Mutex")
}

// Wake up a blocked task, if applicable.
if t := m.blocked.Pop(); t != nil {
scheduleTask(t)
} else {
m.locked = false
}
}

// TryLock tries to lock m and reports whether it succeeded.
//
// Note that while correct uses of TryLock do exist, they are rare,
// and use of TryLock is often a sign of a deeper problem
// in a particular use of mutexes.
func (m *Mutex) TryLock() bool {
if m.locked {
return false
}
m.Lock()
return true
}
3 changes: 3 additions & 0 deletions src/sync/cond.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,6 @@ func (c *Cond) Wait() {
// signal.
task.Pause()
}

//go:linkname scheduleTask runtime.scheduleTask
func scheduleTask(*task.Task)
46 changes: 1 addition & 45 deletions src/sync/mutex.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,9 @@ package sync

import (
"internal/task"
_ "unsafe"
)

type Mutex struct {
locked bool
blocked task.Stack
}

//go:linkname scheduleTask runtime.scheduleTask
func scheduleTask(*task.Task)

func (m *Mutex) Lock() {
if m.locked {
// Push self onto stack of blocked tasks, and wait to be resumed.
m.blocked.Push(task.Current())
task.Pause()
return
}

m.locked = true
}

func (m *Mutex) Unlock() {
if !m.locked {
panic("sync: unlock of unlocked Mutex")
}

// Wake up a blocked task, if applicable.
if t := m.blocked.Pop(); t != nil {
scheduleTask(t)
} else {
m.locked = false
}
}

// TryLock tries to lock m and reports whether it succeeded.
//
// Note that while correct uses of TryLock do exist, they are rare,
// and use of TryLock is often a sign of a deeper problem
// in a particular use of mutexes.
func (m *Mutex) TryLock() bool {
if m.locked {
return false
}
m.Lock()
return true
}
type Mutex = task.Mutex

type RWMutex struct {
// waitingWriters are all of the tasks waiting for write locks.
Expand Down

0 comments on commit 35fa5cf

Please sign in to comment.