Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: update logging for kbdAutoReleaseLock

This commit is contained in:
Siyuan Miao 2025-09-12 10:41:23 +02:00
parent bc94ae5856
commit 8d03792479
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/usbgadget/hid_keyboard.go
View File

@ -179,8 +179,9 @@ func (u *UsbGadget) SetOnKeysDownChange(f func(state KeysDownState)) {
} }
func (u *UsbGadget) scheduleAutoRelease(key byte) { func (u *UsbGadget) scheduleAutoRelease(key byte) {
u.log.Trace().Msg("scheduling autoRelease")
u.kbdAutoReleaseLock.Lock() u.kbdAutoReleaseLock.Lock()
defer u.kbdAutoReleaseLock.Unlock() defer unlockWithLog(&u.kbdAutoReleaseLock, u.log, "autoRelease scheduled")
if u.kbdAutoReleaseTimer != nil { if u.kbdAutoReleaseTimer != nil {
u.kbdAutoReleaseTimer.Stop() u.kbdAutoReleaseTimer.Stop()
@ -192,8 +193,9 @@ func (u *UsbGadget) scheduleAutoRelease(key byte) {
} }
func (u *UsbGadget) cancelAutoRelease() { func (u *UsbGadget) cancelAutoRelease() {
u.log.Trace().Msg("cancelling autoRelease")
u.kbdAutoReleaseLock.Lock() u.kbdAutoReleaseLock.Lock()
defer u.kbdAutoReleaseLock.Unlock() defer unlockWithLog(&u.kbdAutoReleaseLock, u.log, "autoRelease cancelled")
if u.kbdAutoReleaseTimer != nil { if u.kbdAutoReleaseTimer != nil {
u.kbdAutoReleaseTimer.Stop() u.kbdAutoReleaseTimer.Stop()
@ -201,10 +203,9 @@ func (u *UsbGadget) cancelAutoRelease() {
} }
func (u *UsbGadget) DelayAutoRelease() { func (u *UsbGadget) DelayAutoRelease() {
u.log.Trace().Msg("delaying autoRelease")
u.kbdAutoReleaseLock.Lock() u.kbdAutoReleaseLock.Lock()
defer u.kbdAutoReleaseLock.Unlock() defer unlockWithLog(&u.kbdAutoReleaseLock, u.log, "autoRelease delayed")
u.log.Trace().Msg("delaying auto-release")
if u.kbdAutoReleaseTimer == nil { if u.kbdAutoReleaseTimer == nil {
return return
@ -216,8 +217,9 @@ func (u *UsbGadget) DelayAutoRelease() {
} }
func (u *UsbGadget) performAutoRelease(key byte) { func (u *UsbGadget) performAutoRelease(key byte) {
u.log.Trace().Msg("performing autoRelease")
u.kbdAutoReleaseLock.Lock() u.kbdAutoReleaseLock.Lock()
defer u.kbdAutoReleaseLock.Unlock() defer unlockWithLog(&u.kbdAutoReleaseLock, u.log, "autoRelease performed")
select { select {
case <-u.keyboardStateCtx.Done(): case <-u.keyboardStateCtx.Done():
@ -464,9 +466,10 @@ func (u *UsbGadget) keypressReport(key byte, press bool, autoRelease bool) (Keys
if press { if press {
{ {
u.log.Trace().Msg("acquiring kbdAutoReleaseLock to update last key")
u.kbdAutoReleaseLock.Lock() u.kbdAutoReleaseLock.Lock()
u.kbdAutoReleaseLastKey = key u.kbdAutoReleaseLastKey = key
u.kbdAutoReleaseLock.Unlock() unlockWithLog(&u.kbdAutoReleaseLock, u.log, "last key updated")
} }
if autoRelease { if autoRelease {

6
internal/usbgadget/utils.go
View File

@ -9,6 +9,7 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"sync"
"time" "time"
"github.com/rs/zerolog" "github.com/rs/zerolog"
@ -164,3 +165,8 @@ func (u *UsbGadget) resetLogSuppressionCounter(counterName string) {
u.logSuppressionCounter[counterName] = 0 u.logSuppressionCounter[counterName] = 0
} }
} }
func unlockWithLog(lock *sync.Mutex, logger *zerolog.Logger, msg string, args ...any) {
logger.Trace().Msgf(msg, args...)
lock.Unlock()
}