From 0d4ad7709a7b820598b5ce76a6715e9cf2ff7a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Wed, 3 Jan 2018 12:44:53 +0200 Subject: [PATCH] vendor: try macos fs notify runloop fix from @fjl --- vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go | 5 +++++ vendor/vendor.json | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go b/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go index fb70de6af0..28ba7d0e2a 100644 --- a/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go +++ b/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go @@ -26,6 +26,7 @@ import "C" import ( "errors" "os" + "runtime" "sync" "sync/atomic" "time" @@ -63,6 +64,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() diff --git a/vendor/vendor.json b/vendor/vendor.json index 17844bd8dd..dacced6570 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -286,10 +286,10 @@ "revisionTime": "2016-11-28T21:05:44Z" }, { - "checksumSHA1": "tnQdt7bxmueZFl0EPrW9YrWiqGg=", + "checksumSHA1": "lhq+IT6eusmK2Ortmhen0qT3wJM=", "path": "github.com/rjeczalik/notify", - "revision": "e1801ee34d54c4bf45126ef51fe9750b4e42bee8", - "revisionTime": "2017-12-10T15:45:11Z" + "revision": "b76ef5c8085eae5170c0b1e3abbd94e41e086bfb", + "revisionTime": "2018-01-03T10:29:26Z" }, { "checksumSHA1": "5uqO4ITTDMklKi3uNaE/D9LQ5nM=",