network: optimize wifi locking and include memory allocation optimization

network/wifi_ap.go

@@ -10,7 +10,7 @@ import (
 
 type AccessPoint struct {
 	*Station
-	sync.Mutex
+	sync.RWMutex
 
 	aliases         *data.UnsortedKV
 	clients         map[string]*Station
@@ -32,12 +32,12 @@ func NewAccessPoint(essid, bssid string, frequency int, rssi int8, aliases *data
 }
 
 func (ap *AccessPoint) MarshalJSON() ([]byte, error) {
-	ap.Lock()
-	defer ap.Unlock()
+	ap.RLock()
+	defer ap.RUnlock()
 
 	doc := apJSON{
 		Station:   ap.Station,
-		Clients:   make([]*Station, 0),
+		Clients:   make([]*Station, len(ap.clients)),
 		Handshake: ap.withKeyMaterial,
 	}
 
@@ -49,8 +49,8 @@ func (ap *AccessPoint) MarshalJSON() ([]byte, error) {
 }
 
 func (ap *AccessPoint) Get(bssid string) (*Station, bool) {
-	ap.Lock()
-	defer ap.Unlock()
+	ap.RLock()
+	defer ap.RUnlock()
 
 	bssid = NormalizeMac(bssid)
 	if s, found := ap.clients[bssid]; found {
@@ -97,16 +97,16 @@ func (ap *AccessPoint) AddClientIfNew(bssid string, frequency int, rssi int8) (*
 }
 
 func (ap *AccessPoint) NumClients() int {
-	ap.Lock()
-	defer ap.Unlock()
+	ap.RLock()
+	defer ap.RUnlock()
 	return len(ap.clients)
 }
 
 func (ap *AccessPoint) Clients() (list []*Station) {
-	ap.Lock()
-	defer ap.Unlock()
+	ap.RLock()
+	defer ap.RUnlock()
 
-	list = make([]*Station, 0)
+	list = make([]*Station, len(ap.clients))
 	for _, c := range ap.clients {
 		list = append(list, c)
 	}
@@ -130,15 +130,15 @@ func (ap *AccessPoint) WithKeyMaterial(state bool) {
 }
 
 func (ap *AccessPoint) HasKeyMaterial() bool {
-	ap.Lock()
-	defer ap.Unlock()
+	ap.RLock()
+	defer ap.RUnlock()
 
 	return ap.withKeyMaterial
 }
 
 func (ap *AccessPoint) NumHandshakes() int {
-	ap.Lock()
-	defer ap.Unlock()
+	ap.RLock()
+	defer ap.RUnlock()
 
 	sum := 0
 
@@ -156,8 +156,8 @@ func (ap *AccessPoint) HasHandshakes() bool {
 }
 
 func (ap *AccessPoint) HasPMKID() bool {
-	ap.Lock()
-	defer ap.Unlock()
+	ap.RLock()
+	defer ap.RUnlock()
 
 	for _, c := range ap.clients {
 		if c.Handshake.HasPMKID() {