Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4734 from luxas/32bit_alignments

Browse Source 
etcdserver: align 64-bit atomics on 8-byte boundary
This commit is contained in:
Anthony Romano 2016-04-10 19:18:15 -07:00
commit 130567832f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etcdserver/server.go
View File

@ -156,9 +156,13 @@ type Server interface {
// EtcdServer is the production implementation of the Server interface // EtcdServer is the production implementation of the Server interface
type EtcdServer struct { type EtcdServer struct {
// r must be the first element to keep 64-bit alignment for atomic // r and inflightSnapshots must be the first elements to keep 64-bit alignment for atomic
// access to fields // access to fields
r raftNode
// count the number of inflight snapshots.
// MUST use atomic operation to access this field.
inflightSnapshots int64
r raftNode
cfg *ServerConfig cfg *ServerConfig
snapCount uint64 snapCount uint64
@ -202,10 +206,6 @@ type EtcdServer struct {
forceVersionC chan struct{} forceVersionC chan struct{}
msgSnapC chan raftpb.Message msgSnapC chan raftpb.Message
// count the number of inflight snapshots.
// MUST use atomic operation to access this field.
inflightSnapshots int64
} }
// NewServer creates a new EtcdServer from the supplied configuration. The // NewServer creates a new EtcdServer from the supplied configuration. The