|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
diff -rupN jack-1.9.9.5.old/common/JackControlAPI.cpp jack-1.9.9.5/common/JackControlAPI.cpp
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
--- jack-1.9.9.5.old/common/JackControlAPI.cpp 2012-12-10 04:26:56.000000000 -0500
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+++ jack-1.9.9.5/common/JackControlAPI.cpp 2012-12-15 21:40:01.639927082 -0500
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
@@ -32,6 +32,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
#include <stdio.h>
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
#include <assert.h>
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
#include <signal.h>
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+#include <sys/utsname.h>
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
#include "jslist.h"
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
#include "driver_interface.h"
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
@@ -756,7 +757,14 @@ SERVER_EXPORT jackctl_server_t * jackctl
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
goto fail_free_parameters;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
}
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
- value.i = 10;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ struct utsname utsname;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ int success;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ success = uname( &utsname );
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ if( success == 0 && strstr( utsname.version, "PREEMPT RT" ) )
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ value.i = 60;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ else
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ value.i = 20;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
if (jackctl_add_parameter(
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
&server_ptr->parameters,
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
"realtime-priority",
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
diff -rupN jack-1.9.9.5.old/common/JackServerGlobals.cpp jack-1.9.9.5/common/JackServerGlobals.cpp
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
--- jack-1.9.9.5.old/common/JackServerGlobals.cpp 2012-12-10 04:26:56.000000000 -0500
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+++ jack-1.9.9.5/common/JackServerGlobals.cpp 2012-12-15 21:45:43.793194190 -0500
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
@@ -23,6 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
#include "shm.h"
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
#include <getopt.h>
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
#include <errno.h>
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+#include <sys/utsname.h>
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
static char* server_name = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
@@ -96,9 +97,18 @@ void JackServerGlobals::Delete()
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
bool JackServerGlobals::Init()
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
{
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ struct utsname utsname;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ int success;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ success = uname( &utsname );
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
int realtime = 0;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
int client_timeout = 0; /* msecs; if zero, use period size. */
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
- int realtime_priority = 10;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ int realtime_priority;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ if( success == 0 && strstr( utsname.version, "PREEMPT RT" ) )
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ realtime_priority = 60;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ else
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+ realtime_priority = 20;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
+
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
int verbose_aux = 0;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
387a56d |
unsigned int port_max = 128;
|
|
![](https://seccdn.libravatar.org/avatar/10a9a25f164d0b1c4546a95e8da3127cb5f34a7e3a71006bcc45eb1e03952401?s=16&d=retro) |
b10034a |
int temporary = 0;
|