Fix #2606: Memory leak for RTMP client, pick from 4.0. v3.0.170

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   k8s:
-    name: release-k8s
+    name: actions-release-k8s
     runs-on: ubuntu-20.04
 
     steps:
@@ -32,7 +32,7 @@ jobs:
         shell: bash
         run: |
           echo "Release ossrs/srs:$SRS_TAG"
-          docker build --tag ossrs/srs:$SRS_TAG trunk
+          docker build --tag ossrs/srs:$SRS_TAG -f trunk/Dockerfile .
 
       - name: Login docker hub
         uses: docker/login-action@v1

.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: "Test"
+
+on: [push, pull_request]
+
+jobs:
+  utest:
+    name: actions-test-utest
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      ################################################################
+      # Tests
+      - name: Build test image
+        run: docker build --tag srs:test -f trunk/Dockerfile.test .
+      # For utest
+      - name: Run SRS utest
+        run: docker run --rm srs:test bash -c 'make && ./objs/srs_utest'
+  coverage:
+    name: actions-test-coverage
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      ################################################################
+      # Tests
+      - name: Build coverage image
+        run: docker build --tag srs:cov -f trunk/Dockerfile.cov .
+      # For coverage
+      - name: Run SRS covergae
+        if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/pull/') }}
+        run: |
+          # The hash of commit.
+          SRS_SHA=${{ github.sha }}
+          # Note that the root of SRS, must contains .git, for report fixing.
+          SRS_PROJECT=/srs
+          # The github.ref is, for example, refs/heads/3.0release
+          SRS_BRANCH=$(echo ${{ github.ref }}| awk -F 'refs/heads/' '{print $2}'| awk -F '/' '{print $1}')
+          # The github.ref is, for example, refs/pull/2536/merge
+          SRS_PR=$(echo ${{ github.ref }}| awk -F 'refs/pull/' '{print $2}'| awk -F '/' '{print $1}')
+          echo "For ref=${{ github.ref }}, sha=${{ github.sha }}, SRS_BRANCH=$SRS_BRANCH, SRS_PR=$SRS_PR, SRS_SHA=$SRS_SHA, SRS_PROJECT=$SRS_PROJECT"
+          docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
+            srs:cov bash -c 'make && ./objs/srs_utest && bash auto/coverage.sh'

README.md

@@ -1,7 +1,8 @@
 # SRS(Simple Realtime Server)
 
 ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/srs3)
-[![](https://circleci.com/gh/ossrs/srs/tree/3.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/3.0release)
+[![](https://github.com/ossrs/srs/actions/workflows/test.yml/badge.svg?branch=3.0release)](https://github.com/ossrs/srs/actions?query=workflow%3ATest+branch%3A3.0release)
+[![](https://github.com/ossrs/srs/actions/workflows/release.yml/badge.svg)](https://github.com/ossrs/srs/actions?query=workflow%3ARelease)
 [![](https://codecov.io/gh/ossrs/srs/branch/3.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/3.0release)
 [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
 
@@ -129,6 +130,7 @@ Other important wiki:
 
 ## V3 changes
 
+* v3.0, 2021-10-08, Fix [#2606](https://github.com/ossrs/srs/issues/2606): Memory leak for RTMP client, pick from 4.0. v3.0.170
 * <strong>v3.0, 2021-08-14, [3.0 release8(3.0.168)](https://github.com/ossrs/srs/releases/tag/v3.0-r8) released. 124469 lines.</strong>
 * <strong>v3.0, 2021-07-04, [3.0 release7(3.0.164)](https://github.com/ossrs/srs/releases/tag/v3.0-r7) released. 123463 lines.</strong>
 * v3.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 3.0.164

trunk/Dockerfile

@@ -4,8 +4,8 @@ FROM ossrs/srs:dev AS build
 RUN yum install -y gcc make gcc-c++ patch unzip perl git
 
 # Build and install SRS.
-COPY . /trunk
+COPY . /srs
-WORKDIR /trunk
+WORKDIR /srs/trunk
 RUN ./configure --jobs=2 && make -j2 && make install
 
 # All config files for SRS.
@@ -23,8 +23,8 @@ RUN cp -R research/players /usr/local/srs/objs/nginx/html/
 ############################################################
 FROM centos:7 AS dist
 
-# Expose ports for streaming @see https://github.com/ossrs/srs#ports
+# Expose ports for live streaming
-EXPOSE 1935 1985 8080 8000/udp 10080/udp
+EXPOSE 1935 1985 8080
 
 # FFMPEG 4.1
 COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg

trunk/Dockerfile.cov

@@ -0,0 +1,9 @@
+FROM ossrs/srs:dev
+
+# Install depends tools.
+RUN yum install -y gcc make gcc-c++ patch unzip perl git
+
+# Build and install SRS.
+COPY . /srs
+WORKDIR /srs/trunk
+RUN ./configure --with-utest --gcov --jobs=2 && make -j2

trunk/Dockerfile.test

@@ -0,0 +1,9 @@
+FROM ossrs/srs:dev
+
+# Install depends tools.
+RUN yum install -y gcc make gcc-c++ patch unzip perl git
+
+# Build and install SRS.
+COPY . /srs
+WORKDIR /srs/trunk
+RUN ./configure --with-utest --jobs=2 && make -j2

trunk/auto/coverage.sh

@@ -1,36 +1,35 @@
 #!/bin/bash
 
 # In .circleci/config.yml, generate *.gcno with
-#       ./configure --gcov --without-research --without-librtmp && make
+#       ./configure --gcov --with-utest --without-research --without-librtmp && make
 # and generate *.gcda by
 #       ./objs/srs_utest
 
 # Workdir is objs/cover.
 workdir=`pwd`/objs/cover
 
-# Tool git is required to map the right path.
-git --version >/dev/null 2>&1
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Tool git is required, ret=$ret"; exit $ret; fi
-
 # Create trunk under workdir.
 mkdir -p $workdir && cd $workdir
 ret=$?; if [[ $ret -ne 0 ]]; then echo "Enter workdir failed, ret=$ret"; exit $ret; fi
 
-# Collect all *.gcno and *.gcda to objs/cover.
+CODECOV_ARGS=""
-cd $workdir && (rm -rf src && cp -R ../../src . && cp -R ../src/* src/)
+if [[ $SRS_PROJECT != '' ]]; then
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect *.gcno and *.gcda failed, ret=$ret"; exit $ret; fi
+  # -R root dir  Used when not in git/hg project to identify project root directory
-
+  # -p dir       Project root directory. Also used when preparing gcov
-# Generate *.gcov for coverage.
+  CODECOV_ARGS="$CODECOV_ARGS -R $SRS_PROJECT -p $SRS_PROJECT"
-cd $workdir &&
+fi
-for file in `find src -name "*.cpp"|grep -v utest`; do
+if [[ $SRS_BRANCH != '' ]]; then
-    gcov $file -o `dirname $file`
+  # -B branch    Specify the branch name
-    ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect $file failed, ret=$ret"; exit $ret; fi
+  CODECOV_ARGS="$CODECOV_ARGS -B $SRS_BRANCH"
-done
+fi
-
+if [[ $SRS_SHA != '' ]]; then
-# Cook the gcov files.
+  # -C sha       Specify the commit sha
-cd $workdir &&
+  CODECOV_ARGS="$CODECOV_ARGS -C $SRS_SHA"
-find . -name "*.gcov"|grep -v srs|xargs rm -f
+fi
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Cook gcov files failed, ret=$ret"; exit $ret; fi
+if [[ $SRS_PR != '' ]]; then
+  # -P pr        Specify the pull request number
+  CODECOV_ARGS="$CODECOV_ARGS -P $SRS_PR"
+fi
 
 # Upload report with *.gcov
 # Remark: The file codecov.yml is not neccessary. It literally depends on git.
@@ -41,5 +40,6 @@ ret=$?; if [[ $ret -ne 0 ]]; then echo "Cook gcov files failed, ret=$ret"; exit
 #       https://circleci.com/gh/ossrs/srs/tree/3.0release
 cd $workdir &&
 export CODECOV_TOKEN="493bba46-c468-4e73-8b45-8cdd8ff62d96" &&
-bash <(curl -s https://codecov.io/bash) &&
+bash <(curl -s https://codecov.io/bash) $CODECOV_ARGS &&
 echo "Done" && exit 0
+

trunk/src/app/srs_app_latest_version.cpp

@@ -44,6 +44,8 @@ extern bool _srs_in_docker;
 
 void srs_build_features(stringstream& ss)
 {
+    ss << "&os=linux";
+
     ss << "&docker=" << _srs_in_docker
         << "&packager=" << SRS_AUTO_PACKAGER;
 }

trunk/src/core/srs_core_version3.hpp

@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 168
+#define SRS_VERSION3_REVISION 170
 
 #endif

trunk/src/service/srs_service_rtmp_conn.cpp

@@ -57,6 +57,7 @@ SrsBasicRtmpClient::~SrsBasicRtmpClient()
     close();
     srs_freep(kbps);
     srs_freep(clk);
+    srs_freep(req);
 }
 
 srs_error_t SrsBasicRtmpClient::connect()