Skip to content

Commit

Permalink
fix(api): hook all traffic after write for upload
Browse files Browse the repository at this point in the history
  • Loading branch information
r3inbowari committed May 16, 2024
1 parent d50d54f commit 8bedd65
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 17 deletions.
44 changes: 30 additions & 14 deletions speedtest/data_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type Chunk interface {
Read(b []byte) (n int, err error)
}

const readChunkSize = 1024 * 32 // 32 KBytes
const readChunkSize = 1024 // 1 KBytes with higher frequency rate feedback

type DataType int32

Expand Down Expand Up @@ -448,22 +448,38 @@ func (dc *DataChunk) GetParent() Manager {
return dc.manager
}

func (dc *DataChunk) Read(b []byte) (n int, err error) {
if !dc.manager.running {
return n, io.EOF
}
if dc.remainOrDiscardSize < readChunkSize {
if dc.remainOrDiscardSize <= 0 {
// WriteTo Used to hook all traffic.
func (dc *DataChunk) WriteTo(w io.Writer) (written int64, err error) {
nw := 0
nr := readChunkSize
for {
if !dc.manager.running || dc.remainOrDiscardSize <= 0 {
dc.endTime = time.Now()
return n, io.EOF
return written, io.EOF
}
if dc.remainOrDiscardSize < readChunkSize {
nr = int(dc.remainOrDiscardSize)
nw, err = w.Write((*dc.manager.repeatByte)[:nr])
} else {
nw, err = w.Write(*dc.manager.repeatByte)
}
if err != nil {
return
}
n64 := int64(nw)
written += n64
dc.remainOrDiscardSize -= n64
dc.manager.AddTotalUpload(n64)
if nr != nw {
return written, io.ErrShortWrite
}
n = copy(b, (*dc.manager.repeatByte)[:dc.remainOrDiscardSize])
} else {
n = copy(b, *dc.manager.repeatByte)
}
n64 := int64(n)
dc.remainOrDiscardSize -= n64
atomic.AddInt64(&dc.manager.upload.totalDataVolume, n64)
}

// Please don't call it, only used to wrapped by [io.NopCloser]
// We use [DataChunk.WriteTo] that implements [io.WriterTo] to bypass this function.
func (dc *DataChunk) Read(b []byte) (n int, err error) {
panic("unexpected call: only used to implement the io.Reader")
return

Check failure on line 483 in speedtest/data_manager.go

View workflow job for this annotation

GitHub Actions / lint

unreachable: unreachable code (govet)
}

Expand Down
4 changes: 1 addition & 3 deletions speedtest/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,11 @@ func downloadRequest(ctx context.Context, s *Server, w int) error {
func uploadRequest(ctx context.Context, s *Server, w int) error {
size := ulSizes[w]
dc := s.Context.NewChunk().UploadHandler(int64(size*100-51) * 10)
req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.URL, dc)
req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.URL, io.NopCloser(dc))
if err != nil {
return err
}
req.ContentLength = dc.(*DataChunk).ContentLength
dbg.Printf("Len=%d, XulURL: %s\n", req.ContentLength, s.URL)

req.Header.Set("Content-Type", "application/octet-stream")
resp, err := s.Context.doer.Do(req)
if err != nil {
Expand Down

0 comments on commit 8bedd65

Please sign in to comment.