diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-02 17:50:14 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-02 17:50:14 -0500 |
| commit | ea78c7e06e768a02d6129c43c51473a7f94cfd73 (patch) | |
| tree | 4952bb3c8cdc309348d4244894770535826ebfb5 /include | |
| parent | 79c1cd035164c637e6056406d341713f3424fee0 (diff) | |
| download | jack1-ea78c7e06e768a02d6129c43c51473a7f94cfd73.tar.gz | |
Revert "use topological sort for client ordering (fons adriaensen)"
This reverts commit 423931219dd3e3b669fde97786cadae92c066dc1.
Diffstat (limited to 'include')
| -rw-r--r-- | include/engine.h | 7 | ||||
| -rw-r--r-- | include/internal.h | 28 |
2 files changed, 6 insertions, 29 deletions
diff --git a/include/engine.h b/include/engine.h index 3e869af..5106713 100644 --- a/include/engine.h +++ b/include/engine.h @@ -144,13 +144,6 @@ struct _jack_engine { JSList *clients_waiting; JSList *reserved_client_names; - /* Double linked list of clients in running order */ - jack_client_internal_t *execlist_head; - jack_client_internal_t *execlist_tail; -#define EXECLIST_ORDER 1 /* Re-order clients */ -#define EXECLIST_CYCLE 2 /* Check cycles */ - int execlist_request; - jack_port_internal_t *internal_ports; jack_client_internal_t *timebase_client; jack_port_buffer_info_t *silent_buffer; diff --git a/include/internal.h b/include/internal.h index 7f9d062..5a14237 100644 --- a/include/internal.h +++ b/include/internal.h @@ -452,18 +452,6 @@ struct _jack_request { int32_t status; } POST_PACKED_STRUCTURE; - -/* Data used by the algorithm determining running order - * of clients. - */ -typedef struct _jack_feedcounts { - struct _jack_feedcounts *next; - struct _jack_client_internal *client; - int fwd_count; - int rev_count; -} jack_feedcounts_t; - - /* Per-client structure allocated in the server's address space. * It's here because its not part of the engine structure. */ @@ -476,18 +464,14 @@ typedef struct _jack_client_internal { int event_fd; int subgraph_start_fd; int subgraph_wait_fd; - - /* protected by engine->client_lock */ - JSList *ports; - - jack_feedcounts_t *feedlist; - struct _jack_client_internal *execlist_next; - struct _jack_client_internal *execlist_prev; - int depcount; - int depcheck; - + JSList *ports; /* protected by engine->client_lock */ + JSList *truefeeds; /* protected by engine->client_lock */ + JSList *sortfeeds; /* protected by engine->client_lock */ + int fedcount; + int tfedcount; jack_shm_info_t control_shm; unsigned long execution_order; + struct _jack_client_internal *next_client; /* not a linked list! */ dlhandle handle; int (*initialize)(jack_client_t*, const char*); /* int. clients only */ void (*finish)(void *); /* internal clients only */ |