From 8f6ba9efa6a522592662233459927894fd02d176 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Fri, 9 Sep 2016 20:40:01 -0700 Subject: [PATCH] Add missing godep. --- Godeps/Godeps.json | 21 +- .../github.com/pivotal-golang/clock/LICENSE | 202 ++++++++++++++++++ .../github.com/pivotal-golang/clock/README.md | 1 + .../github.com/pivotal-golang/clock/clock.go | 42 ++++ .../clock/fakeclock/fake_clock.go | 113 ++++++++++ .../clock/fakeclock/fake_ticker.go | 25 +++ .../clock/fakeclock/fake_timer.go | 79 +++++++ .../github.com/pivotal-golang/clock/ticker.go | 20 ++ .../github.com/pivotal-golang/clock/timer.go | 25 +++ 9 files changed, 522 insertions(+), 6 deletions(-) create mode 100644 vendor/github.com/pivotal-golang/clock/LICENSE create mode 100644 vendor/github.com/pivotal-golang/clock/README.md create mode 100644 vendor/github.com/pivotal-golang/clock/clock.go create mode 100644 vendor/github.com/pivotal-golang/clock/fakeclock/fake_clock.go create mode 100644 vendor/github.com/pivotal-golang/clock/fakeclock/fake_ticker.go create mode 100644 vendor/github.com/pivotal-golang/clock/fakeclock/fake_timer.go create mode 100644 vendor/github.com/pivotal-golang/clock/ticker.go create mode 100644 vendor/github.com/pivotal-golang/clock/timer.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 12140cde..76c85383 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,7 +1,7 @@ { "ImportPath": "k8s.io/node-problem-detector", "GoVersion": "go1.6", - "GodepVersion": "v71", + "GodepVersion": "v74", "Packages": [ "./..." ], @@ -127,27 +127,27 @@ }, { "ImportPath": "github.com/hpcloud/tail", - "Comment": "v1.0.0-35-ga30252c", + "Comment": "v1.0.0", "Rev": "a30252cb686a21eb2d0b98132633053ec2f7f1e5" }, { "ImportPath": "github.com/hpcloud/tail/ratelimiter", - "Comment": "v1.0.0-35-ga30252c", + "Comment": "v1.0.0", "Rev": "a30252cb686a21eb2d0b98132633053ec2f7f1e5" }, { "ImportPath": "github.com/hpcloud/tail/util", - "Comment": "v1.0.0-35-ga30252c", + "Comment": "v1.0.0", "Rev": "a30252cb686a21eb2d0b98132633053ec2f7f1e5" }, { "ImportPath": "github.com/hpcloud/tail/watch", - "Comment": "v1.0.0-35-ga30252c", + "Comment": "v1.0.0", "Rev": "a30252cb686a21eb2d0b98132633053ec2f7f1e5" }, { "ImportPath": "github.com/hpcloud/tail/winfile", - "Comment": "v1.0.0-35-ga30252c", + "Comment": "v1.0.0", "Rev": "a30252cb686a21eb2d0b98132633053ec2f7f1e5" }, { @@ -186,6 +186,14 @@ "ImportPath": "github.com/pborman/uuid", "Rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4" }, + { + "ImportPath": "github.com/pivotal-golang/clock", + "Rev": "3fd3c1944c59d9742e1cd333672181cd1a6f9fa0" + }, + { + "ImportPath": "github.com/pivotal-golang/clock/fakeclock", + "Rev": "3fd3c1944c59d9742e1cd333672181cd1a6f9fa0" + }, { "ImportPath": "github.com/pmezard/go-difflib/difflib", "Rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d" @@ -268,6 +276,7 @@ }, { "ImportPath": "gopkg.in/inf.v0", + "Comment": "v0.9.0", "Rev": "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" }, { diff --git a/vendor/github.com/pivotal-golang/clock/LICENSE b/vendor/github.com/pivotal-golang/clock/LICENSE new file mode 100644 index 00000000..e06d2081 --- /dev/null +++ b/vendor/github.com/pivotal-golang/clock/LICENSE @@ -0,0 +1,202 @@ +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 + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + 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 + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/vendor/github.com/pivotal-golang/clock/README.md b/vendor/github.com/pivotal-golang/clock/README.md new file mode 100644 index 00000000..9741b8b4 --- /dev/null +++ b/vendor/github.com/pivotal-golang/clock/README.md @@ -0,0 +1 @@ +Provides a `Clock` interface, useful for injecting time dependencies in tests. diff --git a/vendor/github.com/pivotal-golang/clock/clock.go b/vendor/github.com/pivotal-golang/clock/clock.go new file mode 100644 index 00000000..9c7322cd --- /dev/null +++ b/vendor/github.com/pivotal-golang/clock/clock.go @@ -0,0 +1,42 @@ +package clock + +import "time" + +type Clock interface { + Now() time.Time + Sleep(d time.Duration) + Since(t time.Time) time.Duration + + NewTimer(d time.Duration) Timer + NewTicker(d time.Duration) Ticker +} + +type realClock struct{} + +func NewClock() Clock { + return &realClock{} +} + +func (clock *realClock) Now() time.Time { + return time.Now() +} + +func (clock *realClock) Since(t time.Time) time.Duration { + return time.Now().Sub(t) +} + +func (clock *realClock) Sleep(d time.Duration) { + <-clock.NewTimer(d).C() +} + +func (clock *realClock) NewTimer(d time.Duration) Timer { + return &realTimer{ + t: time.NewTimer(d), + } +} + +func (clock *realClock) NewTicker(d time.Duration) Ticker { + return &realTicker{ + t: time.NewTicker(d), + } +} diff --git a/vendor/github.com/pivotal-golang/clock/fakeclock/fake_clock.go b/vendor/github.com/pivotal-golang/clock/fakeclock/fake_clock.go new file mode 100644 index 00000000..c3046d3f --- /dev/null +++ b/vendor/github.com/pivotal-golang/clock/fakeclock/fake_clock.go @@ -0,0 +1,113 @@ +package fakeclock + +import ( + "sync" + "time" + + "github.com/pivotal-golang/clock" +) + +type timeWatcher interface { + timeUpdated(time.Time) +} + +type FakeClock struct { + now time.Time + + watchers map[timeWatcher]struct{} + cond *sync.Cond +} + +func NewFakeClock(now time.Time) *FakeClock { + return &FakeClock{ + now: now, + watchers: make(map[timeWatcher]struct{}), + cond: &sync.Cond{L: &sync.Mutex{}}, + } +} + +func (clock *FakeClock) Since(t time.Time) time.Duration { + return clock.Now().Sub(t) +} + +func (clock *FakeClock) Now() time.Time { + clock.cond.L.Lock() + defer clock.cond.L.Unlock() + + return clock.now +} + +func (clock *FakeClock) Increment(duration time.Duration) { + clock.increment(duration, false) +} + +func (clock *FakeClock) IncrementBySeconds(seconds uint64) { + clock.Increment(time.Duration(seconds) * time.Second) +} + +func (clock *FakeClock) WaitForWatcherAndIncrement(duration time.Duration) { + clock.increment(duration, true) +} + +func (clock *FakeClock) NewTimer(d time.Duration) clock.Timer { + timer := newFakeTimer(clock, d, false) + clock.addTimeWatcher(timer) + + return timer +} + +func (clock *FakeClock) Sleep(d time.Duration) { + <-clock.NewTimer(d).C() +} + +func (clock *FakeClock) NewTicker(d time.Duration) clock.Ticker { + timer := newFakeTimer(clock, d, true) + clock.addTimeWatcher(timer) + + return newFakeTicker(timer) +} + +func (clock *FakeClock) WatcherCount() int { + clock.cond.L.Lock() + defer clock.cond.L.Unlock() + + return len(clock.watchers) +} + +func (clock *FakeClock) increment(duration time.Duration, waitForWatchers bool) { + clock.cond.L.Lock() + + for waitForWatchers && len(clock.watchers) == 0 { + clock.cond.Wait() + } + + now := clock.now.Add(duration) + clock.now = now + + watchers := make([]timeWatcher, 0, len(clock.watchers)) + for w, _ := range clock.watchers { + watchers = append(watchers, w) + } + + clock.cond.L.Unlock() + + for _, w := range watchers { + w.timeUpdated(now) + } +} + +func (clock *FakeClock) addTimeWatcher(tw timeWatcher) { + clock.cond.L.Lock() + clock.watchers[tw] = struct{}{} + clock.cond.L.Unlock() + + tw.timeUpdated(clock.Now()) + + clock.cond.Broadcast() +} + +func (clock *FakeClock) removeTimeWatcher(tw timeWatcher) { + clock.cond.L.Lock() + delete(clock.watchers, tw) + clock.cond.L.Unlock() +} diff --git a/vendor/github.com/pivotal-golang/clock/fakeclock/fake_ticker.go b/vendor/github.com/pivotal-golang/clock/fakeclock/fake_ticker.go new file mode 100644 index 00000000..5339f5f1 --- /dev/null +++ b/vendor/github.com/pivotal-golang/clock/fakeclock/fake_ticker.go @@ -0,0 +1,25 @@ +package fakeclock + +import ( + "time" + + "github.com/pivotal-golang/clock" +) + +type fakeTicker struct { + timer clock.Timer +} + +func newFakeTicker(timer *fakeTimer) *fakeTicker { + return &fakeTicker{ + timer: timer, + } +} + +func (ft *fakeTicker) C() <-chan time.Time { + return ft.timer.C() +} + +func (ft *fakeTicker) Stop() { + ft.timer.Stop() +} diff --git a/vendor/github.com/pivotal-golang/clock/fakeclock/fake_timer.go b/vendor/github.com/pivotal-golang/clock/fakeclock/fake_timer.go new file mode 100644 index 00000000..b47acf4e --- /dev/null +++ b/vendor/github.com/pivotal-golang/clock/fakeclock/fake_timer.go @@ -0,0 +1,79 @@ +package fakeclock + +import ( + "sync" + "time" +) + +type fakeTimer struct { + clock *FakeClock + + mutex sync.Mutex + completionTime time.Time + channel chan time.Time + duration time.Duration + repeat bool +} + +func newFakeTimer(clock *FakeClock, d time.Duration, repeat bool) *fakeTimer { + return &fakeTimer{ + clock: clock, + completionTime: clock.Now().Add(d), + channel: make(chan time.Time, 1), + duration: d, + repeat: repeat, + } +} + +func (ft *fakeTimer) C() <-chan time.Time { + ft.mutex.Lock() + defer ft.mutex.Unlock() + return ft.channel +} + +func (ft *fakeTimer) Reset(d time.Duration) bool { + currentTime := ft.clock.Now() + + ft.mutex.Lock() + active := !ft.completionTime.IsZero() + ft.completionTime = currentTime.Add(d) + ft.mutex.Unlock() + + ft.clock.addTimeWatcher(ft) + + return active +} + +func (ft *fakeTimer) Stop() bool { + ft.mutex.Lock() + active := !ft.completionTime.IsZero() + ft.completionTime = time.Time{} + ft.mutex.Unlock() + + ft.clock.removeTimeWatcher(ft) + + return active +} + +func (ft *fakeTimer) timeUpdated(now time.Time) { + var fire bool + + ft.mutex.Lock() + if !ft.completionTime.IsZero() { + fire = now.After(ft.completionTime) || now.Equal(ft.completionTime) + } + ft.mutex.Unlock() + + if fire { + select { + case ft.channel <- now: + ft.Stop() + + default: + } + + if ft.repeat { + ft.Reset(ft.duration) + } + } +} diff --git a/vendor/github.com/pivotal-golang/clock/ticker.go b/vendor/github.com/pivotal-golang/clock/ticker.go new file mode 100644 index 00000000..f25129e1 --- /dev/null +++ b/vendor/github.com/pivotal-golang/clock/ticker.go @@ -0,0 +1,20 @@ +package clock + +import "time" + +type Ticker interface { + C() <-chan time.Time + Stop() +} + +type realTicker struct { + t *time.Ticker +} + +func (t *realTicker) C() <-chan time.Time { + return t.t.C +} + +func (t *realTicker) Stop() { + t.t.Stop() +} diff --git a/vendor/github.com/pivotal-golang/clock/timer.go b/vendor/github.com/pivotal-golang/clock/timer.go new file mode 100644 index 00000000..cf8c2212 --- /dev/null +++ b/vendor/github.com/pivotal-golang/clock/timer.go @@ -0,0 +1,25 @@ +package clock + +import "time" + +type Timer interface { + C() <-chan time.Time + Reset(d time.Duration) bool + Stop() bool +} + +type realTimer struct { + t *time.Timer +} + +func (t *realTimer) C() <-chan time.Time { + return t.t.C +} + +func (t *realTimer) Reset(d time.Duration) bool { + return t.t.Reset(d) +} + +func (t *realTimer) Stop() bool { + return t.t.Stop() +}