From 5964077168f4edbc4952df6f1c83da061223e1b3 Mon Sep 17 00:00:00 2001 From: Marc Brooks Date: Tue, 18 Nov 2025 18:21:10 -0600 Subject: [PATCH] Switch to traceable sync for most everything --- cloud.go | 11 +++++------ config.go | 3 ++- display.go | 3 ++- failsafe.go | 3 ++- hw.go | 3 ++- internal/mdns/mdns.go | 3 ++- internal/native/native.go | 3 ++- internal/native/single.go | 2 +- internal/timesync/timesync.go | 3 ++- internal/usbgadget/hid_keyboard.go | 3 ++- internal/usbgadget/usbgadget.go | 3 ++- internal/usbgadget/utils.go | 3 ++- internal/websecure/store.go | 3 ++- native.go | 5 +++-- usb_mass_storage.go | 6 +++--- web_tls.go | 2 +- webrtc.go | 9 +++++---- 17 files changed, 40 insertions(+), 28 deletions(-) diff --git a/cloud.go b/cloud.go index dbbd3bbc..3474b9a6 100644 --- a/cloud.go +++ b/cloud.go @@ -8,18 +8,17 @@ import ( "fmt" "net/http" "net/url" - "sync" "time" + "github.com/jetkvm/kvm/internal/sync" + + "github.com/coder/websocket" "github.com/coder/websocket/wsjson" + "github.com/coreos/go-oidc/v3/oidc" + "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - - "github.com/coreos/go-oidc/v3/oidc" - - "github.com/coder/websocket" - "github.com/gin-gonic/gin" "github.com/rs/zerolog" ) diff --git a/config.go b/config.go index 5a3e7dc8..fdb4508c 100644 --- a/config.go +++ b/config.go @@ -5,12 +5,13 @@ import ( "fmt" "os" "strconv" - "sync" "github.com/jetkvm/kvm/internal/confparser" "github.com/jetkvm/kvm/internal/logging" "github.com/jetkvm/kvm/internal/network/types" + "github.com/jetkvm/kvm/internal/sync" "github.com/jetkvm/kvm/internal/usbgadget" + "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/display.go b/display.go index 68723b59..bfb6751f 100644 --- a/display.go +++ b/display.go @@ -7,9 +7,10 @@ import ( "os" "strconv" "strings" - "sync" "time" + "github.com/jetkvm/kvm/internal/sync" + "github.com/prometheus/common/version" ) diff --git a/failsafe.go b/failsafe.go index 3c6b3d3a..ee56a494 100644 --- a/failsafe.go +++ b/failsafe.go @@ -4,7 +4,8 @@ import ( "fmt" "os" "strings" - "sync" + + "github.com/jetkvm/kvm/internal/sync" ) const ( diff --git a/hw.go b/hw.go index 7797adc1..37a19b5c 100644 --- a/hw.go +++ b/hw.go @@ -6,8 +6,9 @@ import ( "os/exec" "regexp" "strings" - "sync" "time" + + "github.com/jetkvm/kvm/internal/sync" ) func extractSerialNumber() (string, error) { diff --git a/internal/mdns/mdns.go b/internal/mdns/mdns.go index 2b954d45..bf2949e4 100644 --- a/internal/mdns/mdns.go +++ b/internal/mdns/mdns.go @@ -5,9 +5,10 @@ import ( "net" "reflect" "strings" - "sync" "github.com/jetkvm/kvm/internal/logging" + "github.com/jetkvm/kvm/internal/sync" + pion_mdns "github.com/pion/mdns/v2" "github.com/rs/zerolog" "golang.org/x/net/ipv4" diff --git a/internal/native/native.go b/internal/native/native.go index cb8761cf..792ee747 100644 --- a/internal/native/native.go +++ b/internal/native/native.go @@ -1,9 +1,10 @@ package native import ( - "sync" "time" + "github.com/jetkvm/kvm/internal/sync" + "github.com/Masterminds/semver/v3" "github.com/rs/zerolog" ) diff --git a/internal/native/single.go b/internal/native/single.go index 0782b28c..240a348e 100644 --- a/internal/native/single.go +++ b/internal/native/single.go @@ -1,6 +1,6 @@ package native -import "sync" +import "github.com/jetkvm/kvm/internal/sync" var ( instance *Native diff --git a/internal/timesync/timesync.go b/internal/timesync/timesync.go index 97cee97d..088f5359 100644 --- a/internal/timesync/timesync.go +++ b/internal/timesync/timesync.go @@ -4,10 +4,11 @@ import ( "fmt" "os" "os/exec" - "sync" "time" "github.com/jetkvm/kvm/internal/network/types" + "github.com/jetkvm/kvm/internal/sync" + "github.com/rs/zerolog" ) diff --git a/internal/usbgadget/hid_keyboard.go b/internal/usbgadget/hid_keyboard.go index 74cf76f9..f50baf5b 100644 --- a/internal/usbgadget/hid_keyboard.go +++ b/internal/usbgadget/hid_keyboard.go @@ -5,9 +5,10 @@ import ( "context" "fmt" "os" - "sync" "time" + "github.com/jetkvm/kvm/internal/sync" + "github.com/rs/xid" "github.com/rs/zerolog" ) diff --git a/internal/usbgadget/usbgadget.go b/internal/usbgadget/usbgadget.go index f01ae09d..e9d352c0 100644 --- a/internal/usbgadget/usbgadget.go +++ b/internal/usbgadget/usbgadget.go @@ -6,10 +6,11 @@ import ( "context" "os" "path" - "sync" "time" "github.com/jetkvm/kvm/internal/logging" + "github.com/jetkvm/kvm/internal/sync" + "github.com/rs/zerolog" ) diff --git a/internal/usbgadget/utils.go b/internal/usbgadget/utils.go index 85bf1579..7ec32a23 100644 --- a/internal/usbgadget/utils.go +++ b/internal/usbgadget/utils.go @@ -9,9 +9,10 @@ import ( "path/filepath" "strconv" "strings" - "sync" "time" + "github.com/jetkvm/kvm/internal/sync" + "github.com/rs/zerolog" ) diff --git a/internal/websecure/store.go b/internal/websecure/store.go index ea7911c4..aed051ca 100644 --- a/internal/websecure/store.go +++ b/internal/websecure/store.go @@ -6,7 +6,8 @@ import ( "os" "path" "strings" - "sync" + + "github.com/jetkvm/kvm/internal/sync" "github.com/rs/zerolog" ) diff --git a/native.go b/native.go index 81a0e50d..d2390265 100644 --- a/native.go +++ b/native.go @@ -2,11 +2,12 @@ package kvm import ( "os" - "sync" "time" - "github.com/Masterminds/semver/v3" "github.com/jetkvm/kvm/internal/native" + "github.com/jetkvm/kvm/internal/sync" + + "github.com/Masterminds/semver/v3" "github.com/pion/webrtc/v4/pkg/media" ) diff --git a/usb_mass_storage.go b/usb_mass_storage.go index 0f1f4b93..5f444deb 100644 --- a/usb_mass_storage.go +++ b/usb_mass_storage.go @@ -10,16 +10,16 @@ import ( "path" "path/filepath" "strings" - "sync" "syscall" "time" + "github.com/jetkvm/kvm/internal/sync" + "github.com/jetkvm/kvm/resource" + "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/pion/webrtc/v4" "github.com/psanford/httpreadat" - - "github.com/jetkvm/kvm/resource" ) func writeFile(path string, data string) error { diff --git a/web_tls.go b/web_tls.go index 41f532ea..913302d9 100644 --- a/web_tls.go +++ b/web_tls.go @@ -7,8 +7,8 @@ import ( "errors" "fmt" "net/http" - "sync" + "github.com/jetkvm/kvm/internal/sync" "github.com/jetkvm/kvm/internal/websecure" ) diff --git a/webrtc.go b/webrtc.go index 46fca2b8..6b7d1391 100644 --- a/webrtc.go +++ b/webrtc.go @@ -6,15 +6,16 @@ import ( "encoding/json" "net" "strings" - "sync" "time" + "github.com/jetkvm/kvm/internal/hidrpc" + "github.com/jetkvm/kvm/internal/logging" + "github.com/jetkvm/kvm/internal/sync" + "github.com/jetkvm/kvm/internal/usbgadget" + "github.com/coder/websocket" "github.com/coder/websocket/wsjson" "github.com/gin-gonic/gin" - "github.com/jetkvm/kvm/internal/hidrpc" - "github.com/jetkvm/kvm/internal/logging" - "github.com/jetkvm/kvm/internal/usbgadget" "github.com/pion/webrtc/v4" "github.com/rs/zerolog" )