neat(x/net/http/client): Go fmt style

goplus · Sep 20, 2024 · 1fb70ad · 1fb70ad
1 parent 0382274
commit 1fb70ad
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 173 deletions.
diff --git a/x/net/http/_demo/parallelRequest/parallelRequest.go b/x/net/http/_demo/parallelRequest/parallelRequest.go
@@ -26,7 +26,7 @@ func worker(id int, wg *sync.WaitGroup) {
 
 func main() {
  var wait sync.WaitGroup
- for i := 0; i < 500; i++ {
+ for i := 0; i < 100; i++ {
  wait.Add(1)
  go worker(i, &wait)
  }

diff --git a/x/net/http/body_stream.go b/x/net/http/body_stream.go
@@ -2,7 +2,6 @@ package http
 
 import (
  "errors"
- "fmt"
 
  "github.com/goplus/llgo/c/libuv"
 )
@@ -18,7 +17,7 @@ type bodyStream struct {
 }
 
 var (
- ErrClosedRequestBody = errors.New("request body: read/write on closed body")
+ ErrClosedBodyStream = errors.New("body stream: read/write on closed body")
 )
 
 func newBodyStream(asyncHandle *libuv.Async) *bodyStream {
@@ -30,7 +29,6 @@ func newBodyStream(asyncHandle *libuv.Async) *bodyStream {
 }
 
 func (rb *bodyStream) Read(p []byte) (n int, err error) {
- fmt.Println("[debug] RequestBody Read called")
  select {
  case <-rb.done:
  err = rb.readCloseError()
@@ -41,11 +39,9 @@ func (rb *bodyStream) Read(p []byte) (n int, err error) {
  for n < len(p) {
  if len(rb.chunk) == 0 {
  rb.asyncHandle.Send()
- fmt.Println("[debug] RequestBody Read asyncHandle.Send called")
  select {
  case chunk := <-rb.readCh:
  rb.chunk = chunk
- fmt.Println("[debug] RequestBody Read chunk received")
  case <-rb.done:
  err = rb.readCloseError()
  return
@@ -64,16 +60,15 @@ func (rb *bodyStream) readCloseError() error {
  if rerr := rb.rerr; rerr != nil {
  return rerr
  }
- return ErrClosedRequestBody
+ return ErrClosedBodyStream
 }
 
 func (rb *bodyStream) closeWithError(err error) error {
- fmt.Println("[debug] RequestBody closeRead called")
  if rb.rerr != nil {
  return nil
  }
  if err == nil {
- err = ErrClosedRequestBody
+ err = ErrClosedBodyStream
  }
  rb.rerr = err
  close(rb.done)

diff --git a/x/net/http/response.go b/x/net/http/response.go
@@ -239,18 +239,12 @@ func (r *Response) checkRespBody(taskData *clientTaskData) (needContinue bool) {
  select {
  case taskData.resc <- responseAndError{res: r}:
  case <-taskData.callerGone:
- if debugSwitch {
- println("############### checkRespBody callerGone")
- }
  closeAndRemoveIdleConn(pc, true)
  return true
  }
  // Now that they've read from the unbuffered channel, they're safely
  // out of the select that also waits on this goroutine to die, so
  // we're allowed to exit now if needed (if alive is false)
- if debugSwitch {
- println("############### checkRespBody return")
- }
  closeAndRemoveIdleConn(pc, false)
  return true
  }