Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix possible deadlock in conference (audio & video) #4243

Merged
merged 4 commits into from
Jan 7, 2025
Merged

Fix possible deadlock in conference (audio & video) #4243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0ab508
Fix possible deadlock in conference (audio & video)
nanangizz Jan 6, 2025
5da3772
Forgot to remove mutex around handle_op_queue() in vid conf.
nanangizz Jan 6, 2025
4920150
Minor indentation fix
nanangizz Jan 6, 2025
37678e7
Revert int -> unsigned (was to fix warning, turns out negative value …
nanangizz Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 35 additions & 15 deletions pjmedia/src/pjmedia/conference.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,34 +340,53 @@ static op_entry* get_free_op_entry(pjmedia_conf *conf)

static void handle_op_queue(pjmedia_conf *conf)
{
op_entry *op, *next_op;
/* The queue may grow while mutex is released, better put a limit? */
enum { MAX_PROCESSED_OP = 100 };
int i = 0;

op = conf->op_queue->next;
while (op != conf->op_queue) {
next_op = op->next;
while (i++ < MAX_PROCESSED_OP) {
op_entry *op;
op_type type;
op_param param;

pj_mutex_lock(conf->mutex);

/* Stop when queue empty */
if (pj_list_empty(conf->op_queue)) {
pj_mutex_unlock(conf->mutex);
break;
}

/* Copy op */
op = conf->op_queue->next;
type = op->type;
param = op->param;

/* Free op */
pj_list_erase(op);
op->type = OP_UNKNOWN;
pj_list_push_back(conf->op_queue_free, op);

switch(op->type) {
pj_mutex_unlock(conf->mutex);

/* Process op */
switch(type) {
case OP_ADD_PORT:
op_add_port(conf, &op->param);
op_add_port(conf, &param);
break;
case OP_REMOVE_PORT:
op_remove_port(conf, &op->param);
op_remove_port(conf, &param);
break;
case OP_CONNECT_PORTS:
op_connect_ports(conf, &op->param);
op_connect_ports(conf, &param);
break;
case OP_DISCONNECT_PORTS:
op_disconnect_ports(conf, &op->param);
op_disconnect_ports(conf, &param);
break;
default:
pj_assert(!"Invalid sync-op in conference");
break;
}

op->type = OP_UNKNOWN;
pj_list_push_back(conf->op_queue_free, op);
op = next_op;
}
}

Expand Down Expand Up @@ -1722,7 +1741,10 @@ static void op_remove_port(pjmedia_conf *conf, const op_param *prm)
}

/* Remove the port. */
pj_mutex_lock(conf->mutex);
conf->ports[port] = NULL;
pj_mutex_unlock(conf->mutex);

if (!conf_port->is_new)
--conf->port_cnt;

Expand Down Expand Up @@ -2418,9 +2440,7 @@ static pj_status_t get_frame(pjmedia_port *this_port,
*/
if (!pj_list_empty(conf->op_queue)) {
pj_log_push_indent();
pj_mutex_lock(conf->mutex);
handle_op_queue(conf);
pj_mutex_unlock(conf->mutex);
pj_log_pop_indent();
}

Expand Down
56 changes: 39 additions & 17 deletions pjmedia/src/pjmedia/vid_conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,37 +202,56 @@ static op_entry* get_free_op_entry(pjmedia_vid_conf *conf)

static void handle_op_queue(pjmedia_vid_conf *conf)
{
op_entry *op, *next_op;

op = conf->op_queue->next;
while (op != conf->op_queue) {
next_op = op->next;
/* The queue may grow while mutex is released, better put a limit? */
enum { MAX_PROCESSED_OP = 100 };
int i = 0;

while (i++ < MAX_PROCESSED_OP) {
op_entry* op;
op_type type;
op_param param;

pj_mutex_lock(conf->mutex);

/* Stop when queue empty */
if (pj_list_empty(conf->op_queue)) {
pj_mutex_unlock(conf->mutex);
break;
}

/* Copy op */
op = conf->op_queue->next;
type = op->type;
param = op->param;

/* Free op */
pj_list_erase(op);
op->type = OP_UNKNOWN;
pj_list_push_back(conf->op_queue_free, op);

pj_mutex_unlock(conf->mutex);

switch(op->type) {
/* Process op */
switch (type) {
case OP_ADD_PORT:
op_add_port(conf, &op->param);
op_add_port(conf, &param);
break;
case OP_REMOVE_PORT:
op_remove_port(conf, &op->param);
op_remove_port(conf, &param);
break;
case OP_CONNECT_PORTS:
op_connect_ports(conf, &op->param);
op_connect_ports(conf, &param);
break;
case OP_DISCONNECT_PORTS:
op_disconnect_ports(conf, &op->param);
op_disconnect_ports(conf, &param);
break;
case OP_UPDATE_PORT:
op_update_port(conf, &op->param);
op_update_port(conf, &param);
break;
default:
pj_assert(!"Invalid sync-op in video conference");
break;
}

op->type = OP_UNKNOWN;
pj_list_push_back(conf->op_queue_free, op);
op = next_op;
}
}

Expand Down Expand Up @@ -708,7 +727,10 @@ static void op_remove_port(pjmedia_vid_conf *vid_conf,
}

/* Remove the port. */
pj_mutex_lock(vid_conf->mutex);
vid_conf->ports[slot] = NULL;
pj_mutex_unlock(vid_conf->mutex);

if (!cport->is_new)
--vid_conf->port_cnt;

Expand Down Expand Up @@ -1086,9 +1108,9 @@ static void on_clock_tick(const pj_timestamp *now, void *user_data)
* the clock such as connect, disonnect, remove, update.
*/
if (!pj_list_empty(vid_conf->op_queue)) {
pj_mutex_lock(vid_conf->mutex);
pj_log_push_indent();
handle_op_queue(vid_conf);
pj_mutex_unlock(vid_conf->mutex);
pj_log_pop_indent();
}

/* No mutex from this point! Otherwise it may cause deadlock as
Expand Down
Loading