Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

database/sql: use RWMutex for driver registration

Browse source 
Change-Id: I0f494c9f17cb6bb0cf5e7214cf033fdbd48f27f7
Reviewed-on: https://go-review.googlesource.com/16240
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Nathan VanBenschoten 2015-10-22 21:50:06 -04:00 • committed by Brad Fitzpatrick
parent f75f2f3fcc
commit 7f34a2dac8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/database/sql/sql.go
View file

@ -24,7 +24,7 @@ import (
) )
var ( var (
driversMu sync.Mutex driversMu sync.RWMutex
drivers = make(map[string]driver.Driver) drivers = make(map[string]driver.Driver)
) )
@ -52,8 +52,8 @@ func unregisterAllDrivers() {
// Drivers returns a sorted list of the names of the registered drivers. // Drivers returns a sorted list of the names of the registered drivers.
func Drivers() []string { func Drivers() []string {
driversMu.Lock() driversMu.RLock()
defer driversMu.Unlock() defer driversMu.RUnlock()
var list []string var list []string
for name := range drivers { for name := range drivers {
list = append(list, name) list = append(list, name)
@ -465,9 +465,9 @@ var connectionRequestQueueSize = 1000000
// function should be called just once. It is rarely necessary to // function should be called just once. It is rarely necessary to
// close a DB. // close a DB.
func Open(driverName, dataSourceName string) (*DB, error) { func Open(driverName, dataSourceName string) (*DB, error) {
driversMu.Lock() driversMu.RLock()
driveri, ok := drivers[driverName] driveri, ok := drivers[driverName]
driversMu.Unlock() driversMu.RUnlock()
if !ok { if !ok {
return nil, fmt.Errorf("sql: unknown driver %q (forgotten import?)", driverName) return nil, fmt.Errorf("sql: unknown driver %q (forgotten import?)", driverName)
} }