trifle: remove useless field of server

panjf2000 · May 2, 2020 · 47817a0 · 47817a0
1 parent 3cdc3c9
commit 47817a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/server_unix.go b/server_unix.go
@@ -30,7 +30,6 @@ type server struct {
 	mainLoop         *eventloop         // main loop for accepting connections
 	eventHandler     EventHandler       // user eventHandler
 	subLoopGroup     IEventLoopGroup    // loops for handling events
-	subLoopGroupSize int                // number of loops
 }
 
 // waitForShutdown waits for a signal to shutdown
@@ -97,7 +96,6 @@ func (svr *server) activateLoops(numEventLoop int) error {
 			return err
 		}
 	}
-	svr.subLoopGroupSize = svr.subLoopGroup.len()
 	// Start loops in background
 	svr.startLoops()
 	return nil
@@ -120,7 +118,6 @@ func (svr *server) activateReactors(numEventLoop int) error {
 			return err
 		}
 	}
-	svr.subLoopGroupSize = svr.subLoopGroup.len()
 	// Start sub reactors.
 	svr.startReactors()
 

diff --git a/server_windows.go b/server_windows.go
@@ -35,7 +35,6 @@ type server struct {
 	listenerWG       sync.WaitGroup     // listener close WaitGroup
 	eventHandler     EventHandler       // user eventHandler
 	subLoopGroup     IEventLoopGroup    // loops for handling events
-	subLoopGroupSize int                // number of loops
 }
 
 // waitForShutdown waits for a signal to shutdown.
@@ -77,8 +76,7 @@ func (svr *server) startLoops(numEventLoop int) {
 		}
 		svr.subLoopGroup.register(el)
 	}
-	svr.subLoopGroupSize = svr.subLoopGroup.len()
-	svr.loopWG.Add(svr.subLoopGroupSize)
+	svr.loopWG.Add(svr.subLoopGroup.len())
 	svr.subLoopGroup.iterate(func(i int, el *eventloop) bool {
 		go el.loopRun()
 		return true
@@ -103,7 +101,7 @@ func (svr *server) stop() {
 	svr.loopWG.Wait()
 
 	// Close all connections.
-	svr.loopWG.Add(svr.subLoopGroupSize)
+	svr.loopWG.Add(svr.subLoopGroup.len())
 	svr.subLoopGroup.iterate(func(i int, el *eventloop) bool {
 		el.ch <- ErrCloseConns
 		return true