Browse Source

fix problem with uncleared port->buffer_info value

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@148 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
pbd 24 years ago
parent
commit
f7275a6c4b
2 changed files with 7 additions and 4 deletions
  1. +1
    -1
      configure.in
  2. +6
    -3
      engine.c

+ 1
- 1
configure.in View File

@@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.)

JACK_MAJOR_VERSION=0
JACK_MINOR_VERSION=20
JACK_MICRO_VERSION=1
JACK_MICRO_VERSION=2

BETA=



+ 6
- 3
engine.c View File

@@ -2352,6 +2352,7 @@ jack_port_release (jack_engine_t *engine, jack_port_internal_t *port)
if (port->buffer_info) {
pthread_mutex_lock (&engine->buffer_lock);
engine->port_buffer_freelist = g_slist_prepend (engine->port_buffer_freelist, port->buffer_info);
port->buffer_info = NULL;
pthread_mutex_unlock (&engine->buffer_lock);
}
pthread_mutex_unlock (&engine->port_lock);
@@ -2538,14 +2539,16 @@ jack_port_assign_buffer (jack_engine_t *engine, jack_port_internal_t *port)
}

if (engine->verbose) {
fprintf (stderr, "port %s assigned buffer in shm key 0x%x at offset %d\n",
fprintf (stderr, "port %s buf shm key 0x%x at offset %d bi = %p\n",
port->shared->name,
port->shared->shm_key,
port->shared->offset);
port->shared->offset,
port->buffer_info);
}
if (port->shared->shm_key >= 0) {
engine->port_buffer_freelist = g_slist_remove (engine->port_buffer_freelist, bi);
} else {
jack_error ("port segment info for 0x%x:%d not found!", bi->shm_key, bi->offset);
}


Loading…
Cancel
Save