c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(measurexlite): make buffered channels private (#864)

Browse source 
Closes https://github.com/ooni/probe/issues/2215
This commit is contained in:
DecFox 2022-08-17 23:40:48 +05:30 • committed by GitHub
commit e1d014e826
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 326 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

20
internal/measurexlite/conn.go
View file

@ -47,7 +47,7 @@ func (c *connTrace) Read(b []byte) (int, error) {
count, err := c.Conn.Read(b)
finished := c.tx.TimeSince(c.tx.ZeroTime)
select {
case c.tx.NetworkEvent <- NewArchivalNetworkEvent(
case c.tx.networkEvent <- NewArchivalNetworkEvent(
c.tx.Index, started, netxlite.ReadOperation, network, addr, count, err, finished):
default: // buffer is full
}
@ -62,7 +62,7 @@ func (c *connTrace) Write(b []byte) (int, error) {
count, err := c.Conn.Write(b)
finished := c.tx.TimeSince(c.tx.ZeroTime)
select {
case c.tx.NetworkEvent <- NewArchivalNetworkEvent(
case c.tx.networkEvent <- NewArchivalNetworkEvent(
c.tx.Index, started, netxlite.WriteOperation, network, addr, count, err, finished):
default: // buffer is full
}
@ -100,7 +100,7 @@ func (c *udpLikeConnTrace) ReadFrom(b []byte) (int, net.Addr, error) {
finished := c.tx.TimeSince(c.tx.ZeroTime)
address := addrStringIfNotNil(addr)
select {
case c.tx.NetworkEvent <- NewArchivalNetworkEvent(
case c.tx.networkEvent <- NewArchivalNetworkEvent(
c.tx.Index, started, netxlite.ReadFromOperation, "udp", address, count, err, finished):
default: // buffer is full
}
@ -114,7 +114,7 @@ func (c *udpLikeConnTrace) WriteTo(b []byte, addr net.Addr) (int, error) {
count, err := c.UDPLikeConn.WriteTo(b, addr)
finished := c.tx.TimeSince(c.tx.ZeroTime)
select {
case c.tx.NetworkEvent <- NewArchivalNetworkEvent(
case c.tx.networkEvent <- NewArchivalNetworkEvent(
c.tx.Index, started, netxlite.WriteToOperation, "udp", address, count, err, finished):
default: // buffer is full
}
@ -155,10 +155,20 @@ func NewAnnotationArchivalNetworkEvent(
func (tx *Trace) NetworkEvents() (out []*model.ArchivalNetworkEvent) {
for {
select {
case ev := <-tx.NetworkEvent:
case ev := <-tx.networkEvent:
out = append(out, ev)
default:
return // done
}
}
}
// FirstNetworkEventOrNil drains the network events buffered inside the NetworkEvents channel
// and returns the first NetworkEvent, if any. Otherwise, it returns nil.
func (tx *Trace) FirstNetworkEventOrNil() *model.ArchivalNetworkEvent {
ev := tx.NetworkEvents()
if len(ev) < 1 {
return nil
}
return ev[0]
}