Move contextPool out from router

context.go

@@ -40,6 +40,22 @@ func putBuffer(buf *bytes.Buffer) {
  bufPool.Put(buf)
 }
 
+var contextPool = sync.Pool{
+ New: func() interface{} {
+ return &Context{}
+ },
+}
+
+func getContext() *Context {
+ ctx := contextPool.Get().(*Context)
+ ctx.reset()
+ return ctx
+}
+
+func putContext(ctx *Context) {
+ contextPool.Put(ctx)
+}
+
 // Context contains incoming request, route, params and manages outgoing response.
 type Context struct {
  router *Router

router.go

@@ -52,8 +52,6 @@ type Router struct {
  // Named routes.
  routes map[string]*Route
 
- contextPool sync.Pool
-
  paramsPool sync.Pool
  maxParams uint16
 
@@ -132,15 +130,6 @@ func NewRouter() *Router {
  HandleOPTIONS: true,
  }
 }
-func (r *Router) getContext() *Context {
- ctx := r.contextPool.Get().(*Context)
- ctx.reset()
- return ctx
-}
-
-func (r *Router) putContext(ctx *Context) {
- r.contextPool.Put(ctx)
-}
 
 func (r *Router) getParams() *Params {
  ps := r.paramsPool.Get().(*Params)
@@ -255,11 +244,6 @@ func (r *Router) Handle(method, path string, handle Handle, opts ...RouteOption)
  return &ps
  }
  }
- if r.contextPool.New == nil {
- r.contextPool.New = func() interface{} {
- return &Context{}
- }
- }
 }
 
 // Handler implements IRouter.Handler.
@@ -367,11 +351,11 @@ func (r *Router) allowed(path, reqMethod string) (allow string) {
 
 // ServeHTTP makes the router implement the http.Handler interface.
 func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
- ctx := r.getContext()
+ ctx := getContext()
  ctx.router = r
  ctx.Request = req
  ctx.Response = w
- defer r.putContext(ctx)
+ defer putContext(ctx)
 
  var err error
  if r.handle != nil {