concurrent fix: add RWlock

Author: scientiacoder

go.mod

@@ -3,6 +3,7 @@ module github.com/scientiacoder/go-PingClient
 go 1.15
 
 require (
-	golang.org/x/net v0.0.0-20201224014010-6772e930b67b
+	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
+	golang.org/x/sys v0.0.0-20210313202042-bd2e13477e9c // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -1,7 +1,11 @@
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210313202042-bd2e13477e9c h1:coiPEfMv+ThsjULRDygLrJVlNE1gDdL2g65s0LhV2os=
+golang.org/x/sys v0.0.0-20210313202042-bd2e13477e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

pingClient.go

@@ -96,6 +96,7 @@ const (
 var (
 	ipv4Proto = map[string]string{"icmp": "ip4:icmp", "udp": "udp4"}
 	ipv6Proto = map[string]string{"icmp": "ip6:ipv6-icmp", "udp": "udp6"}
+	globalmu  sync.RWMutex
 )
 
 // New returns a new PingClient struct pointer.
@@ -602,9 +603,13 @@ func (p *PingClient) processPacket(recv *packet) error {
 func (p *PingClient) sendICMP(conn, conn6 *icmp.PacketConn) error {
 	wg := new(sync.WaitGroup)
 	for _, addr := range p.IPs {
+		globalmu.RLock()
 		if !p.Continuous && p.PacketsSent[addr.IP.String()] >= p.Num {
+			globalmu.RUnlock()
 			continue
 		}
+		globalmu.RUnlock()
+
 		var cn *icmp.PacketConn
 		var typ icmp.Type
 		if isIPv4(addr.IP) {
@@ -661,7 +666,9 @@ func (p *PingClient) sendICMP(conn, conn6 *icmp.PacketConn) error {
 				}
 				break
 			}
+			globalmu.Lock()
 			p.PacketsSent[ipStr]++
+			globalmu.Unlock()
 			wg.Done()
 		}(cn, dst, ipStr, msgBytes)
 	}
@@ -681,6 +688,8 @@ func (p *PingClient) listen(netProto string) (*icmp.PacketConn, error) {
 }
 
 func (p *PingClient) initPacketsConfig() {
+	globalmu.Lock()
+	defer globalmu.Unlock()
 	for _, addr := range p.IPs {
 		p.PacketsSent[addr.IP.String()] = 0
 		p.PacketsRecv[addr.IP.String()] = 0
@@ -691,6 +700,8 @@ func (p *PingClient) initPacketsConfig() {
 
 // All checks whether all the map entry satisfies the function f
 func All(m map[string]int, f func(int, int) bool, num int) bool {
+	globalmu.RLock()
+	defer globalmu.RUnlock()
 	for _, val := range m {
 		if !f(val, num) {
 			return false
@@ -729,7 +740,9 @@ func (p *PingClient) Statistics() []*Statistics {
 // StatisticsPerIP returns the statistics of the Ping info to the given IP address.
 func (p *PingClient) StatisticsPerIP(ipAddr *net.IPAddr) *Statistics {
 	var ipStr string = ipAddr.IP.String()
+	globalmu.RLock()
 	loss := float64(p.PacketsSent[ipStr]-p.PacketsRecv[ipStr]) / float64(p.PacketsSent[ipStr]) * 100
+	globalmu.Unlock()
 	var min, max, total time.Duration
 	if len(p.rtts[ipStr]) > 0 {
 		min = p.rtts[ipStr][0]
@@ -744,6 +757,7 @@ func (p *PingClient) StatisticsPerIP(ipAddr *net.IPAddr) *Statistics {
 		}
 		total += rt
 	}
+	globalmu.RLock()
 	s := Statistics{
 		PacketsSent: p.PacketsSent[ipStr],
 		PacketsRecv: p.PacketsRecv[ipStr],
@@ -755,6 +769,7 @@ func (p *PingClient) StatisticsPerIP(ipAddr *net.IPAddr) *Statistics {
 		MaxRtt:      max,
 		MinRtt:      min,
 	}
+	globalmu.RUnlock()
 	if len(p.rtts[ipStr]) > 0 {
 		s.AvgRtt = total / time.Duration(len(p.rtts[ipStr]))
 		var sumsquares time.Duration