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 comments for SrsMessageArray. 2.0.25

Browse source
This commit is contained in:
winlin 2014-11-19 10:44:50 +08:00
parent df35f75df1
commit 5f48d4f566
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -498,6 +498,7 @@ int SrsEdgeForwarder::cycle()
} }
// forward all messages. // forward all messages.
// each msg in msgs.msgs must be free, for the SrsMessageArray never free them.
int count = 0; int count = 0;
if ((ret = queue->dump_packets(msgs.max, msgs.msgs, count)) != ERROR_SUCCESS) { if ((ret = queue->dump_packets(msgs.max, msgs.msgs, count)) != ERROR_SUCCESS) {
srs_error("get message to push to origin failed. ret=%d", ret); srs_error("get message to push to origin failed. ret=%d", ret);
@ -522,7 +523,7 @@ int SrsEdgeForwarder::cycle()
continue; continue;
} }
// all msgs to forward to origin. // sendout messages, all messages are freed by send_and_free_messages().
if ((ret = client->send_and_free_messages(msgs.msgs, count, stream_id)) != ERROR_SUCCESS) { if ((ret = client->send_and_free_messages(msgs.msgs, count, stream_id)) != ERROR_SUCCESS) {
srs_error("edge publish push message to server failed. ret=%d", ret); srs_error("edge publish push message to server failed. ret=%d", ret);
return ret; return ret;

3
trunk/src/app/srs_app_forward.cpp
View file

@ -416,6 +416,7 @@ int SrsForwarder::forward()
} }
// forward all messages. // forward all messages.
// each msg in msgs.msgs must be free, for the SrsMessageArray never free them.
int count = 0; int count = 0;
if ((ret = queue->dump_packets(msgs.max, msgs.msgs, count)) != ERROR_SUCCESS) { if ((ret = queue->dump_packets(msgs.max, msgs.msgs, count)) != ERROR_SUCCESS) {
srs_error("get message to forward failed. ret=%d", ret); srs_error("get message to forward failed. ret=%d", ret);
@ -438,7 +439,7 @@ int SrsForwarder::forward()
continue; continue;
} }
// all msgs to forward. // sendout messages, all messages are freed by send_and_free_messages().
if ((ret = client->send_and_free_messages(msgs.msgs, count, stream_id)) != ERROR_SUCCESS) { if ((ret = client->send_and_free_messages(msgs.msgs, count, stream_id)) != ERROR_SUCCESS) {
srs_error("forwarder messages to server failed. ret=%d", ret); srs_error("forwarder messages to server failed. ret=%d", ret);
return ret; return ret;

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

@ -558,6 +558,7 @@ int SrsRtmpConn::playing(SrsSource* source)
pithy_print.elapse(); pithy_print.elapse();
// get messages from consumer. // get messages from consumer.
// each msg in msgs.msgs must be free, for the SrsMessageArray never free them.
int count = 0; int count = 0;
if ((ret = consumer->dump_packets(msgs.max, msgs.msgs, count)) != ERROR_SUCCESS) { if ((ret = consumer->dump_packets(msgs.max, msgs.msgs, count)) != ERROR_SUCCESS) {
srs_error("get messages from consumer failed. ret=%d", ret); srs_error("get messages from consumer failed. ret=%d", ret);
@ -591,9 +592,7 @@ int SrsRtmpConn::playing(SrsSource* source)
} }
} }
// sendout messages // sendout messages, all messages are freed by send_and_free_messages().
// @remark, becareful, all msgs must be free explicitly,
// free by send_and_free_message or srs_freep.
if (count > 0) { if (count > 0) {
// no need to assert msg, for the rtmp will assert it. // no need to assert msg, for the rtmp will assert it.
if ((ret = rtmp->send_and_free_messages(msgs.msgs, count, res->stream_id)) != ERROR_SUCCESS) { if ((ret = rtmp->send_and_free_messages(msgs.msgs, count, res->stream_id)) != ERROR_SUCCESS) {

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 24 #define VERSION_REVISION 25
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server" #define RTMP_SIG_SRS_ROLE "origin/edge server"

3
trunk/src/rtmp/srs_protocol_msg_array.cpp
View file

@ -40,6 +40,9 @@ SrsMessageArray::SrsMessageArray(int max_msgs)
SrsMessageArray::~SrsMessageArray() SrsMessageArray::~SrsMessageArray()
{ {
// we just free the msgs itself,
// both delete and delete[] is ok,
// for each msg in msgs is already freed by send_and_free_messages.
srs_freep(msgs); srs_freep(msgs);
} }