sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#55283 use obj_release in more places

Browse Source 
Change-Id: Ib343ff28bf6796238358170f89e565e5e9d6f707
pull/1910/head
Richard Fuchs 11 months ago
parent 4c9343b8c6
commit dcc816dd07
2 changed files with 42 additions and 73 deletions
Show Stats Download Patch File Download Diff File

27
daemon/call.c
Unescape View File

@ -541,7 +541,7 @@ void kill_calls_timer(GSList *list, const char *url) {
destroy:
call_destroy(ca);
obj_put(ca);
obj_release(ca);
list = g_slist_delete_link(list, list);
log_info_pop();
@ -628,8 +628,7 @@ static void __call_iterator_remove(call_t *c) {
}
break; // we can remove now
}
if (c->iterator[i].link.data)
obj_put(c->iterator[i].link.data);
obj_release(c->iterator[i].link.data);
rtpe_call_iterators[i].first = t_list_remove_link(rtpe_call_iterators[i].first,
&c->iterator[i].link);
ZERO(c->iterator[i].link);
@ -651,7 +650,7 @@ void call_free(void) {
while (t_hash_table_iter_next(&iter, NULL, &c)) {
__call_iterator_remove(c);
__call_cleanup(c);
obj_put(c);
obj_release(c);
}
t_hash_table_destroy(rtpe_callhash);
}
@ -3945,15 +3944,13 @@ static void __call_cleanup(call_t *c) {
media_player_put(&ml->rec_player);
if (ml->tone_freqs)
g_array_free(ml->tone_freqs, true);
if (ml->janus_session)
obj_put_o((void *) ml->janus_session);
ml->janus_session = NULL;
obj_release(ml->janus_session);
}
while (c->stream_fds.head) {
stream_fd *sfd = t_queue_pop_head(&c->stream_fds);
stream_fd_release(sfd);
obj_put(sfd);
obj_release(sfd);
}
recording_finish(c, false);
@ -4271,8 +4268,7 @@ static void __call_free(call_t *c) {
//ilog(LOG_DEBUG, "freeing main call struct");
if (c->dtls_cert)
obj_put(c->dtls_cert);
obj_release(c->dtls_cert);
mqtt_timer_stop(&c->mqtt_timer);
while (c->monologues.head) {
@ -4365,7 +4361,7 @@ restart:
if (t_hash_table_lookup(rtpe_callhash, callid)) {
/* preempted */
rwlock_unlock_w(&rtpe_callhash_lock);
obj_put(c);
obj_release(c);
goto restart;
}
t_hash_table_insert(rtpe_callhash, &c->callid, obj_get(c));
@ -4550,7 +4546,7 @@ bool call_merge(call_t *call, call_t **call2p) {
sfd->unique_id = ++last_id;
// call objects are held by reference here
if (sfd->call) {
obj_put(sfd->call);
obj_release(sfd->call);
sfd->call = obj_get(call);
}
t_queue_push_tail(&call->stream_fds, sfd);
@ -4587,15 +4583,14 @@ bool call_merge(call_t *call, call_t **call2p) {
rwlock_unlock_w(&rtpe_callhash_lock);
if (call_ht)
obj_put(call_ht);
obj_release(call_ht);
__call_iterator_remove(call2);
mqtt_timer_stop(&call2->mqtt_timer);
__call_cleanup(call2);
rwlock_unlock_w(&call2->master_lock);
obj_put(call2);
obj_release(call2);
*call2p = NULL;
return true;
@ -5331,7 +5326,7 @@ err:
out:
if (update)
redis_update_onekey(c, rtpe_redis_write);
obj_put(c);
obj_release(c);
return ret;
}

88
daemon/codec.c
Unescape View File

@ -337,9 +337,7 @@ static void __handler_shutdown(struct codec_handler *handler) {
delay_buffer_stop(&handler->delay_buffer);
}
if (handler->ssrc_handler)
obj_put(&handler->ssrc_handler->h);
handler->ssrc_handler = NULL;
obj_release(handler->ssrc_handler);
handler->kernelize = false;
handler->transcoder = false;
handler->output_handler = handler; // reset to default
@ -969,8 +967,7 @@ static int codec_handler_non_rtp_update(struct call_media *receiver, struct call
static void __rtcp_timer_free(struct rtcp_timer *rt) {
if (rt->call)
obj_put(rt->call);
obj_release(rt->call);
}
static void __rtcp_timer_run(struct codec_timer *);
// master lock held in W
@ -1580,8 +1577,7 @@ static struct codec_handler *codec_handler_get_udptl(struct call_media *m) {
#endif
static void __mqtt_timer_free(struct mqtt_timer *mqt) {
if (mqt->call)
obj_put(mqt->call);
obj_release(mqt->call);
}
static void __codec_mqtt_timer_schedule(struct mqtt_timer *mqt);
INLINE bool __mqtt_timer_common_call(struct mqtt_timer *mqt) {
@ -1662,10 +1658,9 @@ void mqtt_timer_start(struct mqtt_timer **mqtp, call_t *call, struct call_media
// master lock held in W
static void codec_timer_stop(struct codec_timer **ctp) {
if (!ctp || !*ctp)
if (!ctp)
return;
obj_put(&(*ctp)->tt_obj);
*ctp = NULL;
obj_release(*ctp);
}
// master lock held in W
void rtcp_timer_stop(struct rtcp_timer **rtp) {
@ -1967,18 +1962,14 @@ static int __handler_func_sequencer(struct media_packet *mp, struct transcode_pa
// new packet might have different handlers
h = packet->handler;
if (ch)
obj_put(&ch->h);
if (input_ch)
obj_put(&input_ch->h);
input_ch = NULL;
obj_release(ch);
obj_release(input_ch);
ch = get_ssrc(ssrc_in_p->h.ssrc, h->ssrc_hash);
if (G_UNLIKELY(!ch))
goto next;
input_ch = get_ssrc(ssrc_in_p->h.ssrc, h->input_handler->ssrc_hash);
if (G_UNLIKELY(!input_ch)) {
obj_put(&ch->h);
ch = NULL;
obj_release(ch);
goto next;
}
@ -2007,11 +1998,9 @@ next:
out:
__ssrc_unlock_both(mp);
if (input_ch)
obj_put(&input_ch->h);
obj_release(input_ch);
out_ch:
if (ch)
obj_put(&ch->h);
obj_release(ch);
mp->rtp = orig_rtp;
@ -2204,7 +2193,7 @@ static int codec_add_dtmf_packet(struct codec_ssrc_handler *ch, struct codec_ssr
payload_type = h->real_dtmf_payload_type;
skip:
obj_put(&output_ch->h);
obj_release(output_ch);
char *buf = bufferpool_alloc(media_bufferpool,
packet->payload->len + sizeof(struct rtp_header) + RTP_BUFFER_TAIL_ROOM);
memcpy(buf + sizeof(struct rtp_header), packet->payload->s, packet->payload->len);
@ -2642,7 +2631,7 @@ static int handler_func_passthrough_ssrc(struct codec_handler *h, struct media_p
else if (!ch->dtmf_events.length)
ML_CLEAR(mp->media->monologue, DTMF_INJECTION_ACTIVE);
obj_put(&ch->h);
obj_release(ch);
}
}
@ -2987,10 +2976,8 @@ static void delay_frame_free(struct delay_frame *dframe) {
av_frame_free(&dframe->frame);
g_free(dframe->mp.raw.s);
media_packet_release(&dframe->mp);
if (dframe->ch)
obj_put(&dframe->ch->h);
if (dframe->input_ch)
obj_put(&dframe->input_ch->h);
obj_release(dframe->ch);
obj_release(dframe->input_ch);
if (dframe->packet)
__transcode_packet_free(dframe->packet);
g_slice_free1(sizeof(*dframe), dframe);
@ -3008,10 +2995,8 @@ static void dtx_packet_free(struct dtx_packet *dtxp) {
if (dtxp->packet)
__transcode_packet_free(dtxp->packet);
media_packet_release(&dtxp->mp);
if (dtxp->decoder_handler)
obj_put(&dtxp->decoder_handler->h);
if (dtxp->input_handler)
obj_put(&dtxp->input_handler->h);
obj_release(dtxp->decoder_handler);
obj_release(dtxp->input_handler);
g_slice_free1(sizeof(*dtxp), dtxp);
}
static void delay_buffer_stop(struct delay_buffer **pcmbp) {
@ -3240,7 +3225,7 @@ out:
// release all references
if (call) {
rwlock_unlock_r(&call->master_lock);
obj_put(call);
obj_release(call);
log_info_pop();
}
if (dframe)
@ -3490,12 +3475,9 @@ static void __dtx_send_later(struct codec_timer *ct) {
__ssrc_unlock_both(&mp_copy);
rwlock_unlock_r(&call->master_lock);
}
if (call)
obj_put(call);
if (ch)
obj_put(&ch->h);
if (input_ch)
obj_put(&input_ch->h);
obj_release(call);
obj_release(ch);
obj_release(input_ch);
if (dtxp)
dtx_packet_free(dtxp);
media_packet_release(&mp_copy);
@ -3578,22 +3560,15 @@ static void __dtx_send_later(struct codec_timer *ct) {
rwlock_unlock_r(&call->master_lock);
out:
if (call) {
obj_put(call);
log_info_pop();
}
if (ch)
obj_put(&ch->h);
if (input_ch)
obj_put(&input_ch->h);
obj_release(call);
obj_release(ch);
obj_release(input_ch);
if (dtxp)
dtx_packet_free(dtxp);
media_packet_release(&mp_copy);
}
static void __dtx_shutdown(struct dtx_buffer *dtxb) {
if (dtxb->csh)
obj_put(&dtxb->csh->h);
dtxb->csh = NULL;
obj_release(dtxb->csh);
obj_release(dtxb->call);
t_queue_clear_full(&dtxb->packets, dtx_packet_free);
}
@ -3947,7 +3922,7 @@ static struct ssrc_entry *__ssrc_handler_transcode_new(void *p) {
return &ch->h;
err:
obj_put(&ch->h);
obj_release(ch);
return NULL;
}
static struct ssrc_entry *__ssrc_handler_decode_new(void *p) {
@ -3973,7 +3948,7 @@ static struct ssrc_entry *__ssrc_handler_decode_new(void *p) {
return &ch->h;
err:
obj_put(&ch->h);
obj_release(ch);
return NULL;
}
static int __encoder_flush(encoder_t *enc, void *u1, void *u2) {
@ -4260,7 +4235,7 @@ static int packet_decoded_common(decoder_t *decoder, AVFrame *frame, void *u1, v
discard:
av_frame_free(&frame);
obj_put(&new_ch->h);
obj_release(new_ch);
return 0;
}
@ -4581,7 +4556,7 @@ static int handler_func_inject_dtmf(struct codec_handler *h, struct media_packet
return 0;
decoder_input_data(ch->decoder, &mp->payload, mp->rtp->timestamp,
h->packet_decoded, ch, mp);
obj_put(&ch->h);
obj_release(ch);
return 0;
}
@ -5831,8 +5806,7 @@ bool codec_store_is_full_answer(const struct codec_store *src, const struct code
static void __codec_timer_callback_free(struct timer_callback *cb) {
if (cb->call)
obj_put(cb->call);
obj_release(cb->call);
}
static void __codec_timer_callback_fire(struct codec_timer *ct) {
struct timer_callback *cb = (void *) ct;
@ -5863,8 +5837,8 @@ static void codec_timers_run(void *p) {
#ifdef WITH_TRANSCODING
static void transcode_job_free(struct transcode_job *j) {
media_packet_release(&j->mp);
obj_put(&j->ch->h);
obj_put(&j->input_ch->h);
obj_release(j->ch);
obj_release(j->input_ch);
if (j->packet)
__transcode_packet_free(j->packet);
g_free(j);

Write Preview
Loading…
Cancel
Save