Merge branch 'develop' into feature/3369

README.md

@@ -122,6 +122,7 @@ distributed under their [licenses](https://ossrs.io/lts/en-us/license).
 
 ## Releases
 
+* 2024-07-04, [Release v6.0-d6](https://github.com/ossrs/srs/releases/tag/v6.0-d6), v6.0-d6, 6.0 dev6, v6.0.134, 168904 lines.
 * 2024-06-15, [Release v6.0-d5](https://github.com/ossrs/srs/releases/tag/v6.0-d5), v6.0-d5, 6.0 dev5, v6.0.129, 168454 lines.
 * 2024-02-15, [Release v6.0-d4](https://github.com/ossrs/srs/releases/tag/v6.0-d4), v6.0-d4, 6.0 dev4, v6.0.113, 167695 lines.
 * 2023-11-19, [Release v6.0-d3](https://github.com/ossrs/srs/releases/tag/v6.0-d3), v6.0-d3, 6.0 dev3, v6.0.101, 167560 lines.

trunk/3rdparty/srs-bench/README.md

@@ -33,6 +33,8 @@ cd srs/trunk && ./configure --h265=on --gb28181=on && make &&
 ./objs/srs -c conf/console.conf
 ```
 
+> Note: Use valgrind to check memory leak, please use `valgrind --leak-check=full ./objs/srs -c conf/console.conf >/dev/null` to start SRS.
+
 具体场景，请按下面的操作启动测试。
 
 ## Player for WHEP

trunk/3rdparty/st-srs/Makefile

@@ -191,6 +191,9 @@ endif
 #
 # make EXTRA_CFLAGS=-DDEBUG_STATS
 #
+# or cache the stack and reuse it:
+# make EXTRA_CFLAGS=-DMD_CACHE_STACK
+#
 # or enable the coverage for utest:
 # make UTEST_FLAGS="-fprofile-arcs -ftest-coverage"
 #

trunk/3rdparty/st-srs/stk.c

@@ -57,13 +57,15 @@ __thread int _st_num_free_stacks = 0;
 __thread int _st_randomize_stacks = 0;
 
 static char *_st_new_stk_segment(int size);
+static void _st_delete_stk_segment(char *vaddr, int size);
 
 _st_stack_t *_st_stack_new(int stack_size)
 {
     _st_clist_t *qp;
     _st_stack_t *ts;
     int extra;
-
+
+#ifdef MD_CACHE_STACK
     for (qp = _st_free_stacks.next; qp != &_st_free_stacks; qp = qp->next) {
         ts = _ST_THREAD_STACK_PTR(qp);
         if (ts->stk_size >= stack_size) {
@@ -75,11 +77,31 @@ _st_stack_t *_st_stack_new(int stack_size)
             return ts;
         }
     }
+#endif
+
+    extra = _st_randomize_stacks ? _ST_PAGE_SIZE : 0;
+#ifndef MD_CACHE_STACK
+    for (qp = _st_free_stacks.next; qp != &_st_free_stacks;) {
+        ts = _ST_THREAD_STACK_PTR(qp);
+        // Before qp is freed, move to next one, because the qp will be freed when free the ts.
+        qp = qp->next;
+
+        ST_REMOVE_LINK(&ts->links);
+        _st_num_free_stacks--;
+
+#if defined(DEBUG) && !defined(MD_NO_PROTECT)
+        mprotect(ts->vaddr, REDZONE, PROT_READ | PROT_WRITE);
+        mprotect(ts->stk_top + extra, REDZONE, PROT_READ | PROT_WRITE);
+#endif
+
+        _st_delete_stk_segment(ts->vaddr, ts->vaddr_size);
+        free(ts);
+    }
+#endif
 
     /* Make a new thread stack object. */
     if ((ts = (_st_stack_t *)calloc(1, sizeof(_st_stack_t))) == NULL)
         return NULL;
-    extra = _st_randomize_stacks ? _ST_PAGE_SIZE : 0;
     ts->vaddr_size = stack_size + 2*REDZONE + extra;
     ts->vaddr = _st_new_stk_segment(ts->vaddr_size);
     if (!ts->vaddr) {
@@ -114,7 +136,7 @@ void _st_stack_free(_st_stack_t *ts)
 {
     if (!ts)
         return;
-    
+
     /* Put the stack on the free list */
     ST_APPEND_LINK(&ts->links, _st_free_stacks.prev);
     _st_num_free_stacks++;
@@ -152,8 +174,6 @@ static char *_st_new_stk_segment(int size)
 }
 
 
-/* Not used */
-#if 0
 void _st_delete_stk_segment(char *vaddr, int size)
 {
 #ifdef MALLOC_STACK
@@ -162,7 +182,6 @@ void _st_delete_stk_segment(char *vaddr, int size)
     (void) munmap(vaddr, size);
 #endif
 }
-#endif
 
 int st_randomize_stacks(int on)
 {

trunk/doc/CHANGELOG.md

@@ -7,6 +7,10 @@ The changelog for SRS.
 <a name="v6-changes"></a>
 
 ## SRS 6.0 Changelog
+* v6.0, 2024-07-04, Merge [#4106](https://github.com/ossrs/srs/pull/4106): SmartPtr: Fix SRT source memory leaking. v6.0.134 (#4106)
+* v6.0, 2024-06-29, Merge [#4077](https://github.com/ossrs/srs/pull/4077): Fix misspelling error in app config. v6.0.133 (#4077)
+* v6.0, 2024-06-29, Merge [#4102](https://github.com/ossrs/srs/pull/4102): SmartPtr: Support detect memory leak by valgrind. v6.0.132 (#4102)
+* v6.0, 2024-06-21, Merge [#4100](https://github.com/ossrs/srs/pull/4100): Fix security scan problems. v6.0.131 (#4100)
 * v6.0, 2024-06-21, Merge [#4097](https://github.com/ossrs/srs/pull/4097): SmartPtr: Support load test for source by srs-bench. v6.0.130 (#4097)
 * v6.0, 2024-06-15, Merge [#4089](https://github.com/ossrs/srs/pull/4089): SmartPtr: Support shared ptr for live source. v6.0.129 (#4089)
 * v6.0, 2024-06-14, Merge [#4085](https://github.com/ossrs/srs/pull/4085): SmartPtr: Support shared ptr for RTC source. v6.0.128 (#4085)

trunk/research/st/.gitignore

@@ -2,3 +2,4 @@ udp-server
 udp-client
 cost
 cost.log
+thread-join

trunk/research/st/thread-join.cpp

@@ -0,0 +1,36 @@
+/*
+g++ thread-join.cpp ../../objs/st/libst.a -g -O0 -o thread-join && ./thread-join
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include "../../objs/st/st.h"
+
+void* pfn(void* arg) {
+    printf("pid=%d, coroutine is ok\n", ::getpid());
+    return NULL;
+}
+
+int main(int argc, char** argv) {
+    st_init();
+
+    printf("pid=%d, create coroutine #1\n", ::getpid());
+    st_thread_t thread = st_thread_create(pfn, NULL, 1, 0);
+    st_thread_join(thread, NULL);
+
+    st_usleep(100 * 1000);
+
+    printf("pid=%d, create coroutine #2\n", ::getpid());
+    thread = st_thread_create(pfn, NULL, 1, 0);
+    st_thread_join(thread, NULL);
+
+    st_usleep(100 * 1000);
+
+    printf("pid=%d, create coroutine #3\n", ::getpid());
+    thread = st_thread_create(pfn, NULL, 1, 0);
+    st_thread_join(thread, NULL);
+
+    printf("done\n");
+    st_thread_exit(NULL);
+    return 0;
+}
+