From b47285f1cf0cb475f29322ceb9fac4d7e1cfb11f Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@users.noreply.github.com>
Date: Wed, 3 Jan 2018 15:50:33 +0100
Subject: [PATCH] vendor: update github.com/rjeczalik/notify (#15801)
---
vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go | 7 +++++--
vendor/vendor.json | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go b/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go
index fb70de6af..2248a1b12 100644
--- a/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go
+++ b/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go
@@ -26,9 +26,9 @@ import "C"
import (
"errors"
"os"
+ "runtime"
"sync"
"sync/atomic"
- "time"
"unsafe"
)
@@ -63,6 +63,10 @@ var (
func init() {
wg.Add(1)
go func() {
+ // There is exactly one run loop per thread. Lock this goroutine to its
+ // thread to ensure that it's not rescheduled on a different thread while
+ // setting up the run loop.
+ runtime.LockOSThread()
runloop = C.CFRunLoopGetCurrent()
C.CFRunLoopAddSource(runloop, source, C.kCFRunLoopDefaultMode)
C.CFRunLoopRun()
@@ -73,7 +77,6 @@ func init() {
//export gosource
func gosource(unsafe.Pointer) {
- time.Sleep(time.Second)
wg.Done()
}
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 17844bd8d..979e8b34b 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -286,10 +286,10 @@
"revisionTime": "2016-11-28T21:05:44Z"
},
{
- "checksumSHA1": "tnQdt7bxmueZFl0EPrW9YrWiqGg=",
+ "checksumSHA1": "1ESHllhZOIBg7MnlGHUdhz047bI=",
"path": "github.com/rjeczalik/notify",
- "revision": "e1801ee34d54c4bf45126ef51fe9750b4e42bee8",
- "revisionTime": "2017-12-10T15:45:11Z"
+ "revision": "27b537f07230b3f917421af6dcf044038dbe57e2",
+ "revisionTime": "2018-01-03T13:19:05Z"
},
{
"checksumSHA1": "5uqO4ITTDMklKi3uNaE/D9LQ5nM=",
--
GitLab