external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine autofree, only free object, never free arrays

Browse source
This commit is contained in:
winlin 2014-05-14 09:41:41 +08:00
parent 300f264e92
commit dc66c525fd
17 changed files with 160 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

22
trunk/src/app/srs_app_bandwidth.cpp
View file

@ -203,8 +203,8 @@ int SrsBandwidth::do_bandwidth_check()
srs_info("expect final message failed. ret=%d", ret);
return ERROR_SUCCESS;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsBandwidthPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get final message success.");
if (pkt->is_flash_final()) {
@ -248,8 +248,8 @@ int SrsBandwidth::check_play(
srs_error("expect bandwidth message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsBandwidthPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get bandwidth message succes.");
if (pkt->is_starting_play()) {
@ -329,8 +329,8 @@ int SrsBandwidth::check_play(
srs_error("expect bandwidth message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsBandwidthPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get bandwidth message succes.");
if (pkt->is_stopped_play()) {
@ -372,8 +372,8 @@ int SrsBandwidth::check_publish(
srs_error("expect bandwidth message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsBandwidthPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get bandwidth message succes.");
if (pkt->is_starting_publish()) {
@ -392,7 +392,7 @@ int SrsBandwidth::check_publish(
srs_error("recv message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsMessage, msg);
publish_bytes = rtmp->get_recv_bytes();
@ -440,8 +440,8 @@ int SrsBandwidth::check_publish(
srs_error("expect bandwidth message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsBandwidthPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsBandwidthPacket, pkt);
srs_info("get bandwidth message succes.");
if (pkt->is_stopped_publish()) {

2
trunk/src/app/srs_app_config.cpp
View file

@ -488,7 +488,7 @@ int SrsConfig::reload()
srs_info("config reloader parse file success.");
SrsConfDirective* old_root = root;
SrsAutoFree(SrsConfDirective, old_root, false);
SrsAutoFree(SrsConfDirective, old_root);
root = conf.root;
conf.root = NULL;

8
trunk/src/app/srs_app_dvr.cpp
View file

@ -446,7 +446,7 @@ int SrsDvrPlan::on_meta_data(SrsOnMetaDataPacket* metadata)
if ((ret = metadata->encode(size, payload)) != ERROR_SUCCESS) {
return ret;
}
SrsAutoFree(char, payload, true);
SrsAutoFree(char, payload);
if ((ret = enc->write_metadata(payload, size)) != ERROR_SUCCESS) {
return ret;
@ -835,7 +835,7 @@ int SrsDvrHssPlan::on_meta_data(SrsOnMetaDataPacket* metadata)
if ((ret = metadata->encode(size, payload)) != ERROR_SUCCESS) {
return ret;
}
SrsAutoFree(char, payload, true);
SrsAutoFree(char, payload);
if ((ret = enc.write_metadata(payload, size)) != ERROR_SUCCESS) {
return ret;
@ -1002,7 +1002,7 @@ int SrsDvr::on_audio(SrsSharedPtrMessage* audio)
{
int ret = ERROR_SUCCESS;
SrsAutoFree(SrsSharedPtrMessage, audio, false);
SrsAutoFree(SrsSharedPtrMessage, audio);
if ((ret = plan->on_audio(audio)) != ERROR_SUCCESS) {
return ret;
@ -1015,7 +1015,7 @@ int SrsDvr::on_video(SrsSharedPtrMessage* video)
{
int ret = ERROR_SUCCESS;
SrsAutoFree(SrsSharedPtrMessage, video, false);
SrsAutoFree(SrsSharedPtrMessage, video);
if ((ret = plan->on_video(video)) != ERROR_SUCCESS) {
return ret;

6
trunk/src/app/srs_app_edge.cpp
View file

@ -186,7 +186,7 @@ int SrsEdgeIngester::ingest()
srs_verbose("edge loop recv message. ret=%d", ret);
srs_assert(msg);
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsMessage, msg);
if ((ret = process_publish_message(msg)) != ERROR_SUCCESS) {
return ret;
@ -234,7 +234,7 @@ int SrsEdgeIngester::process_publish_message(SrsMessage* msg)
srs_error("decode onMetaData message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsPacket, pkt, false);
SrsAutoFree(SrsPacket, pkt);
if (dynamic_cast<SrsOnMetaDataPacket*>(pkt)) {
SrsOnMetaDataPacket* metadata = dynamic_cast<SrsOnMetaDataPacket*>(pkt);
@ -527,7 +527,7 @@ int SrsEdgeForwarder::proxy(SrsMessage* msg)
// TODO: FIXME: use utility to copy msg to shared ptr msg.
SrsSharedPtrMessage* copy = new SrsSharedPtrMessage();
SrsAutoFree(SrsSharedPtrMessage, copy, false);
SrsAutoFree(SrsSharedPtrMessage, copy);
if ((ret = copy->initialize(msg)) != ERROR_SUCCESS) {
srs_error("initialize the msg failed. ret=%d", ret);
return ret;

4
trunk/src/app/srs_app_hls.cpp
View file

@ -1388,7 +1388,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* audio)
{
int ret = ERROR_SUCCESS;
SrsAutoFree(SrsSharedPtrMessage, audio, false);
SrsAutoFree(SrsSharedPtrMessage, audio);
if (!hls_enabled) {
return ret;
@ -1432,7 +1432,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* video)
{
int ret = ERROR_SUCCESS;
SrsAutoFree(SrsSharedPtrMessage, video, false);
SrsAutoFree(SrsSharedPtrMessage, video);
if (!hls_enabled) {
return ret;

2
trunk/src/app/srs_app_http_api.cpp
View file

@ -532,7 +532,7 @@ int SrsHttpApi::do_cycle()
srs_assert(req->is_complete());
// always free it in this scope.
SrsAutoFree(SrsHttpMessage, req, false);
SrsAutoFree(SrsHttpMessage, req);
// ok, handle http request.
if ((ret = process_request(&skt, req)) != ERROR_SUCCESS) {

4
trunk/src/app/srs_app_http_conn.cpp
View file

@ -228,7 +228,7 @@ int SrsHttpVhost::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
::lseek(fd, 0, SEEK_SET);
char* buf = new char[length];
SrsAutoFree(char, buf, true);
SrsAutoFree(char, buf);
// TODO: FIXME: use st_read.
if (::read(fd, buf, length) < 0) {
@ -352,7 +352,7 @@ int SrsHttpConn::do_cycle()
srs_assert(req->is_complete());
// always free it in this scope.
SrsAutoFree(SrsHttpMessage, req, false);
SrsAutoFree(SrsHttpMessage, req);
// ok, handle http request.
if ((ret = process_request(&skt, req)) != ERROR_SUCCESS) {

16
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -460,7 +460,7 @@ int SrsRtmpConn::playing(SrsSource* source)
}
srs_assert(consumer != NULL);
SrsAutoFree(SrsConsumer, consumer, false);
SrsAutoFree(SrsConsumer, consumer);
srs_verbose("consumer created success.");
rtmp->set_recv_timeout(SRS_PULSE_TIMEOUT_US);
@ -595,7 +595,7 @@ int SrsRtmpConn::fmle_publish(SrsSource* source)
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsMessage, msg);
pithy_print.elapse();
@ -614,7 +614,7 @@ int SrsRtmpConn::fmle_publish(SrsSource* source)
return ret;
}
SrsAutoFree(SrsPacket, pkt, false);
SrsAutoFree(SrsPacket, pkt);
if (dynamic_cast<SrsFMLEStartPacket*>(pkt)) {
SrsFMLEStartPacket* unpublish = dynamic_cast<SrsFMLEStartPacket*>(pkt);
@ -671,7 +671,7 @@ int SrsRtmpConn::flash_publish(SrsSource* source)
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsMessage, msg);
pithy_print.elapse();
@ -690,7 +690,7 @@ int SrsRtmpConn::flash_publish(SrsSource* source)
return ret;
}
SrsAutoFree(SrsPacket, pkt, false);
SrsAutoFree(SrsPacket, pkt);
// flash unpublish.
// TODO: maybe need to support republish.
@ -754,7 +754,7 @@ int SrsRtmpConn::process_publish_message(SrsSource* source, SrsMessage* msg, boo
srs_error("decode onMetaData message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsPacket, pkt, false);
SrsAutoFree(SrsPacket, pkt);
if (dynamic_cast<SrsOnMetaDataPacket*>(pkt)) {
SrsOnMetaDataPacket* metadata = dynamic_cast<SrsOnMetaDataPacket*>(pkt);
@ -781,7 +781,7 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg
srs_verbose("ignore all empty message.");
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsMessage, msg);
if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) {
srs_info("ignore all message except amf0/amf3 command.");
@ -795,7 +795,7 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg
}
srs_info("decode the amf0/amf3 command packet success.");
SrsAutoFree(SrsPacket, pkt, false);
SrsAutoFree(SrsPacket, pkt);
// for jwplayer/flowplayer, which send close as pause message.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/6

4
trunk/src/app/srs_app_source.cpp
View file

@ -898,7 +898,7 @@ int SrsSource::on_audio(SrsMessage* audio)
int ret = ERROR_SUCCESS;
SrsSharedPtrMessage* msg = new SrsSharedPtrMessage();
SrsAutoFree(SrsSharedPtrMessage, msg, false);
SrsAutoFree(SrsSharedPtrMessage, msg);
if ((ret = msg->initialize(audio)) != ERROR_SUCCESS) {
srs_error("initialize the audio failed. ret=%d", ret);
return ret;
@ -988,7 +988,7 @@ int SrsSource::on_video(SrsMessage* video)
int ret = ERROR_SUCCESS;
SrsSharedPtrMessage* msg = new SrsSharedPtrMessage();
SrsAutoFree(SrsSharedPtrMessage, msg, false);
SrsAutoFree(SrsSharedPtrMessage, msg);
if ((ret = msg->initialize(video)) != ERROR_SUCCESS) {
srs_error("initialize the video failed. ret=%d", ret);
return ret;