kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mod_sofia] Fix memory pool swell under high load.

This commit is contained in:
Andrey Volk 2021-07-21 19:56:19 +03:00
parent 4c04914003
commit a96c0abcf0
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.drone.yml
View File

@ -14,8 +14,10 @@ steps:
image: signalwire/freeswitch-public-base image: signalwire/freeswitch-public-base
pull: always pull: always
commands: commands:
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
- git clone https://github.com/freeswitch/sofia-sip.git
- cd sofia-sip && ./autogen.sh && ./configure.gnu && make -j`nproc` && make install && cd ..
- echo "applications/mod_test" >> modules.conf - echo "applications/mod_test" >> modules.conf
- echo 'codecs/mod_openh264' >> modules.conf - echo 'codecs/mod_openh264' >> modules.conf
- sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf - sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf
@ -29,8 +31,9 @@ steps:
image: signalwire/freeswitch-public-base image: signalwire/freeswitch-public-base
pull: always pull: always
commands: commands:
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
- cd sofia-sip && make install && cd ..
- echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh - echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh
- chmod +x build.sh - chmod +x build.sh
- ./build.sh - ./build.sh
@ -39,8 +42,9 @@ steps:
image: signalwire/freeswitch-public-base image: signalwire/freeswitch-public-base
pull: always pull: always
commands: commands:
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
- cd sofia-sip && make install && cd ..
- make install || true - make install || true
- cd tests/unit - cd tests/unit
- ./run-tests.sh - ./run-tests.sh
@ -145,6 +149,6 @@ trigger:
--- ---
kind: signature kind: signature
hmac: bc24832140c40a8fde4bb04bd6bcce43029bf1641ed4acc3585fe52049ae24dc hmac: a7ae7220f99ca30639e9e3cfc48489de37a2be5acc5c160269f1bdf6dc5c9d8d
... ...

9
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -2666,9 +2666,18 @@ void sofia_event_callback(nua_event_t event,
sofia_queue_message(de); sofia_queue_message(de);
return;
end: end:
//switch_cond_next(); //switch_cond_next();
/*
* This sofia_event_callback() function is called by nua_application_event()
* which strictly requires application to call nua_handle_destroy()
* Since we did not queue the message we should call nua_handle_destroy() now so handles don't pool swell.
*/
nua_handle_destroy(nh);
return; return;
} }