linux: Move SDL_LinuxSetThreadPriority() elsewhere to fix build. Fixes Bugzilla #4393.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
diff --git a/configure b/configure
index 103297d..4f0ffbd 100755
--- a/configure
+++ b/configure
@@ -24182,6 +24182,7 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/core/linux/SDL_evdev*.c"
fi
# Set up other core UNIX files
+ SOURCES="$SOURCES $srcdir/src/core/linux/SDL_threadprio.c"
SOURCES="$SOURCES $srcdir/src/core/unix/*.c"
;;
*-*-cygwin* | *-*-mingw32*)
diff --git a/configure.in b/configure.in
index 8752e16..fbe0583 100644
--- a/configure.in
+++ b/configure.in
@@ -3553,6 +3553,7 @@ case "$host" in
SOURCES="$SOURCES $srcdir/src/core/linux/SDL_evdev*.c"
fi
# Set up other core UNIX files
+ SOURCES="$SOURCES $srcdir/src/core/linux/SDL_threadprio.c"
SOURCES="$SOURCES $srcdir/src/core/unix/*.c"
;;
*-*-cygwin* | *-*-mingw32*)
diff --git a/src/core/linux/SDL_dbus.c b/src/core/linux/SDL_dbus.c
index 072767f..e0d9972 100644
--- a/src/core/linux/SDL_dbus.c
+++ b/src/core/linux/SDL_dbus.c
@@ -21,13 +21,6 @@
#include "../../SDL_internal.h"
#include "SDL_dbus.h"
-#if !SDL_THREADS_DISABLED
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <pthread.h>
-#include "SDL_system.h"
-#endif
-
#if SDL_USE_LIBDBUS
/* we never link directly to libdbus. */
#include "SDL_loadso.h"
@@ -349,82 +342,6 @@ SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
return SDL_TRUE;
}
-
-#if !SDL_THREADS_DISABLED
-/* d-bus queries to org.freedesktop.RealtimeKit1. */
-#define RTKIT_DBUS_NODE "org.freedesktop.RealtimeKit1"
-#define RTKIT_DBUS_PATH "/org/freedesktop/RealtimeKit1"
-#define RTKIT_DBUS_INTERFACE "org.freedesktop.RealtimeKit1"
-
-static pthread_once_t rtkit_initialize_once = PTHREAD_ONCE_INIT;
-static Sint32 rtkit_min_nice_level = -20;
-
-static void
-rtkit_initialize()
-{
- SDL_DBusContext *dbus = SDL_DBus_GetContext();
-
- /* Try getting minimum nice level: this is often greater than PRIO_MIN (-20). */
- if (!dbus || !SDL_DBus_QueryPropertyOnConnection(dbus->system_conn, RTKIT_DBUS_NODE, RTKIT_DBUS_PATH, RTKIT_DBUS_INTERFACE, "MinNiceLevel",
- DBUS_TYPE_INT32, &rtkit_min_nice_level)) {
- rtkit_min_nice_level = -20;
- }
-}
-
-static SDL_bool
-rtkit_setpriority(pid_t thread, int nice_level)
-{
- Uint64 ui64 = (Uint64)thread;
- Sint32 si32 = (Sint32)nice_level;
- SDL_DBusContext *dbus = SDL_DBus_GetContext();
-
- pthread_once(&rtkit_initialize_once, rtkit_initialize);
-
- if (si32 < rtkit_min_nice_level)
- si32 = rtkit_min_nice_level;
-
- if (!dbus || !SDL_DBus_CallMethodOnConnection(dbus->system_conn,
- RTKIT_DBUS_NODE, RTKIT_DBUS_PATH, RTKIT_DBUS_INTERFACE, "MakeThreadHighPriority",
- DBUS_TYPE_UINT64, &ui64, DBUS_TYPE_INT32, &si32, DBUS_TYPE_INVALID,
- DBUS_TYPE_INVALID)) {
- return SDL_FALSE;
- }
- return SDL_TRUE;
-}
#endif
-#endif
-
-/* this is a public symbol, so it has to exist even if threads are disabled. */
-int
-SDL_LinuxSetThreadPriority(Sint64 threadID, int priority)
-{
-#if SDL_THREADS_DISABLED
- return SDL_Unsupported();
-#else
- if (setpriority(PRIO_PROCESS, (id_t)threadID, priority) == 0) {
- return 0;
- }
-
-#if SDL_USE_LIBDBUS
- /* Note that this fails if you're trying to set high priority
- and you don't have root permission. BUT DON'T RUN AS ROOT!
-
- You can grant the ability to increase thread priority by
- running the following command on your application binary:
- sudo setcap 'cap_sys_nice=eip' <application>
-
- Let's try setting priority with RealtimeKit...
-
- README and sample code at: http://git.0pointer.net/rtkit.git
- */
- if (rtkit_setpriority((pid_t)threadID, priority)) {
- return 0;
- }
-#endif
-
- return SDL_SetError("setpriority() failed");
-#endif
-}
-
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/pthread/SDL_systhread.c b/src/thread/pthread/SDL_systhread.c
index 1abff28..bf655ca 100644
--- a/src/thread/pthread/SDL_systhread.c
+++ b/src/thread/pthread/SDL_systhread.c
@@ -20,6 +20,7 @@
*/
#include "../../SDL_internal.h"
+#include "SDL_system.h"
#include <pthread.h>