jackaudio
/
jack1
mirror of https://github.com/jackaudio/jack1
1
0
Fork 0
Code Releases 19 Activity
Browse Source

many changes to the internals 

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@144 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
pbd 24 years ago
parent
598b6c4634
commit
46b6a573fa
7 changed files with 313 additions and 268 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +8
    -1
      alsa_driver.c
  2. +3
    -21
      client.c
  3. +1
    -1
      configure.in
  4. +278
    -225
      engine.c
  5. +10
    -8
      jack/engine.h
  6. +1
    -2
      jack/internal.h
  7. +12
    -10
      jack/port.h

+ 8
- 1
alsa_driver.c View File

@@ -575,9 +575,16 @@ alsa_driver_audio_start (alsa_driver_t *driver)
if (alsa_driver_get_channel_addresses (driver, 0, &pavail, 0, &poffset)) { if (alsa_driver_get_channel_addresses (driver, 0, &pavail, 0, &poffset)) {
return -1; return -1;
} }

/* XXX this is cheating. ALSA offers no guarantee that we can access
the entire buffer at any one time. It works on most hardware
tested so far, however, buts its a liability in the long run. I think
that alsa-lib may have a better function for doing this here, where
the goal is to silence the entire buffer.
*/
for (chn = 0; chn < driver->playback_nchannels; chn++) { for (chn = 0; chn < driver->playback_nchannels; chn++) {
alsa_driver_silence_on_channel (driver, chn, driver->buffer_frames);
alsa_driver_silence_on_channel (driver, chn, driver->buffer_frames);
} }
snd_pcm_mmap_commit (driver->playback_handle, poffset, driver->buffer_frames); snd_pcm_mmap_commit (driver->playback_handle, poffset, driver->buffer_frames);


+ 3
- 21
client.c View File

@@ -525,7 +525,7 @@ jack_client_thread (void *arg)
} }


if (client->pollfd[0].revents & POLLIN) { if (client->pollfd[0].revents & POLLIN) {
/* server has sent us an event. process the event and reply */ /* server has sent us an event. process the event and reply */


if (read (client->event_fd, &event, sizeof (event)) != sizeof (event)) { if (read (client->event_fd, &event, sizeof (event)) != sizeof (event)) {
@@ -1407,8 +1407,6 @@ jack_port_request_monitor (jack_port_t *port, int onoff)
int int
jack_ensure_port_monitor_input (jack_port_t *port, int yn) jack_ensure_port_monitor_input (jack_port_t *port, int yn)
{ {
printf ("ENSURE PORT monitor, req = %d, status = %d\n", yn, port->shared->monitor_requests);
if (yn) { if (yn) {
if (port->shared->monitor_requests == 0) { if (port->shared->monitor_requests == 0) {
port->shared->monitor_requests++; port->shared->monitor_requests++;
@@ -1739,23 +1737,7 @@ jack_set_transport_info (jack_client_t *client,
} }


nframes_t nframes_t
jack_port_get_total_latency (jack_client_t *client,
jack_port_t *port)
jack_port_get_total_latency (jack_client_t *client, jack_port_t *port)
{ {
jack_request_t req;

req.type = GetPortTotalLatency;
strcpy (req.x.port_info.name, port->shared->name);
if (write (client->request_fd, &req, sizeof (req)) != sizeof (req)) {
jack_error ("cannot send port total latency request to server");
return 0;
}

if (read (client->request_fd, &req, sizeof (req)) != sizeof (req)) {
jack_error ("cannot read port total latency result from server (%s)", strerror (errno));
return 0;
}
return req.x.nframes;
return port->shared->total_latency;
} }

+ 1
- 1
configure.in View File

@@ -4,7 +4,7 @@ AC_INIT(client.c)
AC_CONFIG_AUX_DIR(.) AC_CONFIG_AUX_DIR(.)


JACK_MAJOR_VERSION=0 JACK_MAJOR_VERSION=0
JACK_MINOR_VERSION=18
JACK_MINOR_VERSION=19
JACK_MICRO_VERSION=0 JACK_MICRO_VERSION=0


BETA= BETA=


+ 278
- 225
engine.c View File

@@ -59,14 +59,15 @@ typedef struct _jack_client_internal {
int event_fd; int event_fd;
int subgraph_start_fd; int subgraph_start_fd;
int subgraph_wait_fd; int subgraph_wait_fd;
GSList *ports; /* protected by engine->graph_lock */
GSList *fed_by; /* protected by engine->graph_lock */
GSList *ports; /* protected by engine->client_lock */
GSList *fed_by; /* protected by engine->client_lock */
int shm_id; int shm_id;
int shm_key; int shm_key;
unsigned long execution_order; unsigned long execution_order;
struct _jack_client_internal *next_client; /* not a linked list! */ struct _jack_client_internal *next_client; /* not a linked list! */
dlhandle handle; dlhandle handle;
int error;

} jack_client_internal_t; } jack_client_internal_t;


static int jack_port_assign_buffer (jack_engine_t *, jack_port_internal_t *); static int jack_port_assign_buffer (jack_engine_t *, jack_port_internal_t *);
@@ -98,22 +99,38 @@ static void jack_port_registration_notify (jack_engine_t *, jack_port_id_t, int)
static int jack_send_connection_notification (jack_engine_t *, jack_client_id_t, jack_port_id_t, jack_port_id_t, int); static int jack_send_connection_notification (jack_engine_t *, jack_client_id_t, jack_port_id_t, jack_port_id_t, int);
static int jack_deliver_event (jack_engine_t *, jack_client_internal_t *, jack_event_t *); static int jack_deliver_event (jack_engine_t *, jack_client_internal_t *, jack_event_t *);


static int jack_get_total_latency (jack_engine_t *engine, const char *portname, nframes_t *latency);

static int jack_engine_process_lock (jack_engine_t *);
static int jack_engine_process_unlock (jack_engine_t *);
static int jack_engine_post_process (jack_engine_t *);

static int jack_engine_process_lock (jack_engine_t *);
static void jack_engine_process_unlock (jack_engine_t *);
static int jack_engine_post_process (jack_engine_t *);


static int *jack_shm_registry; static int *jack_shm_registry;
static int jack_shm_id_cnt; static int jack_shm_id_cnt;


static char *client_state_names[] = {
"Not triggered",
"Triggered",
"Running",
"Finished"
};

static inline int static inline int
jack_client_is_inprocess (jack_client_internal_t *client) jack_client_is_inprocess (jack_client_internal_t *client)
{ {
return (client->control->type == ClientDynamic) || (client->control->type == ClientDriver); return (client->control->type == ClientDynamic) || (client->control->type == ClientDriver);
} }


static inline void
jack_lock_graph (jack_engine_t *engine)
{
pthread_mutex_lock (&engine->client_lock);
}

static inline void
jack_unlock_graph (jack_engine_t *engine)
{
pthread_mutex_unlock (&engine->client_lock);
}

static int static int
make_sockets (int fd[2]) make_sockets (int fd[2])
{ {
@@ -193,42 +210,6 @@ make_sockets (int fd[2])
return 0; return 0;
} }


static void
jack_cleanup_clients (jack_engine_t *engine)

{
jack_client_control_t *ctl;
jack_client_internal_t *client;
GSList *node, *tmp;

pthread_mutex_lock (&engine->graph_lock);

for (node = engine->clients; node; ) {

tmp = g_slist_next (node);
client = (jack_client_internal_t *) node->data;
ctl = client->control;
if (engine->verbose) {
fprintf (stderr, "client %s state = %d\n", ctl->name, ctl->state);
}

if (ctl->timed_out || (ctl->state > NotTriggered && ctl->state != Finished)) {

if (engine->verbose) {
fprintf (stderr, "removing failed client %s\n", ctl->name);
}

jack_remove_client (engine, (jack_client_internal_t *) node->data);
}

node = tmp;
}

pthread_mutex_unlock (&engine->graph_lock);
}

static int static int
jack_initialize_shm () jack_initialize_shm ()
{ {
@@ -408,13 +389,13 @@ jack_set_sample_rate (jack_engine_t *engine, nframes_t nframes)
int int
jack_engine_process_lock (jack_engine_t *engine) jack_engine_process_lock (jack_engine_t *engine)
{ {
return pthread_mutex_trylock (&engine->graph_lock);
return pthread_mutex_trylock (&engine->client_lock);
} }


int
void
jack_engine_process_unlock (jack_engine_t *engine) jack_engine_process_unlock (jack_engine_t *engine)
{ {
return pthread_mutex_unlock (&engine->graph_lock);
pthread_mutex_unlock (&engine->client_lock);
} }


static int static int
@@ -505,8 +486,9 @@ jack_process (jack_engine_t *engine, nframes_t nframes)
if (pfd[0].revents & POLLIN) { if (pfd[0].revents & POLLIN) {
status = 0; status = 0;
} else { } else {
jack_error ("subgraph starting at %s timed out (subgraph_wait_fd=%d, status = %d, state = %d)",
client->control->name, client->subgraph_wait_fd, status, client->control->state);
jack_error ("subgraph starting at %s timed out (subgraph_wait_fd=%d, status = %d, state = %s)",
client->control->name, client->subgraph_wait_fd, status,
client_state_names[client->control->state]);
status = 1; status = 1;
} }
} }
@@ -538,12 +520,92 @@ jack_process (jack_engine_t *engine, nframes_t nframes)
return engine->process_errors > 0; return engine->process_errors > 0;
} }


int
static void *
jack_cleanup_clients (void *arg)
{
jack_engine_t *engine = (jack_engine_t *) arg;
jack_client_internal_t *client;
GSList *node, *tmp;
int need_sort = FALSE;

jack_lock_graph (engine);

/* remove all dead clients */

for (node = engine->clients; node; ) {

tmp = g_slist_next (node);

client = (jack_client_internal_t *) node->data;
if (client->error) {
if (engine->verbose) {
fprintf (stderr, "removing failed client %s (errors: %d)\n",
client->control->name, client->error);
}
jack_remove_client (engine, (jack_client_internal_t *) node->data);
need_sort = TRUE;
}

node = tmp;
}

if (need_sort) {
jack_sort_graph (engine);
}

jack_unlock_graph (engine);
pthread_mutex_unlock (&engine->cleanup_lock);

return NULL;
}

static int
jack_engine_post_process (jack_engine_t *engine) jack_engine_post_process (jack_engine_t *engine)
{ {
if (engine->process_errors) {
jack_cleanup_clients (engine);
jack_client_control_t *ctl;
jack_client_internal_t *client;
GSList *node;
int need_remove = FALSE;
jack_lock_graph (engine);
/* find any clients that need removal due to timeouts, etc. */
for (node = engine->clients; node; node = g_slist_next (node) ) {

client = (jack_client_internal_t *) node->data;
ctl = client->control;
if (engine->verbose) {
fprintf (stderr, "client %s state = %s\n", ctl->name, client_state_names[ctl->state]);
}

if (ctl->timed_out || (ctl->state > NotTriggered && ctl->state != Finished)) {
client->error++;
}

if (client->error) {
need_remove = TRUE;
}
} }

jack_unlock_graph (engine);

if (need_remove) {
/* only one thread is allowed to run cleanup at a time. if
one is already underway, don't bother starting another.
*/
if (pthread_mutex_trylock (&engine->cleanup_lock) == 0) {
pthread_t cleanup_thread;
pthread_create (&cleanup_thread, NULL, jack_cleanup_clients, engine);
}
}

return 0; return 0;
} }


@@ -664,7 +726,7 @@ handle_new_client (jack_engine_t *engine, int client_fd)
return res.status; return res.status;
} }


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);


engine->clients = g_slist_prepend (engine->clients, client); engine->clients = g_slist_prepend (engine->clients, client);


@@ -679,7 +741,7 @@ handle_new_client (jack_engine_t *engine, int client_fd)
engine->pfd_max++; engine->pfd_max++;
} }


pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);


return 0; return 0;
} }
@@ -722,7 +784,7 @@ jack_client_activate (jack_engine_t *engine, jack_client_id_t id)
GSList *node; GSList *node;
int ret = -1; int ret = -1;
pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);


for (node = engine->clients; node; node = g_slist_next (node)) { for (node = engine->clients; node; node = g_slist_next (node)) {


@@ -746,15 +808,15 @@ jack_client_activate (jack_engine_t *engine, jack_client_id_t id)
} }
} }


pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);
return ret; return ret;
} }


static int static int
jack_client_do_deactivate (jack_engine_t *engine, jack_client_internal_t *client)
jack_client_do_deactivate (jack_engine_t *engine, jack_client_internal_t *client, int sort_graph)


{ {
/* called must hold engine->graph_lock and must have checked for and/or
/* called must hold engine->client_lock and must have checked for and/or
cleared all connections held by client. cleared all connections held by client.
*/ */
@@ -764,7 +826,9 @@ jack_client_do_deactivate (jack_engine_t *engine, jack_client_internal_t *client
engine->external_client_cnt--; engine->external_client_cnt--;
} }


jack_sort_graph (engine);
if (sort_graph) {
jack_sort_graph (engine);
}
return 0; return 0;
} }


@@ -775,7 +839,7 @@ jack_client_disconnect (jack_engine_t *engine, jack_client_internal_t *client)
GSList *node; GSList *node;
jack_port_internal_t *port; jack_port_internal_t *port;


/* call tree **** MUST HOLD *** engine->graph_lock */
/* call tree **** MUST HOLD *** engine->client_lock */


for (node = client->ports; node; node = g_slist_next (node)) { for (node = client->ports; node; node = g_slist_next (node)) {
port = (jack_port_internal_t *) node->data; port = (jack_port_internal_t *) node->data;
@@ -790,13 +854,13 @@ jack_client_disconnect (jack_engine_t *engine, jack_client_internal_t *client)
} }


static int static int
jack_client_deactivate (jack_engine_t *engine, jack_client_id_t id, int to_wait)
jack_client_deactivate (jack_engine_t *engine, jack_client_id_t id)


{ {
GSList *node; GSList *node;
int ret = -1; int ret = -1;


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);


for (node = engine->clients; node; node = g_slist_next (node)) { for (node = engine->clients; node; node = g_slist_next (node)) {


@@ -817,12 +881,12 @@ jack_client_deactivate (jack_engine_t *engine, jack_client_id_t id, int to_wait)
jack_port_clear_connections (engine, port); jack_port_clear_connections (engine, port);
} }


ret = jack_client_do_deactivate (engine, node->data);
ret = jack_client_do_deactivate (engine, node->data, TRUE);
break; break;
} }
} }


pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);


return ret; return ret;
} }
@@ -832,13 +896,15 @@ jack_set_timebase (jack_engine_t *engine, jack_client_id_t client)
{ {
int ret = -1; int ret = -1;


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);


if ((engine->timebase_client = jack_client_internal_by_id (engine, client)) != 0) { if ((engine->timebase_client = jack_client_internal_by_id (engine, client)) != 0) {
engine->control->time.frame = engine->timebase_client->control->frame_time; engine->control->time.frame = engine->timebase_client->control->frame_time;
ret = 0; ret = 0;
} }
pthread_mutex_unlock (&engine->graph_lock);

jack_unlock_graph (engine);

return ret; return ret;
} }


@@ -848,37 +914,32 @@ handle_client_jack_error (jack_engine_t *engine, int fd)
jack_client_internal_t *client = 0; jack_client_internal_t *client = 0;
GSList *node; GSList *node;


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);


for (node = engine->clients; node; node = g_slist_next (node)) { for (node = engine->clients; node; node = g_slist_next (node)) {
if (((jack_client_internal_t *) node->data)->request_fd == fd) { if (((jack_client_internal_t *) node->data)->request_fd == fd) {
client = (jack_client_internal_t *) node->data; client = (jack_client_internal_t *) node->data;
client->error++;
break; break;
} }
} }


if (client == NULL) {
/* client removed by driver thread */
pthread_mutex_unlock (&engine->graph_lock);
return -1;
}
jack_unlock_graph (engine);


jack_remove_client (engine, client);
pthread_mutex_unlock (&engine->graph_lock);
return 0; return 0;
} }


static int static int
handle_client_io (jack_engine_t *engine, int fd)

handle_client_request (jack_engine_t *engine, int fd)
{ {
jack_request_t req; jack_request_t req;
jack_client_internal_t *client = 0; jack_client_internal_t *client = 0;
int reply_fd; int reply_fd;
GSList *node; GSList *node;
int might_reorder = FALSE;


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);
for (node = engine->clients; node; node = g_slist_next (node)) { for (node = engine->clients; node; node = g_slist_next (node)) {
if (((jack_client_internal_t *) node->data)->request_fd == fd) { if (((jack_client_internal_t *) node->data)->request_fd == fd) {
client = (jack_client_internal_t *) node->data; client = (jack_client_internal_t *) node->data;
@@ -886,7 +947,7 @@ handle_client_io (jack_engine_t *engine, int fd)
} }
} }


pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);


if (client == NULL) { if (client == NULL) {
jack_error ("client input on unknown fd %d!", fd); jack_error ("client input on unknown fd %d!", fd);
@@ -895,10 +956,7 @@ handle_client_io (jack_engine_t *engine, int fd)


if (read (client->request_fd, &req, sizeof (req)) < sizeof (req)) { if (read (client->request_fd, &req, sizeof (req)) < sizeof (req)) {
jack_error ("cannot read request from client"); jack_error ("cannot read request from client");
/* XXX interlock problems with the driver thread here */
pthread_mutex_lock (&engine->graph_lock);
jack_remove_client (engine, client);
pthread_mutex_unlock (&engine->graph_lock);
client->error++;
return -1; return -1;
} }


@@ -914,14 +972,17 @@ handle_client_io (jack_engine_t *engine, int fd)
break; break;


case ConnectPorts: case ConnectPorts:
might_reorder = TRUE;
req.status = jack_port_do_connect (engine, req.x.connect.source_port, req.x.connect.destination_port); req.status = jack_port_do_connect (engine, req.x.connect.source_port, req.x.connect.destination_port);
break; break;


case DisconnectPort: case DisconnectPort:
might_reorder = TRUE;
req.status = jack_port_do_disconnect_all (engine, req.x.port_info.port_id); req.status = jack_port_do_disconnect_all (engine, req.x.port_info.port_id);
break; break;


case DisconnectPorts: case DisconnectPorts:
might_reorder = TRUE;
req.status = jack_port_do_disconnect (engine, req.x.connect.source_port, req.x.connect.destination_port); req.status = jack_port_do_disconnect (engine, req.x.connect.source_port, req.x.connect.destination_port);
break; break;


@@ -930,17 +991,14 @@ handle_client_io (jack_engine_t *engine, int fd)
break; break;


case DeactivateClient: case DeactivateClient:
req.status = jack_client_deactivate (engine, req.x.client_id, TRUE);
might_reorder = TRUE;
req.status = jack_client_deactivate (engine, req.x.client_id);
break; break;


case SetTimeBaseClient: case SetTimeBaseClient:
req.status = jack_set_timebase (engine, req.x.client_id); req.status = jack_set_timebase (engine, req.x.client_id);
break; break;


case GetPortTotalLatency:
req.status = jack_get_total_latency (engine, req.x.port_info.name, &req.x.nframes);
break;
default: default:
/* some requests are handled entirely on the client side, /* some requests are handled entirely on the client side,
by adjusting the shared memory area(s) by adjusting the shared memory area(s)
@@ -1049,7 +1107,7 @@ jack_server_thread (void *arg)
if (pfd[i].revents & ~POLLIN) { if (pfd[i].revents & ~POLLIN) {
handle_client_jack_error (engine, pfd[i].fd); handle_client_jack_error (engine, pfd[i].fd);
} else if (pfd[i].revents & POLLIN) { } else if (pfd[i].revents & POLLIN) {
if (handle_client_io (engine, pfd[i].fd)) {
if (handle_client_request (engine, pfd[i].fd)) {
jack_error ("bad hci\n"); jack_error ("bad hci\n");
} }
} }
@@ -1093,7 +1151,8 @@ jack_engine_new (int realtime, int rtpriority, int verbose)
engine->verbose = verbose; engine->verbose = verbose;
engine->asio_mode = FALSE; engine->asio_mode = FALSE;


pthread_mutex_init (&engine->graph_lock, 0);
pthread_mutex_init (&engine->client_lock, 0);
pthread_mutex_init (&engine->cleanup_lock, 0);
pthread_mutex_init (&engine->buffer_lock, 0); pthread_mutex_init (&engine->buffer_lock, 0);
pthread_mutex_init (&engine->port_lock, 0); pthread_mutex_init (&engine->port_lock, 0);


@@ -1349,6 +1408,7 @@ jack_client_internal_new (jack_engine_t *engine, int fd, jack_client_connect_req
client->execution_order = UINT_MAX; client->execution_order = UINT_MAX;
client->next_client = NULL; client->next_client = NULL;
client->handle = NULL; client->handle = NULL;
client->error = 0;


if (req->type != ClientOutOfProcess) { if (req->type != ClientOutOfProcess) {
@@ -1414,24 +1474,21 @@ jack_remove_client (jack_engine_t *engine, jack_client_internal_t *client)
GSList *node; GSList *node;
int i; int i;


/* caller must hold the graph_lock */
if (engine->verbose) {
fprintf (stderr, "adios senor %s\n", client->control->name);
}
/* caller must hold the client_lock */


/* these stop the process() loop from paying this client any attention,
as well as stopping jack_deliver_event() from bothering to try to
talk to the client.
*/
/* this stops jack_deliver_event() from doing anything */


client->control->dead = TRUE; client->control->dead = TRUE;
client->control->active = FALSE;


if (client == engine->timebase_client) { if (client == engine->timebase_client) {
engine->timebase_client = 0; engine->timebase_client = 0;
engine->control->time.frame = 0; engine->control->time.frame = 0;
} }


/* FIXME: called again in jack_client_delete(),
still needed here? (kaiv)
*/
jack_client_disconnect (engine, client); jack_client_disconnect (engine, client);


/* try to force the server thread to return from poll */ /* try to force the server thread to return from poll */
@@ -1447,7 +1504,7 @@ jack_remove_client (jack_engine_t *engine, jack_client_internal_t *client)
} }
} }
jack_client_do_deactivate (engine, client);
jack_client_do_deactivate (engine, client, FALSE);


/* rearrange the pollfd array so that things work right the /* rearrange the pollfd array so that things work right the
next time we go into poll(2). next time we go into poll(2).
@@ -1469,8 +1526,6 @@ static void
jack_client_delete (jack_engine_t *engine, jack_client_internal_t *client) jack_client_delete (jack_engine_t *engine, jack_client_internal_t *client)


{ {
jack_client_disconnect (engine, client);

if (jack_client_is_inprocess (client)) { if (jack_client_is_inprocess (client)) {
jack_client_unload (client); jack_client_unload (client);
free ((char *) client->control); free ((char *) client->control);
@@ -1488,7 +1543,7 @@ jack_client_by_name (jack_engine_t *engine, const char *name)
jack_client_internal_t *client = NULL; jack_client_internal_t *client = NULL;
GSList *node; GSList *node;


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);


for (node = engine->clients; node; node = g_slist_next (node)) { for (node = engine->clients; node; node = g_slist_next (node)) {
if (strcmp ((const char *) ((jack_client_internal_t *) node->data)->control->name, name) == 0) { if (strcmp ((const char *) ((jack_client_internal_t *) node->data)->control->name, name) == 0) {
@@ -1497,7 +1552,7 @@ jack_client_by_name (jack_engine_t *engine, const char *name)
} }
} }


pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);
return client; return client;
} }


@@ -1508,7 +1563,7 @@ jack_client_internal_by_id (jack_engine_t *engine, jack_client_id_t id)
jack_client_internal_t *client = NULL; jack_client_internal_t *client = NULL;
GSList *node; GSList *node;


/* call tree ***MUST HOLD*** engine->graph_lock */
/* call tree ***MUST HOLD*** engine->client_lock */


for (node = engine->clients; node; node = g_slist_next (node)) { for (node = engine->clients; node; node = g_slist_next (node)) {
if (((jack_client_internal_t *) node->data)->control->id == id) { if (((jack_client_internal_t *) node->data)->control->id == id) {
@@ -1524,9 +1579,8 @@ static int
jack_deliver_event (jack_engine_t *engine, jack_client_internal_t *client, jack_event_t *event) jack_deliver_event (jack_engine_t *engine, jack_client_internal_t *client, jack_event_t *event)
{ {
char status; char status;
int client_err = 0;


/* caller must hold the graph_lock */
/* caller must hold the client_lock */


if (client->control->dead) { if (client->control->dead) {
return 0; return 0;
@@ -1552,45 +1606,38 @@ jack_deliver_event (jack_engine_t *engine, jack_client_internal_t *client, jack_
} }
break; break;


case GraphReordered:
if (client->control->graph_order) {
client->control->graph_order (client->control->graph_order_arg);
}
break;

default: default:
/* internal clients don't need to know */ /* internal clients don't need to know */
break; break;
} }


} else { } else {

if (write (client->event_fd, event, sizeof (*event)) != sizeof (*event)) { if (write (client->event_fd, event, sizeof (*event)) != sizeof (*event)) {
jack_error ("cannot send event to client [%s] (%s)", client->control->name, strerror (errno)); jack_error ("cannot send event to client [%s] (%s)", client->control->name, strerror (errno));
client_err++;
client->error++;
} }
if (!client_err && (read (client->event_fd, &status, sizeof (status)) != sizeof (status))) {
if (!client->error && (read (client->event_fd, &status, sizeof (status)) != sizeof (status))) {
jack_error ("cannot read event response from client [%s] (%s)", client->control->name, strerror (errno)); jack_error ("cannot read event response from client [%s] (%s)", client->control->name, strerror (errno));
client_err++;
client->error++;
} }


if (client_err || status != 0) {
/* FIXME: caller is not expecting the client to be
removed while delivering an event! (kaiv)
*/
jack_error("error while delivering an event");
/* jack_remove_client (engine, client); */
if (status != 0) {
jack_error ("bad status for client event handling (type = %d)", event->type);
client->error++;
} }
} }


return 0; return 0;
} }


int
jack_client_set_order (jack_engine_t *engine, jack_client_internal_t *client)
{
jack_event_t event;

event.type = GraphReordered;
event.x.n = client->execution_order;

return jack_deliver_event (engine, client, &event);
}

int int
jack_rechain_graph (jack_engine_t *engine) jack_rechain_graph (jack_engine_t *engine)
{ {
@@ -1598,6 +1645,7 @@ jack_rechain_graph (jack_engine_t *engine)
unsigned long n; unsigned long n;
int err = 0; int err = 0;
jack_client_internal_t *client, *subgraph_client, *next_client; jack_client_internal_t *client, *subgraph_client, *next_client;
jack_event_t event;


jack_clear_fifos (engine); jack_clear_fifos (engine);


@@ -1607,6 +1655,8 @@ jack_rechain_graph (jack_engine_t *engine)
fprintf(stderr, "-- jack_rechain_graph():\n"); fprintf(stderr, "-- jack_rechain_graph():\n");
} }


event.type = GraphReordered;

for (n = 0, node = engine->clients, next = NULL; node; node = next) { for (n = 0, node = engine->clients, next = NULL; node; node = next) {


next = g_slist_next (node); next = g_slist_next (node);
@@ -1654,10 +1704,10 @@ jack_rechain_graph (jack_engine_t *engine)
client->control->name, n); client->control->name, n);
} }


if (client->control->graph_order) {
client->control->graph_order (client->control->graph_order_arg);
}
/* this does the right thing for in-process clients too */
jack_deliver_event (engine, client, &event);
subgraph_client = 0; subgraph_client = 0;
} else { } else {
@@ -1682,12 +1732,16 @@ jack_rechain_graph (jack_engine_t *engine)
} }


} }
/* make sure fifo for 'n + 1' exists /* make sure fifo for 'n + 1' exists
* before issuing client reorder * before issuing client reorder
*/ */
(void) jack_get_fifo_fd(engine, n + 1);
jack_client_set_order (engine, client);
(void) jack_get_fifo_fd(engine, client->execution_order + 1);
event.x.n = client->execution_order;
jack_deliver_event (engine, client, &event);
n++; n++;
} }
} }
@@ -1831,6 +1885,68 @@ jack_client_feeds (jack_client_internal_t *might, jack_client_internal_t *target
return 0; return 0;
} }


static nframes_t
jack_get_port_total_latency (jack_engine_t *engine, jack_port_internal_t *port)
{
GSList *node;
nframes_t latency;
nframes_t max_latency = 0;

/* call tree must hold engine->client_lock. */
latency = port->shared->latency;

for (node = port->connections; node; node = g_slist_next (node)) {

nframes_t this_latency;
jack_connection_internal_t *connection;

connection = (jack_connection_internal_t *) node->data;

/* if we're a destination in the connection, recurse on the source to
get its total latency
*/
if (connection->destination == port) {

if (connection->source->shared->flags & JackPortIsTerminal) {
this_latency = connection->source->shared->latency;
} else {
this_latency = jack_get_port_total_latency (engine, connection->source);
}

} else {

/* "port" is the source, so get the latency of the destination */

if (connection->destination->shared->flags & JackPortIsTerminal) {
this_latency = connection->destination->shared->latency;
} else {
this_latency = jack_get_port_total_latency (engine, connection->destination);
}
}

if (this_latency > max_latency) {
max_latency = this_latency;
}
}

return latency + max_latency;
}

static void
jack_compute_all_port_total_latencies (jack_engine_t *engine)
{
jack_port_shared_t *shared = engine->control->ports;
int i;

for (i = 0; i < engine->control->port_max; i++) {
if (shared[i].in_use) {
shared[i].total_latency = jack_get_port_total_latency (engine, &engine->internal_ports[i]);
}
}
}

/** /**
* Sorts the network of clients using the following * Sorts the network of clients using the following
* algorithm: * algorithm:
@@ -1860,6 +1976,8 @@ jack_sort_graph (jack_engine_t *engine)
jack_client_internal_t *client; jack_client_internal_t *client;
jack_client_internal_t *oclient; jack_client_internal_t *oclient;


/* called, obviously, must hold engine->client_lock */

for (node = engine->clients; node; node = g_slist_next (node)) { for (node = engine->clients; node; node = g_slist_next (node)) {


client = (jack_client_internal_t *) node->data; client = (jack_client_internal_t *) node->data;
@@ -1883,6 +2001,9 @@ jack_sort_graph (jack_engine_t *engine)
} }


engine->clients = g_slist_sort (engine->clients, (GCompareFunc) jack_client_sort); engine->clients = g_slist_sort (engine->clients, (GCompareFunc) jack_client_sort);

jack_compute_all_port_total_latencies (engine);

jack_rechain_graph (engine); jack_rechain_graph (engine);
} }


@@ -1901,7 +2022,7 @@ void jack_dump_configuration(jack_engine_t *engine, int take_lock)
fprintf(stderr, "engine.c: <-- dump begins -->\n"); fprintf(stderr, "engine.c: <-- dump begins -->\n");


if (take_lock) { if (take_lock) {
pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);
} }
for (n = 0, clientnode = engine->clients; clientnode; clientnode = g_slist_next (clientnode)) { for (n = 0, clientnode = engine->clients; clientnode; clientnode = g_slist_next (clientnode)) {
@@ -1936,7 +2057,7 @@ void jack_dump_configuration(jack_engine_t *engine, int take_lock)
} }


if (take_lock) { if (take_lock) {
pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);
} }


@@ -1998,7 +2119,7 @@ jack_port_do_connect (jack_engine_t *engine,
src_id = srcport->shared->id; src_id = srcport->shared->id;
dst_id = dstport->shared->id; dst_id = dstport->shared->id;


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);


if (dstport->connections && dstport->shared->type_info.mixdown == NULL) { if (dstport->connections && dstport->shared->type_info.mixdown == NULL) {
jack_error ("cannot make multiple connections to a port of type [%s]", dstport->shared->type_info.type_name); jack_error ("cannot make multiple connections to a port of type [%s]", dstport->shared->type_info.type_name);
@@ -2020,8 +2141,7 @@ jack_port_do_connect (jack_engine_t *engine,
jack_send_connection_notification (engine, dstport->shared->client_id, dst_id, src_id, TRUE); jack_send_connection_notification (engine, dstport->shared->client_id, dst_id, src_id, TRUE);
} }


pthread_mutex_unlock (&engine->graph_lock);

jack_unlock_graph (engine);
return 0; return 0;
} }


@@ -2037,7 +2157,7 @@ jack_port_disconnect_internal (jack_engine_t *engine,
int ret = -1; int ret = -1;
jack_port_id_t src_id, dst_id; jack_port_id_t src_id, dst_id;


/* call tree **** MUST HOLD **** engine->graph_lock. */
/* call tree **** MUST HOLD **** engine->client_lock. */
for (node = srcport->connections; node; node = g_slist_next (node)) { for (node = srcport->connections; node; node = g_slist_next (node)) {


@@ -2096,10 +2216,10 @@ jack_port_do_disconnect_all (jack_engine_t *engine,
fprintf (stderr, "clear connections for %s\n", engine->internal_ports[port_id].shared->name); fprintf (stderr, "clear connections for %s\n", engine->internal_ports[port_id].shared->name);
} }


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);
jack_port_clear_connections (engine, &engine->internal_ports[port_id]); jack_port_clear_connections (engine, &engine->internal_ports[port_id]);
jack_sort_graph (engine); jack_sort_graph (engine);
pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);


return 0; return 0;
} }
@@ -2122,87 +2242,20 @@ jack_port_do_disconnect (jack_engine_t *engine,
return -1; return -1;
} }


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);


ret = jack_port_disconnect_internal (engine, srcport, dstport, TRUE); ret = jack_port_disconnect_internal (engine, srcport, dstport, TRUE);


pthread_mutex_unlock (&engine->graph_lock);
return ret;
}

static nframes_t
jack_get_port_total_latency (jack_engine_t *engine, jack_port_internal_t *port)
{
GSList *node;
nframes_t latency;
nframes_t max_latency = 0;

/* call tree must hold engine->graph_lock. */
latency = port->shared->latency;

for (node = port->connections; node; node = g_slist_next (node)) {

nframes_t this_latency;
jack_connection_internal_t *connection;

connection = (jack_connection_internal_t *) node->data;

/* if we're a destination in the connection, recurse on the source to
get its total latency
*/
if (connection->destination == port) {

if (connection->source->shared->flags & JackPortIsTerminal) {
this_latency = connection->source->shared->latency;
} else {
this_latency = jack_get_port_total_latency (engine, connection->source);
}

} else {

/* "port" is the source, so get the latency of the destination */

if (connection->destination->shared->flags & JackPortIsTerminal) {
this_latency = connection->destination->shared->latency;
} else {
this_latency = jack_get_port_total_latency (engine, connection->destination);
}
}

if (this_latency > max_latency) {
max_latency = this_latency;
}
}

return latency + max_latency;
}
jack_unlock_graph (engine);


static int
jack_get_total_latency (jack_engine_t *engine, const char *portname, nframes_t *latency)
{
jack_port_internal_t *port;

pthread_mutex_lock (&engine->graph_lock);

if ((port = jack_get_port_by_name (engine, portname)) == NULL) {
pthread_mutex_unlock (&engine->graph_lock);
return -1;
}

*latency = jack_get_port_total_latency (engine, port);

pthread_mutex_unlock (&engine->graph_lock);

return 0;
return ret;
} }


static int static int
jack_get_fifo_fd (jack_engine_t *engine, int which_fifo) jack_get_fifo_fd (jack_engine_t *engine, int which_fifo)


{ {
/* caller must hold graph_lock */
/* caller must hold client_lock */


char path[PATH_MAX+1]; char path[PATH_MAX+1];
struct stat statbuf; struct stat statbuf;
@@ -2249,7 +2302,7 @@ jack_get_fifo_fd (jack_engine_t *engine, int which_fifo)
static void static void
jack_clear_fifos (jack_engine_t *engine) jack_clear_fifos (jack_engine_t *engine)
{ {
/* caller must hold graph_lock */
/* caller must hold client_lock */


int i; int i;
char buf[16]; char buf[16];
@@ -2362,12 +2415,12 @@ jack_port_do_register (jack_engine_t *engine, jack_request_t *req)
jack_port_internal_t *port; jack_port_internal_t *port;
jack_client_internal_t *client; jack_client_internal_t *client;


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);
if ((client = jack_client_internal_by_id (engine, req->x.port_info.client_id)) == NULL) { if ((client = jack_client_internal_by_id (engine, req->x.port_info.client_id)) == NULL) {
jack_error ("unknown client id in port registration request"); jack_error ("unknown client id in port registration request");
return -1; return -1;
} }
pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);


if ((port_id = jack_get_free_port (engine)) == NoPort) { if ((port_id = jack_get_free_port (engine)) == NoPort) {
jack_error ("no ports available!"); jack_error ("no ports available!");
@@ -2395,10 +2448,10 @@ jack_port_do_register (jack_engine_t *engine, jack_request_t *req)
return -1; return -1;
} }


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);
client->ports = g_slist_prepend (client->ports, port); client->ports = g_slist_prepend (client->ports, port);
jack_port_registration_notify (engine, port_id, TRUE); jack_port_registration_notify (engine, port_id, TRUE);
pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);


if (engine->verbose) { if (engine->verbose) {
fprintf (stderr, "registered port %s, offset = %u\n", shared->name, shared->offset); fprintf (stderr, "registered port %s, offset = %u\n", shared->name, shared->offset);
@@ -2428,10 +2481,10 @@ jack_port_do_unregister (jack_engine_t *engine, jack_request_t *req)
return -1; return -1;
} }


pthread_mutex_lock (&engine->graph_lock);
jack_lock_graph (engine);
if ((client = jack_client_internal_by_id (engine, shared->client_id)) == NULL) { if ((client = jack_client_internal_by_id (engine, shared->client_id)) == NULL) {
jack_error ("unknown client id in port registration request"); jack_error ("unknown client id in port registration request");
pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);
return -1; return -1;
} }


@@ -2442,7 +2495,7 @@ jack_port_do_unregister (jack_engine_t *engine, jack_request_t *req)
client->ports = g_slist_remove (client->ports, port); client->ports = g_slist_remove (client->ports, port);
jack_port_registration_notify (engine, req->x.port_info.port_id, FALSE); jack_port_registration_notify (engine, req->x.port_info.port_id, FALSE);
pthread_mutex_unlock (&engine->graph_lock);
jack_unlock_graph (engine);


return 0; return 0;
} }
@@ -2492,8 +2545,9 @@ jack_port_assign_buffer (jack_engine_t *engine, jack_port_internal_t *port)
pthread_mutex_lock (&engine->buffer_lock); pthread_mutex_lock (&engine->buffer_lock);


if (engine->port_buffer_freelist == NULL) { if (engine->port_buffer_freelist == NULL) {
jack_error ("no more buffers available!");
goto out;
jack_error ("all port buffers in use!");
pthread_mutex_unlock (&engine->buffer_lock);
return -1;
} }


bi = (jack_port_buffer_info_t *) engine->port_buffer_freelist->data; bi = (jack_port_buffer_info_t *) engine->port_buffer_freelist->data;
@@ -2516,7 +2570,6 @@ jack_port_assign_buffer (jack_engine_t *engine, jack_port_internal_t *port)
jack_error ("port segment info for 0x%x:%d not found!", bi->shm_key, bi->offset); jack_error ("port segment info for 0x%x:%d not found!", bi->shm_key, bi->offset);
} }


out:
pthread_mutex_unlock (&engine->buffer_lock); pthread_mutex_unlock (&engine->buffer_lock);


if (port->shared->shm_key < 0) { if (port->shared->shm_key < 0) {


+ 10
- 8
jack/engine.h View File

@@ -31,13 +31,14 @@ struct _jack_port_internal;
struct _jack_engine { struct _jack_engine {
jack_control_t *control; jack_control_t *control;
struct _jack_driver *driver; struct _jack_driver *driver;
int (*process)(struct _jack_engine *, nframes_t frames);
int (*set_buffer_size)(struct _jack_engine *, nframes_t frames);
int (*set_sample_rate)(struct _jack_engine *, nframes_t frames);
int (*process_lock)(struct _jack_engine *);
int (*process_unlock)(struct _jack_engine *);
int (*post_process)(struct _jack_engine *);
pthread_mutex_t graph_lock;
int (*process)(struct _jack_engine *, nframes_t frames);
int (*set_buffer_size)(struct _jack_engine *, nframes_t frames);
int (*set_sample_rate)(struct _jack_engine *, nframes_t frames);
int (*process_lock)(struct _jack_engine *);
void (*process_unlock)(struct _jack_engine *);
int (*post_process)(struct _jack_engine *);
pthread_mutex_t client_lock;
pthread_mutex_t cleanup_lock;
pthread_mutex_t buffer_lock; pthread_mutex_t buffer_lock;
pthread_mutex_t port_lock; pthread_mutex_t port_lock;
int process_errors; int process_errors;
@@ -55,7 +56,7 @@ struct _jack_engine {
GSList *port_segments; GSList *port_segments;
GSList *port_buffer_freelist; GSList *port_buffer_freelist;


/* these lists are all protected by `graph_lock' */
/* these lists are all protected by `client_lock' */


GSList *clients; GSList *clients;
GSList *clients_waiting; GSList *clients_waiting;
@@ -79,6 +80,7 @@ struct _jack_engine {
int rtpriority; int rtpriority;
char verbose; char verbose;
char asio_mode; char asio_mode;
int reordered;
}; };


/* public functions */ /* public functions */


+ 1
- 2
jack/internal.h View File

@@ -203,8 +203,7 @@ typedef enum {
SetTimeBaseClient = 5, SetTimeBaseClient = 5,
ActivateClient = 6, ActivateClient = 6,
DeactivateClient = 7, DeactivateClient = 7,
GetPortTotalLatency = 8,
DisconnectPort = 9
DisconnectPort = 8
} AudioEngineRequestType; } AudioEngineRequestType;


typedef struct { typedef struct {


+ 12
- 10
jack/port.h View File

@@ -52,17 +52,19 @@ typedef struct _jack_port_type_info {
*/ */


typedef struct _jack_port_shared { typedef struct _jack_port_shared {
int shm_key;
size_t offset;
int shm_key;
size_t offset;
unsigned long flags;
unsigned long buffer_size;
jack_port_id_t id;
char name[JACK_CLIENT_NAME_SIZE+JACK_PORT_NAME_SIZE+2];
jack_port_type_info_t type_info;
jack_client_id_t client_id;
nframes_t latency;
unsigned char monitor_requests;
unsigned long flags;
unsigned long buffer_size;
jack_port_id_t id;
char name[JACK_CLIENT_NAME_SIZE+JACK_PORT_NAME_SIZE+2];
jack_port_type_info_t type_info;
jack_client_id_t client_id;

volatile nframes_t latency;
volatile nframes_t total_latency;
volatile unsigned char monitor_requests;


char in_use : 1; char in_use : 1;
char locked : 1; char locked : 1;


Write Preview
Loading…
Cancel
Save