Merge remote-tracking branch 'couchbase/unstable' into master

Change-Id: I4e9dedb25e50ebcd581441988c3fff0142f6a92a

nitro.go

@@ -311,7 +311,7 @@ func (cfg *Config) SetKeyComparator(cmp KeyCompare) {
 
 // UseMemoryMgmt provides custom memory allocator for Nitro items storage
 func (cfg *Config) UseMemoryMgmt(malloc skiplist.MallocFn, free skiplist.FreeFn) {
-	if runtime.GOARCH == "amd64" {
+	if runtime.GOARCH == "amd64" || runtime.GOARCH == "arm64" {
 		cfg.useMemoryMgmt = true
 		cfg.mallocFun = malloc
 		cfg.freeFun = free

skiplist/node.go

@@ -1,4 +1,4 @@
-// +build !amd64
+// +build !amd64,!arm64
 
 // Copyright (c) 2016 Couchbase, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

skiplist/node_alloc_amd64.go → skiplist/node_alloc_multi_arch.go

@@ -1,3 +1,5 @@
+// +build amd64 arm64
+//
 // Copyright (c) 2016 Couchbase, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
 // except in compliance with the License. You may obtain a copy of the License at

skiplist/node_amd64.go → skiplist/node_multi_arch.go

@@ -1,3 +1,5 @@
+// +build amd64 arm64
+
 // Copyright (c) 2016 Couchbase, Inc.
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
 // except in compliance with the License. You may obtain a copy of the License at

skiplist/skiplist.go

@@ -83,7 +83,7 @@ func New() *Skiplist {
 
 // NewWithConfig creates a config from given config
 func NewWithConfig(cfg Config) *Skiplist {
-	if runtime.GOARCH != "amd64" {
+	if runtime.GOARCH != "amd64" && runtime.GOARCH != "arm64" {
 		cfg.UseMemoryMgmt = false
 	}