Applied review changes. Deleted init and copyCookies functions.

cookiejar.go

@@ -13,32 +13,11 @@ type CookieJar struct {
 	hostCookies map[string][]*Cookie
 }
 
-func (cj *CookieJar) init() {
-	cj.m.Lock()
-	{
-		if cj.hostCookies == nil {
-			cj.hostCookies = make(map[string][]*Cookie)
-		}
-	}
-	cj.m.Unlock()
-}
-
-func copyCookies(cookies []*Cookie) (cs []*Cookie) {
-	// TODO: Try to delete the allocations
-	cs = make([]*Cookie, 0, len(cookies))
-	for _, cookie := range cookies {
-		c := AcquireCookie()
-		c.CopyTo(cookie)
-		cs = append(cs, c)
-	}
-	return
-}
-
 // Get returns the cookies stored from a specific domain.
 //
 // If there were no cookies related with host returned slice will be nil.
 //
-// returned cookies can be released safely.
+// CookieJar keeps a copy of the cookies, so the returned cookies can be released safely.
 func (cj *CookieJar) Get(uri *URI) (cookies []*Cookie) {
 	if uri != nil {
 		cookies = cj.get(uri.Host(), uri.Path())
@@ -47,7 +26,9 @@ func (cj *CookieJar) Get(uri *URI) (cookies []*Cookie) {
 }
 
 func (cj *CookieJar) get(host, path []byte) (rcs []*Cookie) {
-	cj.init()
+	if cj.hostCookies == nil {
+		return
+	}
 
 	var (
 		err     error
@@ -59,12 +40,8 @@ func (cj *CookieJar) get(host, path []byte) (rcs []*Cookie) {
 	if err != nil {
 		hostStr = b2s(host)
 	}
-	cj.m.Lock()
-	{
-		// get cookies deleting expired ones
-		cookies = cj.getCookies(hostStr)
-	}
-	cj.m.Unlock()
+	// get cookies deleting expired ones
+	cookies = cj.getCookies(hostStr)
 
 	rcs = make([]*Cookie, 0, len(cookies))
 	for i := 0; i < len(cookies); i++ {
@@ -79,32 +56,38 @@ func (cj *CookieJar) get(host, path []byte) (rcs []*Cookie) {
 }
 
 // getCookies returns a cookie slice releasing expired cookies
-func (cj *CookieJar) getCookies(hostStr string) []*Cookie {
-	var (
+func (cj *CookieJar) getCookies(hostStr string) (cookies []*Cookie) {
+	cj.m.Lock()
+	{
 		cookies = cj.hostCookies[hostStr]
-		t       = time.Now()
-		n       = len(cookies)
-	)
-	for i := 0; i < len(cookies); i++ {
-		c := cookies[i]
-		if !c.Expire().Equal(CookieExpireUnlimited) && c.Expire().Before(t) { // cookie expired
-			cookies = append(cookies[:i], cookies[i+1:]...)
-			ReleaseCookie(c)
-			i--
+		var (
+			t = time.Now()
+			n = len(cookies)
+		)
+		for i := 0; i < len(cookies); i++ {
+			c := cookies[i]
+			if !c.Expire().Equal(CookieExpireUnlimited) && c.Expire().Before(t) { // cookie expired
+				cookies = append(cookies[:i], cookies[i+1:]...)
+				ReleaseCookie(c)
+				i--
+			}
+		}
+		// has any cookie been deleted?
+		if n > len(cookies) {
+			cj.hostCookies[hostStr] = cookies
 		}
 	}
-	// has any cookie been deleted?
-	if n > len(cookies) {
-		cj.hostCookies[hostStr] = cookies
-	}
-	return cookies
+	cj.m.Unlock()
+	return
 }
 
 // Set sets cookies for a specific host.
 //
 // The host is get from uri.Host().
 //
 // If the cookie key already exists it will be replaced by the new cookie value.
+//
+// CookieJar keeps a copy of the cookies, so the parsed cookies can be released safely.
 func (cj *CookieJar) Set(uri *URI, cookies ...*Cookie) {
 	if uri != nil {
 		cj.set(uri.Host(), cookies...)
@@ -114,15 +97,18 @@ func (cj *CookieJar) Set(uri *URI, cookies ...*Cookie) {
 // SetByHost sets cookies for a specific host.
 //
 // If the cookie key already exists it will be replaced by the new cookie value.
+//
+// CookieJar keeps a copy of the cookies, so the parsed cookies can be released safely.
 func (cj *CookieJar) SetByHost(host []byte, cookies ...*Cookie) {
 	cj.set(host, cookies...)
 }
 
 func (cj *CookieJar) set(host []byte, cookies ...*Cookie) {
-	cj.init()
-
 	cj.m.Lock()
 	{
+		if cj.hostCookies == nil {
+			cj.hostCookies = make(map[string][]*Cookie)
+		}
 		hostStr := b2s(host)
 		hcs, ok := cj.hostCookies[hostStr]
 		if !ok {
@@ -132,13 +118,11 @@ func (cj *CookieJar) set(host []byte, cookies ...*Cookie) {
 		}
 		for _, cookie := range cookies {
 			c := searchCookieByKeyAndPath(cookie.Key(), cookie.Path(), hcs)
-			if c != nil {
-				c.ParseBytes(cookie.Cookie())
-			} else {
+			if c == nil {
 				c = AcquireCookie()
-				c.CopyTo(cookie)
 				hcs = append(hcs, c)
 			}
+			c.CopyTo(cookie)
 		}
 		cj.hostCookies[hostStr] = hcs
 	}
@@ -177,11 +161,12 @@ func (cj *CookieJar) dumpTo(req *Request) {
 }
 
 func (cj *CookieJar) getFrom(host, path []byte, res *Response) {
-	cj.init()
-
 	hostStr := b2s(host)
 	cj.m.Lock()
 	{
+		if cj.hostCookies == nil {
+			cj.hostCookies = make(map[string][]*Cookie)
+		}
 		cookies, ok := cj.hostCookies[hostStr]
 		if !ok {
 			// If the key does not exists in the map then
@@ -193,11 +178,10 @@ func (cj *CookieJar) getFrom(host, path []byte, res *Response) {
 			created := false
 			c := searchCookieByKeyAndPath(key, path, cookies)
 			if c == nil {
-				c = AcquireCookie()
-				created = true
+				c, created = AcquireCookie(), true
 			}
 			c.ParseBytes(value)
-			if c.Expire().IsZero() || c.Expire().After(t) { // cookie expired
+			if c.Expire().Equal(CookieExpireUnlimited) || c.Expire().After(t) {
 				cookies = append(cookies, c)
 			} else if created {
 				ReleaseCookie(c)