inline functions

Former-commit-id: 4b0dea2

Author: phuslu

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Phus Lu
+Copyright (c) 2020 Phus Lu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-# geoip - fast geoip country library
+# geoip - fastest geoip country library
 
 [![godoc](http://img.shields.io/badge/godoc-reference-blue.svg?style=flat)](https://godoc.org/github.com/phuslu/geoip) [![license](http://img.shields.io/badge/license-MIT-red.svg?style=flat)](https://raw.githubusercontent.com/phuslu/geoip/master/LICENSE) [![goreport](https://goreportcard.com/badge/github.com/phuslu/geoip)](https://goreportcard.com/report/github.com/phuslu/geoip) [![coverage](https://img.shields.io/badge/coverage-100%25-brightgreen)](https://gocover.io/github.com/phuslu/geoip)
 
@@ -8,21 +8,22 @@
 package main
 
 import (
+	"fmt"
 	"net"
 	"github.com/phuslu/geoip"
 )
 
 func main() {
-	println(string(geoip.Country(net.ParseIP("2001:4860:4860::8888"))))
+	fmt.Printf("%s", geoip.Country(net.ParseIP("2001:4860:4860::8888")))
 }
 
 // Output: US
 ```
 
 ### Benchmarks
 ```
-BenchmarkGeoIpCountryForIPv4-8   	35.2 ns/op	       0 B/op	       0 allocs/op
-BenchmarkGeoIpCountryForIPv6-8   	43.6 ns/op	       0 B/op	       0 allocs/op
+BenchmarkGeoIpCountryForIPv4-8   	20.8 ns/op	       0 B/op	       0 allocs/op
+BenchmarkGeoIpCountryForIPv6-8   	38.2 ns/op	       0 B/op	       0 allocs/op
 ```
 
 ### Acknowledgment

geoip.go

@@ -1,9 +1,6 @@
 // Package geoip provides fastest GeoIP Country library for Go.
 //
-// eg.
-//
-//      country := geoip.Country(net.ParseIP("1.1.1.1"))
-//      fmt.Printf("%s\n", country)
+//      fmt.Printf("%s\n", geoip.Country(net.ParseIP("1.1.1.1")))
 //
 //      // Output: US
 package geoip
@@ -13,31 +10,41 @@ import (
 	"net"
 )
 
-// Country find iso3166 country code of IP.
+// Country find ISO 3166-1 alpha-2 country code of IP.
 func Country(ip net.IP) (country []byte) {
 	if ip == nil {
 		return
 	}
+
 	if ip4 := ip.To4(); ip4 != nil {
-		country = country4(binary.BigEndian.Uint32(ip4))
+		// ipv4
+		n := binary.BigEndian.Uint32(ip4)
+		i, j := 0, len(ips)
+		for i < j {
+			h := (i + j) >> 1
+			if ips[h] > n {
+				j = h
+			} else {
+				i = h + 1
+			}
+		}
+		country = geo[i<<1-2 : i<<1]
 	} else {
-		country = country6(binary.BigEndian.Uint64(ip), binary.BigEndian.Uint64(ip[8:]))
-	}
-	return
-}
-
-func country4(n uint32) (country []byte) {
-	i, j := 0, len(ips)
-	for i < j {
-		h := int(uint(i+j) >> 1)
-		if ips[h] <= n {
-			i = h + 1
-		} else {
-			j = h
+		// ipv6
+		high := binary.BigEndian.Uint64(ip)
+		low := binary.BigEndian.Uint64(ip[8:])
+		i, j := 0, len(ips6)
+		for i < j {
+			h := (i + j) >> 1 & ^0xf
+			n := ip6uint(h)
+			if n > high || (n == high && ip6uint(h+8) > low) {
+				j = h
+			} else {
+				i = h + 16
+			}
 		}
+		country = geo6[i>>3-2 : i>>3]
 	}
 
-	country = geo[i*2-2 : i*2]
-
 	return
 }

geoip6.go

@@ -1 +1 @@
-8f11b974f898b3938be68810f1d244d6603ff4dc
+b25db6cfc8619db0925d4a5b0bd7bfd10a4108c1

geoip6_safe.go

@@ -54,12 +54,12 @@ func TestGeoIpCountry(t *testing.T) {
 }
 
 func BenchmarkGeoIpCountryForIPv4(b *testing.B) {
-	ip := net.ParseIP("8.8.8.8")
+	ip := net.IP{8, 8, 8, 8}
 
 	b.ReportAllocs()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		Country(net.IP(ip))
+		Country(ip)
 	}
 }
 

geoip_db.go.REMOVED.git-id

@@ -0,0 +1,18 @@
+// +build !386
+// +build !amd64
+// +build !amd64p32
+// +build !arm64
+// +build !ppc64le
+// +build !mipsle
+// +build !mips64le
+// +build !mips64p32le
+
+package geoip
+
+import (
+	"encoding/binary"
+)
+
+func ip6uint(i int) uint64 {
+	return binary.LittleEndian.Uint64(ips6[i:])
+}

geoip_test.go

@@ -0,0 +1,11 @@
+// +build 386 amd64 amd64p32 arm64 ppc64le mipsle mips64le mips64p32le
+
+package geoip
+
+import (
+	"unsafe"
+)
+
+func ip6uint(i int) uint64 {
+	return *(*uint64)(unsafe.Pointer(&ips6[i]))
+}