Skip to content

Commit 1dab521

Browse files
committed
Merge pull request godotengine#92208 from Calinou/linuxbsd-use-nanosleep
Use `OS::delay_usec()` to avoid using deprecated `usleep()` on Linux
2 parents 62f134b + a008896 commit 1dab521

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

platform/linuxbsd/freedesktop_portal_desktop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ void FreeDesktopPortalDesktop::_thread_monitor(void *p_ud) {
591591
dbus_connection_read_write(portal->monitor_connection, 0);
592592
}
593593

594-
usleep(50000);
594+
OS::get_singleton()->delay_usec(50'000);
595595
}
596596
}
597597

platform/linuxbsd/joypad_linux.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ void JoypadLinux::monitor_joypads(udev *p_udev) {
225225
udev_device_unref(dev);
226226
}
227227
}
228-
usleep(50000);
228+
OS::get_singleton()->delay_usec(50'000);
229229
}
230230
udev_monitor_unref(mon);
231231
}
@@ -250,7 +250,7 @@ void JoypadLinux::monitor_joypads() {
250250
}
251251
}
252252
closedir(input_directory);
253-
usleep(1000000); // 1s
253+
OS::get_singleton()->delay_usec(1'000'000);
254254
}
255255
}
256256

@@ -508,7 +508,7 @@ void JoypadLinux::joypad_events_thread_run() {
508508
}
509509
}
510510
if (no_events) {
511-
usleep(10000); // 10ms
511+
OS::get_singleton()->delay_usec(10'000);
512512
}
513513
}
514514
}

platform/linuxbsd/x11/display_server_x11.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2269,7 +2269,7 @@ void DisplayServerX11::window_set_size(const Size2i p_size, WindowID p_window) {
22692269
break;
22702270
}
22712271

2272-
usleep(10000);
2272+
OS::get_singleton()->delay_usec(10'000);
22732273
}
22742274

22752275
// Keep rendering context window size in sync
@@ -2544,7 +2544,7 @@ void DisplayServerX11::_set_wm_maximized(WindowID p_window, bool p_enabled) {
25442544
// Give up after 0.5s, it's not going to happen on this WM.
25452545
// https://github.com/godotengine/godot/issues/19978
25462546
for (int attempt = 0; window_get_mode(p_window) != WINDOW_MODE_MAXIMIZED && attempt < 50; attempt++) {
2547-
usleep(10000);
2547+
OS::get_singleton()->delay_usec(10'000);
25482548
}
25492549
}
25502550
wd.maximized = p_enabled;

0 commit comments

Comments
 (0)