From 942e3412ed6d4640899244b7d2d02a5489ca2109 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Tue, 11 May 2021 15:58:29 +0800
Subject: [PATCH] req id

---
 io/io.go     |  4 ++--
 reqf/Reqf.go | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/io/io.go b/io/io.go
index 1572fdf..fb0be33 100644
--- a/io/io.go
+++ b/io/io.go
@@ -12,10 +12,10 @@ func RW2Chan(r io.ReadCloser,w io.WriteCloser) (rc,wc chan[]byte) {
 		go func(rc chan[]byte,r io.ReadCloser){
 			for {
 				buf := make([]byte, 1<<16)
-				n,_ := r.Read(buf)
+				n,e := r.Read(buf)
 				if n != 0 {
 					rc <- buf[:n]
-				} else {
+				} else if e != nil {
 					close(rc)
 					break
 				}
diff --git a/reqf/Reqf.go b/reqf/Reqf.go
index 2b3b9d2..34ac6cf 100644
--- a/reqf/Reqf.go
+++ b/reqf/Reqf.go
@@ -41,12 +41,17 @@ type Req struct {
     UsedTime time.Duration
 
     id *idpool.Id
+    idp *idpool.Idpool
     cancel *signal.Signal
     sync.Mutex
 }
 
 func New() *Req{
-    return &Req{}
+    idp := idpool.New()
+    return &Req{
+        idp:idp,
+        id:idp.Get(),
+    }
 }
 
 // func main(){
@@ -69,14 +74,9 @@ func (this *Req) Reqf(val Rval) (error) {
 
     if _val.Timeout==0{_val.Timeout=3}
 
-    {
-        idp := idpool.New()
-        this.id = idp.Get()
-        defer func(){
-            idp.Put(this.id)
-            this.id = nil
-        }()
-    }
+    defer func(){
+        this.idp.Put(this.id)
+    }()
 
     this.cancel = signal.Init()
 
-- 
2.39.2