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

for bug #249, simplify the macro, 0 to disable chunk stream cache.

Browse source
This commit is contained in:
winlin 2014-12-04 15:49:24 +08:00
parent 159ef3823c
commit 57f844b636
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/core/srs_core_performance.hpp
View file

@ -75,6 +75,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* how many chunk stream to cache, [0, N]. * how many chunk stream to cache, [0, N].
* to imporove about 10% performance when chunk size small, and 5% for large chunk. * to imporove about 10% performance when chunk size small, and 5% for large chunk.
* @see https://github.com/winlinvip/simple-rtmp-server/issues/249 * @see https://github.com/winlinvip/simple-rtmp-server/issues/249
* @remark 0 to disable the chunk stream cache.
*/ */
#define SRS_PERF_CHUNK_STREAM_CACHE 16 #define SRS_PERF_CHUNK_STREAM_CACHE 16

8
trunk/src/rtmp/srs_protocol_stack.cpp
View file

@ -418,7 +418,10 @@ SrsProtocol::SrsProtocol(ISrsProtocolReaderWriter* io)
warned_c0c3_cache_dry = false; warned_c0c3_cache_dry = false;
auto_response_when_recv = true; auto_response_when_recv = true;
cs_cache = new SrsChunkStream*[SRS_PERF_CHUNK_STREAM_CACHE]; cs_cache = NULL;
if (SRS_PERF_CHUNK_STREAM_CACHE > 0) {
cs_cache = new SrsChunkStream*[SRS_PERF_CHUNK_STREAM_CACHE];
}
for (int cid = 0; cid < SRS_PERF_CHUNK_STREAM_CACHE; cid++) { for (int cid = 0; cid < SRS_PERF_CHUNK_STREAM_CACHE; cid++) {
SrsChunkStream* cs = new SrsChunkStream(cid); SrsChunkStream* cs = new SrsChunkStream(cid);
// set the perfer cid of chunk, // set the perfer cid of chunk,
@ -1102,6 +1105,9 @@ int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg)
} }
srs_verbose("read basic header success. fmt=%d, cid=%d", fmt, cid); srs_verbose("read basic header success. fmt=%d, cid=%d", fmt, cid);
// the cid must not negative.
srs_assert(cid >= 0);
// once we got the chunk message header, // once we got the chunk message header,
// that is there is a real message in cache, // that is there is a real message in cache,
// increase the timeout to got it. // increase the timeout to got it.