yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 03:05:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pointer receivers for phony.Block

Browse source
This commit is contained in:
Neil Alexander 2019-08-28 12:26:44 +01:00
parent 5d7d84f827
commit 607c906820
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/yggdrasil/api.go
View file

@ -178,7 +178,7 @@ func (c *Core) GetDHT() []DHTEntry {
dhtentries = append(dhtentries, info) dhtentries = append(dhtentries, info)
} }
} }
phony.Block(c.router, getDHT) phony.Block(&c.router, getDHT)
return dhtentries return dhtentries
} }
@ -206,7 +206,7 @@ func (c *Core) GetSwitchQueues() SwitchQueues {
switchqueues.Queues = append(switchqueues.Queues, queue) switchqueues.Queues = append(switchqueues.Queues, queue)
} }
} }
phony.Block(c.switchTable, getSwitchQueues) phony.Block(&c.switchTable, getSwitchQueues)
return switchqueues return switchqueues
} }
@ -243,7 +243,7 @@ func (c *Core) GetSessions() []Session {
sessions = append(sessions, session) sessions = append(sessions, session)
} }
} }
phony.Block(c.router, getSessions) phony.Block(&c.router, getSessions)
return sessions return sessions
} }
@ -344,7 +344,7 @@ func (c *Core) GetNodeInfo(key crypto.BoxPubKey, coords []uint64, nocache bool)
}) })
c.router.nodeinfo.sendNodeInfo(key, wire_coordsUint64stoBytes(coords), false) c.router.nodeinfo.sendNodeInfo(key, wire_coordsUint64stoBytes(coords), false)
} }
phony.Block(c.router, sendNodeInfoRequest) phony.Block(&c.router, sendNodeInfoRequest)
timer := time.AfterFunc(6*time.Second, func() { close(response) }) timer := time.AfterFunc(6*time.Second, func() { close(response) })
defer timer.Stop() defer timer.Stop()
for res := range response { for res := range response {
@ -454,7 +454,7 @@ func (c *Core) DHTPing(key crypto.BoxPubKey, coords []uint64, target *crypto.Nod
}) })
c.router.dht.ping(&info, &rq.dest) c.router.dht.ping(&info, &rq.dest)
} }
phony.Block(c.router, sendPing) phony.Block(&c.router, sendPing)
// TODO: do something better than the below... // TODO: do something better than the below...
res := <-resCh res := <-resCh
if res != nil { if res != nil {

4
src/yggdrasil/conn.go
View file

@ -92,7 +92,7 @@ func (c *Conn) setMTU(from phony.Actor, mtu uint16) {
func (c *Conn) search() error { func (c *Conn) search() error {
var sinfo *searchInfo var sinfo *searchInfo
var isIn bool var isIn bool
phony.Block(c.core.router, func() { phony.Block(&c.core.router, func() {
sinfo, isIn = c.core.router.searches.searches[*c.nodeID] sinfo, isIn = c.core.router.searches.searches[*c.nodeID]
}) })
if !isIn { if !isIn {
@ -108,7 +108,7 @@ func (c *Conn) search() error {
default: default:
} }
} }
phony.Block(c.core.router, func() { phony.Block(&c.core.router, func() {
sinfo = c.core.router.searches.newIterSearch(c.nodeID, c.nodeMask, searchCompleted) sinfo = c.core.router.searches.newIterSearch(c.nodeID, c.nodeMask, searchCompleted)
sinfo.continueSearch() sinfo.continueSearch()
}) })

2
src/yggdrasil/core.go
View file

@ -176,7 +176,7 @@ func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) (*config.NodeState,
c.config.Mutex.RLock() c.config.Mutex.RLock()
if c.config.Current.SwitchOptions.MaxTotalQueueSize >= SwitchQueueTotalMinSize { if c.config.Current.SwitchOptions.MaxTotalQueueSize >= SwitchQueueTotalMinSize {
phony.Block(c.switchTable, func() { phony.Block(&c.switchTable, func() {
c.switchTable.queues.totalMaxSize = c.config.Current.SwitchOptions.MaxTotalQueueSize c.switchTable.queues.totalMaxSize = c.config.Current.SwitchOptions.MaxTotalQueueSize
}) })
} }

2
src/yggdrasil/peer.go
View file

@ -149,7 +149,7 @@ func (ps *peers) removePeer(port switchPort) {
if port == 0 { if port == 0 {
return return
} // Can't remove self peer } // Can't remove self peer
phony.Block(ps.core.router, func() { phony.Block(&ps.core.router, func() {
ps.core.switchTable.forgetPeer(port) ps.core.switchTable.forgetPeer(port)
}) })
ps.mutex.Lock() ps.mutex.Lock()