Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use OS::delay_usec() to avoid using deprecated usleep() on Linux #92208

Merged
merged 1 commit into from
May 30, 2024
Merged

Use OS::delay_usec() to avoid using deprecated usleep() on Linux #92208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/linuxbsd/freedesktop_portal_desktop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ void FreeDesktopPortalDesktop::_thread_monitor(void *p_ud) {
dbus_connection_read_write(portal->monitor_connection, 0);
}

usleep(50000);
OS::get_singleton()->delay_usec(50'000);
}
}

Expand Down
6 changes: 3 additions & 3 deletions platform/linuxbsd/joypad_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ void JoypadLinux::monitor_joypads(udev *p_udev) {
udev_device_unref(dev);
}
}
usleep(50000);
OS::get_singleton()->delay_usec(50'000);
}
udev_monitor_unref(mon);
}
Expand All @@ -250,7 +250,7 @@ void JoypadLinux::monitor_joypads() {
}
}
closedir(input_directory);
usleep(1000000); // 1s
OS::get_singleton()->delay_usec(1'000'000);
}
}

Expand Down Expand Up @@ -508,7 +508,7 @@ void JoypadLinux::joypad_events_thread_run() {
}
}
if (no_events) {
usleep(10000); // 10ms
OS::get_singleton()->delay_usec(10'000);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions platform/linuxbsd/x11/display_server_x11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,7 @@ void DisplayServerX11::window_set_size(const Size2i p_size, WindowID p_window) {
break;
}

usleep(10000);
OS::get_singleton()->delay_usec(10'000);
}

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