mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
using monotonic clock
This commit is contained in:
parent
02d4975edf
commit
4ad808f4dc
9 changed files with 359 additions and 4 deletions
25
Godeps/_workspace/src/github.com/aristanetworks/goarista/AUTHORS
generated
vendored
Normal file
25
Godeps/_workspace/src/github.com/aristanetworks/goarista/AUTHORS
generated
vendored
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
All contributors are required to sign a "Contributor License Agreement" at
|
||||
<TBD>
|
||||
|
||||
The following organizations and people have contributed code to this library.
|
||||
(Please keep both lists sorted alphabetically.)
|
||||
|
||||
|
||||
Arista Networks, Inc.
|
||||
|
||||
|
||||
Benoit Sigoure
|
||||
Fabrice Rabaute
|
||||
|
||||
|
||||
|
||||
The list of individual contributors for code currently in HEAD can be obtained
|
||||
at any time with the following script:
|
||||
|
||||
find . -type f \
|
||||
| while read i; do \
|
||||
git blame -t $i 2>/dev/null; \
|
||||
done \
|
||||
| sed 's/^[0-9a-f]\{8\} [^(]*(\([^)]*\) [-+0-9 ]\{14,\}).*/\1/;s/ *$//' \
|
||||
| awk '{a[$0]++; t++} END{for(n in a) print n}' \
|
||||
| sort
|
||||
177
Godeps/_workspace/src/github.com/aristanetworks/goarista/COPYING
generated
vendored
Normal file
177
Godeps/_workspace/src/github.com/aristanetworks/goarista/COPYING
generated
vendored
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
66
Godeps/_workspace/src/github.com/aristanetworks/goarista/README.md
generated
vendored
Normal file
66
Godeps/_workspace/src/github.com/aristanetworks/goarista/README.md
generated
vendored
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
# Arista Go library [](https://travis-ci.org/aristanetworks/goarista) [](http://codecov.io/github/aristanetworks/goarista?branch=master) [](https://godoc.org/github.com/aristanetworks/goarista) [](https://goreportcard.com/report/github.com/aristanetworks/goarista)
|
||||
|
||||
## areflect
|
||||
|
||||
Helper functions to work with the `reflect` package. Contains
|
||||
`ForceExport()`, which bypasses the check in `reflect.Value` that
|
||||
prevents accessing unexported attributes.
|
||||
|
||||
## atime
|
||||
|
||||
Provides access to a fast monotonic clock source, to fill in the gap in the
|
||||
[Go standard library, which lacks one](https://github.com/golang/go/issues/12914).
|
||||
Don't use `time.Now()` in code that needs to time things or otherwise assume
|
||||
that time passes at a constant rate, instead use `atime.Nanotime()`.
|
||||
|
||||
## cmd
|
||||
|
||||
### occli
|
||||
|
||||
Simple CLI client for the OpenConfig gRPC interface that prints the response
|
||||
protobufs in text form or JSON.
|
||||
|
||||
### ockafka
|
||||
|
||||
Client for the OpenConfig gRPC interface that publishes updates to Kafka.
|
||||
|
||||
### ocredis
|
||||
|
||||
Client for the OpenConfig gRPC interface that publishes updates to Redis
|
||||
using both [Redis' hashes](http://redis.io/topics/data-types-intro#hashes)
|
||||
(one per container / entity / collection) and [Redis' Pub/Sub](http://redis.io/topics/pubsub)
|
||||
mechanism, so that one can [subscribe](http://redis.io/commands/subscribe) to
|
||||
incoming updates being applied on the hash maps.
|
||||
|
||||
## dscp
|
||||
|
||||
Provides `ListenTCPWithTOS()`, which is a replacement for `net.ListenTCP()`
|
||||
that allows specifying the ToS (Type of Service), to specify DSCP / ECN /
|
||||
class of service flags to use for incoming connections.
|
||||
|
||||
## key
|
||||
|
||||
Provides a common type used across various Arista projects, named `key.Key`,
|
||||
which is used to work around the fact that Go can't let one
|
||||
use a non-hashable type as a key to a `map`, and we sometimes need to use
|
||||
a `map[string]interface{}` (or something containing one) as a key to maps.
|
||||
As a result, we frequently use `map[key.Key]interface{}` instead of just
|
||||
`map[interface{}]interface{}` when we need a generic key-value collection.
|
||||
|
||||
## monitor
|
||||
|
||||
A library to help expose monitoring metrics on top of the
|
||||
[`expvar`](https://golang.org/pkg/expvar/) infrastructure.
|
||||
|
||||
## netns
|
||||
|
||||
`netns.Do(namespace, cb)` provides a handy mechanism to execute the given
|
||||
callback `cb` in the given [network namespace](https://lwn.net/Articles/580893/).
|
||||
|
||||
## test
|
||||
|
||||
This is a [Go](http://golang.org/) library to help in writing unit tests.
|
||||
|
||||
## Examples
|
||||
|
||||
TBD
|
||||
6
Godeps/_workspace/src/github.com/aristanetworks/goarista/atime/issue15006.s
generated
vendored
Normal file
6
Godeps/_workspace/src/github.com/aristanetworks/goarista/atime/issue15006.s
generated
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
// Copyright (C) 2016 Arista Networks, Inc.
|
||||
// Use of this source code is governed by the Apache License 2.0
|
||||
// that can be found in the COPYING file.
|
||||
|
||||
// This file is intentionally empty.
|
||||
// It's a workaround for https://github.com/golang/go/issues/15006
|
||||
26
Godeps/_workspace/src/github.com/aristanetworks/goarista/atime/nanotime.go
generated
vendored
Normal file
26
Godeps/_workspace/src/github.com/aristanetworks/goarista/atime/nanotime.go
generated
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
// Copyright (C) 2016 Arista Networks, Inc.
|
||||
// Use of this source code is governed by the Apache License 2.0
|
||||
// that can be found in the COPYING file.
|
||||
|
||||
// Package atime provides a fast monotonic clock source.
|
||||
package atime
|
||||
|
||||
import "unsafe"
|
||||
|
||||
// Make goimports import the unsafe package, which is required to be able
|
||||
// to use //go:linkname
|
||||
var _ = unsafe.Sizeof(0)
|
||||
|
||||
//go:noescape
|
||||
//go:linkname nanotime runtime.nanotime
|
||||
func nanotime() int64
|
||||
|
||||
// NanoTime returns the current time in nanoseconds from a monotonic clock.
|
||||
// The time returned is based on some arbitrary platform-specific point in the
|
||||
// past. The time returned is guaranteed to increase monotonically at a
|
||||
// constant rate, unlike time.Now() from the Go standard library, which may
|
||||
// slow down, speed up, jump forward or backward, due to NTP activity or leap
|
||||
// seconds.
|
||||
func NanoTime() uint64 {
|
||||
return uint64(nanotime())
|
||||
}
|
||||
22
Godeps/_workspace/src/github.com/aristanetworks/goarista/atime/nanotime_test.go
generated
vendored
Normal file
22
Godeps/_workspace/src/github.com/aristanetworks/goarista/atime/nanotime_test.go
generated
vendored
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
// Copyright (C) 2016 Arista Networks, Inc.
|
||||
// Use of this source code is governed by the Apache License 2.0
|
||||
// that can be found in the COPYING file.
|
||||
|
||||
// Package atime provides a fast monotonic clock source.
|
||||
package atime_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
. "github.com/aristanetworks/goarista/atime"
|
||||
)
|
||||
|
||||
func TestNanoTime(t *testing.T) {
|
||||
for i := 0; i < 100; i++ {
|
||||
t1 := NanoTime()
|
||||
t2 := NanoTime()
|
||||
if t1 >= t2 {
|
||||
t.Fatalf("t1=%d should have been strictly less than t2=%d", t1, t2)
|
||||
}
|
||||
}
|
||||
}
|
||||
30
common/mclock/mclock.go
Normal file
30
common/mclock/mclock.go
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
// Copyright 2016 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// package mclock is a wrapper for a monotonic clock source
|
||||
package mclock
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/aristanetworks/goarista/atime"
|
||||
)
|
||||
|
||||
type AbsTime time.Duration // absolute monotonic time
|
||||
|
||||
func Now() AbsTime {
|
||||
return AbsTime(atime.NanoTime())
|
||||
}
|
||||
|
|
@ -20,6 +20,8 @@ package flowcontrol
|
|||
import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/ethereum/go-ethereum/common/mclock"
|
||||
)
|
||||
|
||||
const fcTimeConst = 1000000
|
||||
|
|
@ -110,7 +112,7 @@ func NewServerNode(params *ServerParams) *ServerNode {
|
|||
}
|
||||
|
||||
func getTime() int64 {
|
||||
return time.Now().UnixNano()
|
||||
return int64(mclock.Now())
|
||||
}
|
||||
|
||||
func (peer *ServerNode) recalcBLE(time int64) {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import (
|
|||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/ethereum/go-ethereum/common/mclock"
|
||||
"github.com/ethereum/go-ethereum/ethdb"
|
||||
"github.com/ethereum/go-ethereum/light"
|
||||
"github.com/ethereum/go-ethereum/logger"
|
||||
|
|
@ -129,7 +130,7 @@ func (self *LesOdr) Deliver(peer *peer, msg *Msg) error {
|
|||
}
|
||||
|
||||
func (self *LesOdr) requestPeer(req *sentReq, peer *peer, delivered, timeout chan struct{}, reqWg *sync.WaitGroup) {
|
||||
stime := time.Now()
|
||||
stime := mclock.Now()
|
||||
defer func() {
|
||||
req.lock.Lock()
|
||||
delete(req.sentTo, peer)
|
||||
|
|
@ -139,7 +140,7 @@ func (self *LesOdr) requestPeer(req *sentReq, peer *peer, delivered, timeout cha
|
|||
|
||||
select {
|
||||
case <-delivered:
|
||||
servTime := uint64(time.Now().Sub(stime))
|
||||
servTime := uint64(mclock.Now()-stime)
|
||||
self.peers.updateTimeout(peer, false)
|
||||
self.peers.updateServTime(peer, servTime)
|
||||
return
|
||||
|
|
@ -154,7 +155,7 @@ func (self *LesOdr) requestPeer(req *sentReq, peer *peer, delivered, timeout cha
|
|||
|
||||
select {
|
||||
case <-delivered:
|
||||
servTime := uint64(time.Now().Sub(stime))
|
||||
servTime := uint64(mclock.Now()-stime)
|
||||
self.peers.updateServTime(peer, servTime)
|
||||
return
|
||||
case <-time.After(hardRequestTimeout):
|
||||
|
|
|
|||
Loading…
Reference in a new issue