Browse Source

Four patches from Jacob Meuser for OpenBSD

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@1126 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.115.6
sletz 18 years ago
parent
commit
95817bcb88
4 changed files with 17 additions and 2 deletions
  1. +1
    -1
      configure.ac
  2. +8
    -1
      jackd/engine.c
  3. +4
    -0
      libjack/midiport.c
  4. +4
    -0
      libjack/thread.c

+ 1
- 1
configure.ac View File

@@ -88,7 +88,7 @@ case "${host_os}" in
# barrier code, this may be fixed in 5.3, stay tuned.
USE_BARRIER="no"
;;
opebsd*)
openbsd*)
# pthread_barrier* not implemented
USE_BARRIER="no"
# need small realtime stack


+ 8
- 1
jackd/engine.c View File

@@ -936,7 +936,11 @@ static int
jack_start_watchdog (jack_engine_t *engine)
{
int watchdog_priority = engine->rtpriority + 10;
#ifndef __OpenBSD__
int max_priority = sched_get_priority_max (SCHED_FIFO);
#else
int max_priority = -1;
#endif

if ((max_priority != -1) &&
(max_priority < watchdog_priority))
@@ -1464,7 +1468,8 @@ jack_server_thread (void *arg)
(engine, pfd[i].fd)) {
jack_error ("could not handle external"
" client request");
#ifdef JACK_USE_MACH_THREADS
// #ifdef JACK_USE_MACH_THREADS
#if 1
/* poll is implemented using
select (see the macosx/fakepoll
code). When the socket is closed
@@ -2385,6 +2390,8 @@ jack_deliver_event (jack_engine_t *engine, jack_client_internal_t *client,
strerror (errno));
client->error++;
}

DEBUG ("engine reading from event fd DONE");
if (status != 0) {
jack_error ("bad status for client event "


+ 4
- 0
libjack/midiport.c View File

@@ -78,7 +78,11 @@ jack_midi_event_get(jack_midi_event_t *event,
(jack_midi_port_info_private_t *) port_buffer;
if (event_idx >= info->event_count)
#ifdef ENODATA
return ENODATA;
#else
return ENOMSG;
#endif
port_event = (jack_midi_port_internal_event_t *) (info + 1);
port_event += event_idx;


+ 4
- 0
libjack/thread.c View File

@@ -152,7 +152,11 @@ jack_client_create_thread (jack_client_t* client,
log_result("requesting joinable thread creation", result);
return result;
}
#ifdef __OpenBSD__
result = pthread_attr_setscope(&attr, PTHREAD_SCOPE_PROCESS);
#else
result = pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
#endif
if (result) {
log_result("requesting system scheduling scope", result);
return result;


Loading…
Cancel
Save