Skip to content

Commit ce7841b

Browse files
authored
fix(device): reload manual devices without copying sync.Map (#241)
1 parent 12dab48 commit ce7841b

2 files changed

Lines changed: 29 additions & 1 deletion

File tree

‎internal/manager/device_manager.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,8 @@ func (dm *DeviceManager) loadManualDevicesFromDir(dir string) {
522522
previous.Store(k, v)
523523
return true
524524
})
525-
dm.manualDevices = sync.Map{}
525+
// Clear is safe with concurrent readers; replacing a used sync.Map is not.
526+
dm.manualDevices.Clear()
526527
matches, err := filepath.Glob(filepath.Join(dir, "*.json"))
527528
if err != nil {
528529
log.Err(err).Msg("Failed to list pairing files")

‎internal/manager/manual_device_test.go‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,33 @@ func TestLoadManualDevicesFromDir(t *testing.T) {
6060
}
6161
}
6262

63+
func TestLoadManualDevicesConcurrentReaders(t *testing.T) {
64+
dir := t.TempDir()
65+
writeJSON(t, dir, "AAA.json", `{"manual":true,"model":"iPhone14,4","name":"Phone","remotepairing_ip":"100.65.100.37","remotepairing_udid":"AAA"}`)
66+
67+
dm := newDeviceManager()
68+
dm.loadManualDevicesFromDir(dir)
69+
70+
var wg sync.WaitGroup
71+
wg.Add(2)
72+
go func() {
73+
defer wg.Done()
74+
for i := 0; i < 200; i++ {
75+
dm.loadManualDevicesFromDir(dir)
76+
}
77+
}()
78+
go func() {
79+
defer wg.Done()
80+
for i := 0; i < 200; i++ {
81+
_ = dm.GetDevices()
82+
}
83+
}()
84+
wg.Wait()
85+
if got := dm.GetDevices(); len(got) != 1 {
86+
t.Fatalf("want 1 manual device after reload, got %d", len(got))
87+
}
88+
}
89+
6390
func TestManualDeviceDedupedByDiscovered(t *testing.T) {
6491
dir := t.TempDir()
6592
writeJSON(t, dir, "AAA.json", `{"manual":true,"model":"iPhone14,4","name":"Phone","remotepairing_ip":"100.65.100.37","remotepairing_udid":"AAA"}`)

0 commit comments

Comments
 (0)
⌂ 换网址