优化锁粒度

Author: FishGoddess

_examples/performance_test.go

@@ -84,7 +84,7 @@ func BenchmarkExecutor(b *testing.B) {
 
 // go test -v -run=none -bench=^BenchmarkExecutorTime$ -benchmem -benchtime=1s
 func BenchmarkExecutorTime(b *testing.B) {
-	executor := goes.NewExecutor(size)
+	executor := goes.NewExecutor(workerNum)
 
 	num := uint32(0)
 	task := func() {
@@ -104,7 +104,7 @@ func BenchmarkExecutorTime(b *testing.B) {
 
 // // go test -v -run=none -bench=^BenchmarkAntsPool$ -benchmem -benchtime=1s
 // func BenchmarkAntsPool(b *testing.B) {
-// 	pool, _ := ants.NewPool(size)
+// 	pool, _ := ants.NewPool(workerNum)
 //
 // 	num := uint32(0)
 // 	task := func() {
@@ -123,7 +123,7 @@ func BenchmarkExecutorTime(b *testing.B) {
 //
 // // go test -v -run=none -bench=^BenchmarkAntsPoolTime$ -benchmem -benchtime=1s
 // func BenchmarkAntsPoolTime(b *testing.B) {
-// 	pool, _ := ants.NewPool(size)
+// 	pool, _ := ants.NewPool(workerNum)
 //
 // 	num := uint32(0)
 // 	task := func() {

executor.go

@@ -77,30 +77,31 @@ func (e *Executor) AvailableWorkers() int {
 // Submit submits a task to be handled by workers.
 func (e *Executor) Submit(task Task) error {
 	e.lock.Lock()
-	defer e.lock.Unlock()
 
 	if e.closed {
+		e.lock.Unlock()
+
 		return ErrExecutorIsClosed
 	}
 
 	worker := e.scheduler.Get()
 	if worker == nil {
+		e.lock.Unlock()
+
 		return ErrWorkerIsNil
 	}
 
-	// We don't need to create a new worker if we got a worker with no tasks.
+	// 1. We don't need to create a new worker if we got a worker with no tasks.
+	// 2. The number of workers has reached the limit, so we can only use the worker we got.
 	if worker.WaitingTasks() <= 0 || len(e.workers) >= e.conf.workerNum {
-		worker.Accept(task)
-		return nil
-	}
+		e.lock.Unlock()
 
-	// The number of workers has reached the limit, so we can only use the worker we got.
-	if len(e.workers) >= e.conf.workerNum {
 		worker.Accept(task)
 		return nil
 	}
 
 	worker = e.spawnWorker()
+	e.lock.Unlock()
 	worker.Accept(task)
 	return nil
 }