Refactor RunLoop() and change its usage

cmd/ping/ping.go

@@ -40,7 +40,7 @@ func main() {
 	})
 
 	p.MaxRTT = time.Second
-	errch := p.RunLoop()
+	p.RunLoop()
 
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
@@ -65,8 +65,10 @@ loop:
 				}
 				results[host] = nil
 			}
-		case err := <-errch:
+		case <-p.Done():
-			fmt.Println("Ping failed: %v", err)
+			if err = p.Err(); err != nil {
+				fmt.Println("Ping failed:", err)
+			}
 			break loop
 		}
 	}

fastping.go

@@ -87,7 +87,6 @@ type Pinger struct {
 	// key string is IPAddr.String()
 	addrs   map[string]*net.IPAddr
 	ctx    *context
-	running bool
 	// Number of (nano,milli)seconds of an idle timeout. Once it passed,
 	// the library calls an idle callback function. It is also used for an
 	// interval time of RunLoop() method
@@ -104,7 +103,6 @@ func NewPinger() *Pinger {
 		id:       rand.Intn(0xffff),
 		seq:      rand.Intn(0xffff),
 		addrs:    make(map[string]*net.IPAddr),
-		running:  false,
 		MaxRTT:   time.Second,
 		handlers: make(map[string]interface{}),
 		Debug:    false,
@@ -180,14 +178,16 @@ func (p *Pinger) Run() error {
 // After MaxRTT seconds, it calls "idle" handler, resend packets and wait those
 // response. MaxRTT works as an interval time.
 //
-// This is a non-blocking method so immediately returns with channel value.
+// This is a non-blocking method so immediately returns. If you want to monitor
-// If you want to stop sending packets, use Stop(). For example,
+// and stop sending packets, use Done() and Stop() method. For example,
 //
-//	errch := p.RunLoop()
+//	p.RunLoop()
 //	ticker := time.NewTicker(time.Millisecond * 250)
 //	select {
-//	case err := <-errch:
+//	case <-p.Done():
+//		if err := p.Err(); err != nil {
 //			log.Fatalf("Ping failed: %v", err)
+//		}
 //	case <-ticker.C:
 //		break
 //	}
@@ -195,16 +195,13 @@ func (p *Pinger) Run() error {
 //	p.Stop()
 //
 // For more detail, please see "cmd/ping/ping.go".
-func (p *Pinger) RunLoop() <-chan error {
+func (p *Pinger) RunLoop() {
 	p.ctx = newContext()
-	errch := make(chan error)
+	go p.run(false)
-	go func(ch chan<- error) {
+}
-		p.run(false)
+
-		if p.ctx.err != nil {
+func (p *Pinger) Done() <-chan bool {
-			ch <- p.ctx.err
+	return p.ctx.done
-		}
-	}(errch)
-	return errch
 }
 
 func (p *Pinger) Stop() {
@@ -214,6 +211,10 @@ func (p *Pinger) Stop() {
 	<-p.ctx.done
 }
 
+func (p *Pinger) Err() error {
+	return p.ctx.err
+}
+
 func (p *Pinger) run(once bool) {
 	p.debugln("Run(): Start")
 	conn, err := net.ListenIP("ip4:icmp", &net.IPAddr{IP: net.IPv4zero})

fastping_test.go

@@ -199,11 +199,13 @@ func TestRunLoop(t *testing.T) {
 		t.Fatalf("Failed to add idle handler: %v", err)
 	}
 
-	errch := p.RunLoop()
+	p.RunLoop()
 	ticker := time.NewTicker(time.Millisecond * 250)
 	select {
-	case err := <-errch:
+	case <-p.Done():
+		if err = p.Err(); err != nil {
 			t.Fatalf("Pinger returns error %v", err)
+		}
 	case <-ticker.C:
 		break
 	}