xgp

Author: myxy99

xgp/xgp.go

@@ -134,7 +134,7 @@ func (t *poolExecutor) Submit(f func(), ef func(error)) {
 				stack := debug.Stack()
 				buf.Write(stack)
 				err := fmt.Errorf("gp: panic recovered: %s \n %s", err, buf.String())
-				if ef == nil {
+				if ef != nil {
 					ef(err)
 				} else {
 					panic(err)
@@ -160,7 +160,7 @@ func (t *waitPoolExecutor) Submit(f func(), ef func(error)) {
 				stack := debug.Stack()
 				buf.Write(stack)
 				err := fmt.Errorf("gp: panic recovered: %s \n %s", err, buf.String())
-				if ef == nil {
+				if ef != nil {
 					ef(err)
 				} else {
 					panic(err)

xgp/xgp_test.go

@@ -7,23 +7,31 @@ import (
 )
 
 func TestPG(t *testing.T) {
-	Go(func() {
+	pool := NewWaitPool(2)
+	pool.Submit(func() {
 		xconsole.Red("test1")
 		time.Sleep(2 * time.Second)
 		xconsole.Red("test1 Ok")
-	})
+	},nil)
 
-	Go(func() {
+	pool.Submit(func() {
 		xconsole.Red("test2")
 		time.Sleep(3 * time.Second)
 		xconsole.Red("test2 Ok")
-	})
+	},nil)
 
-	Go(func() {
+	pool.Submit(func() {
 		xconsole.Red("test3")
 		time.Sleep(4 * time.Second)
 		xconsole.Red("test3 Ok")
+	},nil)
+
+	pool.Submit(func() {
+		time.Sleep(8 * time.Second)
+		panic("test4")
+	}, func(err error) {
+		xconsole.Red(err.Error())
 	})
 
-	Wait()
+	pool.Wait()
 }