Updating id gen to directly embed mutex

dusk125 · Jul 30, 2021 · cb91db0 · cb91db0
1 parent 2a3ce18
commit cb91db0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/id.go b/id.go
@@ -4,20 +4,14 @@ import "sync"
 
 // IDGen is a simple, thread safe, integer id generator
 type IDGen struct {
+ sync.Mutex
  nextID int
- idLock sync.Mutex
-}
-
-func NewIDGen() *IDGen {
- return &IDGen{
- nextID: 0,
- }
 }
 
 // Gen generates the next id and returns it
 func (gen *IDGen) Gen() (id int) {
- gen.idLock.Lock()
- defer gen.idLock.Unlock()
+ gen.Lock()
+ defer gen.Unlock()
 
  id = gen.nextID
  gen.nextID++

diff --git a/packer/pack.go b/packer/pack.go
@@ -50,7 +50,7 @@ func NewPacker(width, height int, flags uint8) *Packer {
  packer := &Packer{
  bounds: bounds,
  flags: flags,
- id: pixelutils.NewIDGen(),
+ id: &pixelutils.IDGen{},
  pic: pixel.MakePictureData(bounds),
  emptySpaces: make(spaceList, 1),
  images: make(map[int]pixel.Rect),