SmartPtr: Support load test for source by srs-bench. v6.0.130 by winlinvip · Pull Request #4097 · ossrs/srs

winlinvip · 2024-06-19T09:47:00Z

Add live benchmark support in srs-bench, which only connects and disconnects without any media transport, to test source creation and disposal and verify source memory leaks.
SmartPtr: Support cleanup of HTTP-FLV stream. Unregister the HTTP-FLV handler for the pattern and clean up the objects and resources.
Support benchmarking RTMP/SRT with srs-bench by integrating the gosrt and oryx RTMP libraries.
Refine SRT and RTC sources by using a timer to clean up the sources, following the same strategy as the Live source.

Co-authored-by: Haibo Chen 495810242@qq.com
Co-authored-by: Jacob Su suzp1984@gmail.com

suzp1984 · 2024-06-19T10:36:22Z

trunk/src/app/srs_app_dash.cpp

+    if (!enabled) {
+        return 0;
+    }
+    return _srs_config->get_dash_dispose(req->vhost) * 1.1;


dash_dispose is not illustrated in full.conf, which can be used as the doc. It's better to add it to full.conf.

Another problem, the default dash_dispose config is 0, or user can config the [hls | dash]_dispose to 0 second, then this cleanup_delay will be 0, is the cleanup_delay has to be keep > 0 ? In this case:
_srs_config->get_dash_dispose(req->vhost) > 0 ? _srs_config->get_dash_dispose(req->vhost) * 1.1 : 1
Let the cleanup_delay at least 1 second.

Add dash_dispose to full.conf.
If user config dispose to 0, this cleanup_delay will return 0, which will be ignored.
It works as expectation. Won't fix.

trunk/src/app/srs_app_source.cpp

suzp1984 · 2024-06-19T12:03:06Z

trunk/conf/full.conf

+        # @remark apply for publisher timeout only, while "etc/init.d/srs stop" always dispose DASH.
+        # Overwrite by env SRS_VHOST_DASH_DASH_DISPOSE for all vhosts.
+        # default: 120
+        dash_dispose 120;


srs/trunk/src/app/srs_app_config.cpp

Lines 6862 to 6866 in e3d74fb

srs_utime_t SrsConfig::get_dash_dispose(std::string vhost)

{

SRS_OVERWRITE_BY_ENV_SECONDS("srs.vhost.dash.dash_dispose"); // SRS_VHOST_DASH_DASH_DISPOSE

static srs_utime_t DEFAULT = 0;

the default value in the code need to match the value here, be careful, change the default value in the srs_app_config may has impact.

The previous default value is 0, but hls dispose defaults to 120. I think it's ok to change to the same.

I didn't notice the dash_dispose default value in srs_app_config.cpp already changed to 120 to match the full.conf. No problem here.

suzp1984 · 2024-06-20T00:36:24Z

trunk/src/protocol/srs_protocol_http_stack.cpp

+    }
+
+    std::string vhost = pattern;
+    if (pattern.at(0) != '/') {


vhosts store the vhost -> ISrsHttpHandler map, but the value, ISrsHttpHandler never used, so is is ok to downgrade the map -> set?
About the code to extract the vhost, they are repeated in:

srs/trunk/src/protocol/srs_protocol_http_stack.cpp

Lines 706 to 712 in e3d74fb

std::string vhost = pattern;

if (pattern.at(0) != '/') {

if (pattern.find("/") != string::npos) {

vhost = pattern.substr(0, pattern.find("/"));

}

vhosts[vhost] = handler;

}

Maybe a another method to get the vhost from pattern.

Need another PR to refine the code, because it not about the smart ptr.

Won't fix in this PR.

suzp1984 · 2024-06-20T01:04:50Z

trunk/src/protocol/srs_protocol_http_stack.cpp

@@ -691,14 +691,12 @@ srs_error_t SrsHttpServeMux::handle(std::string pattern, ISrsHttpHandler* handle
    srs_assert(handler);

    if (pattern.empty()) {
-        srs_freep(handler);


The ISrsHttpHander memory release still not perfect.
For a normal process, the ISrsHttpHandler is created in:

srs/trunk/src/app/srs_app_http_stream.cpp

Line 991 in e3d74fb

entry->stream = new SrsLiveStream(r, entry->cache);

and released in

srs/trunk/src/protocol/srs_protocol_http_stack.cpp

Lines 624 to 627 in e3d74fb

SrsHttpMuxEntry::~SrsHttpMuxEntry()

{

srs_freep(handler);

}

I would think if it's possible to manager it in same place, SrsLiveEntry in this case. I see the auto release in SrsHttpStreamServer::http_unmount(SrsRequest* r), the ISrsHttpHander, or SrsLiveStream, seems freed twice in SrsHttpMuxEntry destructor and SrsHttpStreamServer::http_unmount

And For exception cases, like here, handler not freed here, but this exception not handled well, the handler not released below at least.

srs/trunk/src/app/srs_app_http_stream.cpp

Lines 1008 to 1010 in e3d74fb

if ((err = mux.handle(mount, entry->stream)) != srs_success) {

return srs_error_wrap(err, "http: mount flv stream for vhost=%s failed", sid.c_str());

}

First, in http_unmount, won't free it twice, please check it carefully.

Second, if mux.handle failed, it won't free the stream, but the http_unmount will do.

So I think it's ok. Won't fix.

trunk/src/app/srs_app_http_stream.cpp

suzp1984 · 2024-06-20T01:16:27Z

trunk/src/app/srs_app_http_stream.cpp

+    sflvs.erase(it);
+
+    SrsLiveStream* stream = entry->stream;
+    SrsAutoFree(SrsLiveStream, stream);


the SrsAutoFree not good enough here, when stream being released, stream = NULL, but the entry->stream still hold an not NULL pointer, but it's memory already released.

So is it a good idea to let the SrsLiveEntry destructor to free stream, cache?

I think it's ok, because the entry is removed and freed:

SrsLiveEntry* entry = it->second; SrsAutoFree(SrsLiveEntry, entry); streamHandlers.erase(it); SrsLiveStream* stream = entry->stream; SrsAutoFree(SrsLiveStream, stream); SrsBufferCache* cache = entry->cache; SrsAutoFree(SrsBufferCache, cache);

Won't fix.

trunk/src/app/srs_app_hls.cpp

## Cause dash auto dispose is configured by seconds, but the code compare by usecond, 1 second = 1,000,000 useconds. releated to #4097 Bug introduced after #4097 supported Dash auto dispose after a timeout without media data. ## How to reproduce 1. `./objs/srs -c conf/dash.conf` 2. publish a rtmp stream. 3. play dash stream. -> no dash stream, always 404 error. --------- Co-authored-by: winlin <winlinvip@gmail.com>

winlinvip added 6 commits June 17, 2024 19:09

SmartPtr: Support test verification.

857625a

SmartPtr: Support cleanup delay for live source.

0418fd9

SmartPtr: Support cleanup HTTP-FLV stream.

faea69e

SmartPtr: Support benchmark SRT source.

d33099e

SmartPtr: Refine SRT source manager.

1829a07

SmartPtr: Support RTC reconnect load test.

15a9427

winlinvip requested review from duiniuluantanqin and suzp1984 June 19, 2024 09:47

winlinvip added the EnglishNative This issue is conveyed exclusively in English. label Jun 19, 2024

winlinvip marked this pull request as ready for review June 19, 2024 09:47

This was linked to issues Jun 19, 2024

SrsLiveSource cleanup is different to SrsSrtSource #4093

Closed

Source: The memory leak seems still exist #4096

Closed

suzp1984 reviewed Jun 19, 2024

View reviewed changes

DASH: Add config description to full.conf.

ef433a0

suzp1984 reviewed Jun 19, 2024

View reviewed changes

suzp1984 reviewed Jun 20, 2024

View reviewed changes

trunk/src/app/srs_app_http_stream.cpp Outdated Show resolved Hide resolved

suzp1984 reviewed Jun 20, 2024

View reviewed changes

Refine code.

a49f089

winlinvip force-pushed the feature/smart-ptr-test branch from 253bfe6 to a49f089 Compare June 20, 2024 03:09

Fix utest fail.

28422bf

duiniuluantanqin reviewed Jun 20, 2024

View reviewed changes

trunk/src/app/srs_app_hls.cpp Show resolved Hide resolved

Refine code.

8cd4e92

suzp1984 approved these changes Jun 20, 2024

View reviewed changes

Update release to v6.0.130

45c1bb3

winlinvip changed the title ~~SmartPtr: Support load test for source by srs-bench~~ SmartPtr: Support load test for source by srs-bench. v6.0.130 Jun 20, 2024

winlinvip added the RefinedByAI Refined by AI/GPT. label Jun 20, 2024

winlinvip merged commit 1f9309a into ossrs:develop Jun 20, 2024

suzp1984 mentioned this pull request Jul 10, 2024

DASH: Fix time unit error for disposing. v6.0.138 #4111

Merged

suzp1984 mentioned this pull request Aug 29, 2024

Fix: Remove redundant enabled checks in HLS/DASH cleanup to prevent resource leaks. v6.0.173 v7.0.54 #4161

Merged

winlinvip mentioned this pull request Oct 31, 2025

About the smart pointer of SRS. #4551

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

SmartPtr: Support load test for source by srs-bench. v6.0.130#4097

SmartPtr: Support load test for source by srs-bench. v6.0.130#4097
winlinvip merged 11 commits intoossrs:developfrom
winlinvip:feature/smart-ptr-test

winlinvip commented Jun 19, 2024 •

edited

Loading

Uh oh!

suzp1984 Jun 19, 2024

Uh oh!

winlinvip Jun 19, 2024 •

edited

Loading

Uh oh!

Uh oh!

suzp1984 Jun 19, 2024

Uh oh!

winlinvip Jun 19, 2024

Uh oh!

suzp1984 Jun 20, 2024

Uh oh!

suzp1984 Jun 20, 2024 •

edited

Loading

Uh oh!

winlinvip Jun 20, 2024 •

edited

Loading

Uh oh!

suzp1984 Jun 20, 2024 •

edited

Loading

Uh oh!

winlinvip Jun 20, 2024 •

edited

Loading

Uh oh!

Uh oh!

suzp1984 Jun 20, 2024

Uh oh!

winlinvip Jun 20, 2024 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

	srs_utime_t SrsConfig::get_dash_dispose(std::string vhost)
	{
	SRS_OVERWRITE_BY_ENV_SECONDS("srs.vhost.dash.dash_dispose"); // SRS_VHOST_DASH_DASH_DISPOSE

	static srs_utime_t DEFAULT = 0;

	std::string vhost = pattern;
	if (pattern.at(0) != '/') {
	if (pattern.find("/") != string::npos) {
	vhost = pattern.substr(0, pattern.find("/"));
	}
	vhosts[vhost] = handler;
	}

	if ((err = mux.handle(mount, entry->stream)) != srs_success) {
	return srs_error_wrap(err, "http: mount flv stream for vhost=%s failed", sid.c_str());
	}

Uh oh!

Conversation

winlinvip commented Jun 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

suzp1984 Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

winlinvip Jun 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

suzp1984 Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

winlinvip Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

suzp1984 Jun 20, 2024

Choose a reason for hiding this comment

Uh oh!

suzp1984 Jun 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

winlinvip Jun 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

suzp1984 Jun 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

winlinvip Jun 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

suzp1984 Jun 20, 2024

Choose a reason for hiding this comment

Uh oh!

winlinvip Jun 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

winlinvip commented Jun 19, 2024 •

edited

Loading

winlinvip Jun 19, 2024 •

edited

Loading

suzp1984 Jun 20, 2024 •

edited

Loading

winlinvip Jun 20, 2024 •

edited

Loading

suzp1984 Jun 20, 2024 •

edited

Loading

winlinvip Jun 20, 2024 •

edited

Loading

winlinvip Jun 20, 2024 •

edited

Loading