snes: walk back the ExclusiveUse to just Use and avoid double-lock pr…

…oblems
alttpo · Jun 16, 2021 · 1967e1c · 1967e1c
1 parent 753fa18
commit 1967e1c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 16 deletions.
diff --git a/snes/basedriver.go b/snes/basedriver.go
@@ -39,7 +39,7 @@ func (b *BaseDeviceDriver) UseDevice(
 		b.devicesRw.Unlock()
 	}
 
-	err = device.ExclusiveUse(ctx, use)
+	err = device.Use(ctx, use)
 
 	if device.IsClosed() {
 		b.devicesRw.Lock()

diff --git a/snes/device.go b/snes/device.go
@@ -28,8 +28,8 @@ type DeviceMemoryUser func(context context.Context, memory DeviceMemory) error
 type Device interface {
 	IsClosed() bool
 
-	// ExclusiveUse provides exclusive access to the entire device to the user func
-	ExclusiveUse(ctx context.Context, user DeviceUser) error
+	// Use provides non-exclusive access to the device's subsystems to the user func
+	Use(ctx context.Context, user DeviceUser) error
 
 	// UseMemory provides exclusive access to only the memory subsystem of the device to the user func
 	UseMemory(ctx context.Context, user DeviceMemoryUser) error

diff --git a/snes/driver.go b/snes/driver.go
@@ -29,7 +29,7 @@ type DeviceUser func(context.Context, Device) error
 type DeviceDriver interface {
 	DeviceKey(uri *url.URL) string
 
-	// UseDevice grants exclusive access for DeviceUser to a Device uniquely identified by its uri
+	// UseDevice grants non-exclusive access for DeviceUser to a Device uniquely identified by its uri
 	UseDevice(ctx context.Context, uri *url.URL, user DeviceUser) error
 }
 

diff --git a/snes/fxpakpro/device.go b/snes/fxpakpro/device.go
@@ -19,14 +19,11 @@ func (d *Device) IsClosed() bool {
 	return d.isClosed
 }
 
-func (d *Device) ExclusiveUse(ctx context.Context, user snes.DeviceUser) error {
+func (d *Device) Use(ctx context.Context, user snes.DeviceUser) error {
 	if user == nil {
 		return nil
 	}
 
-	defer d.lock.Unlock()
-	d.lock.Lock()
-
 	return user(ctx, d)
 }
 

diff --git a/snes/mock/device.go b/snes/mock/device.go
@@ -32,14 +32,11 @@ func (d *Device) IsClosed() bool {
 	return false
 }
 
-func (d *Device) ExclusiveUse(context context.Context, user snes.DeviceUser) error {
+func (d *Device) Use(context context.Context, user snes.DeviceUser) error {
 	if user == nil {
 		return nil
 	}
 
-	defer d.lock.Unlock()
-	d.lock.Lock()
-
 	return user(context, d)
 }
 

diff --git a/snes/retroarch/device.go b/snes/retroarch/device.go
@@ -20,14 +20,11 @@ func (d *Device) IsClosed() bool {
 	return d.c.IsClosed()
 }
 
-func (d *Device) ExclusiveUse(ctx context.Context, user snes.DeviceUser) error {
+func (d *Device) Use(ctx context.Context, user snes.DeviceUser) error {
 	if user == nil {
 		return nil
 	}
 
-	defer d.lock.Unlock()
-	d.lock.Lock()
-
 	return user(ctx, d)
 }