From de8249592ee0d8c2192d90326dfc5358e028a3dc Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 22 Apr 2023 23:30:22 +0800 Subject: [PATCH] =?UTF-8?q?Session=E7=B1=BB=E6=9E=84=E9=80=A0=E6=9E=90?= =?UTF-8?q?=E6=9E=84=E8=B7=9F=E8=B8=AA=E6=97=A5=E5=BF=97=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=9C=A8=E5=BA=95=E5=B1=82=E7=BD=91=E7=BB=9C=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdpart/ZLToolKit | 2 +- src/Http/HttpSession.cpp | 5 +---- src/Rtmp/RtmpSession.cpp | 5 +---- src/Rtp/RtpSession.cpp | 2 -- src/Rtsp/RtspSession.cpp | 6 +----- src/Shell/ShellSession.cpp | 5 +---- srt/SrtSession.cpp | 4 +--- srt/SrtTransportImp.cpp | 4 ++-- webrtc/WebRtcSession.cpp | 4 +--- 9 files changed, 9 insertions(+), 28 deletions(-) diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index ad7ad862..13371427 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit ad7ad8620eb18e94afcf3e6f2df15ebcc845b502 +Subproject commit 1337142746b84ef157a455aefcae5523baa22404 diff --git a/src/Http/HttpSession.cpp b/src/Http/HttpSession.cpp index 1c7e79dc..80c70b6a 100644 --- a/src/Http/HttpSession.cpp +++ b/src/Http/HttpSession.cpp @@ -24,14 +24,11 @@ using namespace toolkit; namespace mediakit { HttpSession::HttpSession(const Socket::Ptr &pSock) : Session(pSock) { - TraceP(this); GET_CONFIG(uint32_t,keep_alive_sec,Http::kKeepAliveSecond); pSock->setSendTimeOutSecond(keep_alive_sec); } -HttpSession::~HttpSession() { - TraceP(this); -} +HttpSession::~HttpSession() = default; void HttpSession::Handle_Req_HEAD(ssize_t &content_len){ //暂时全部返回200 OK，因为HTTP GET存在按需生成流的操作，所以不能按照HTTP GET的流程返回 diff --git a/src/Rtmp/RtmpSession.cpp b/src/Rtmp/RtmpSession.cpp index c387ac91..ae827551 100644 --- a/src/Rtmp/RtmpSession.cpp +++ b/src/Rtmp/RtmpSession.cpp @@ -18,14 +18,11 @@ using namespace toolkit; namespace mediakit { RtmpSession::RtmpSession(const Socket::Ptr &sock) : Session(sock) { - DebugP(this); GET_CONFIG(uint32_t,keep_alive_sec,Rtmp::kKeepAliveSecond); sock->setSendTimeOutSecond(keep_alive_sec); } -RtmpSession::~RtmpSession() { - DebugP(this); -} +RtmpSession::~RtmpSession() = default; void RtmpSession::onError(const SockException& err) { bool is_player = !_push_src_ownership; diff --git a/src/Rtp/RtpSession.cpp b/src/Rtp/RtpSession.cpp index 109b15bc..9c7e4357 100644 --- a/src/Rtp/RtpSession.cpp +++ b/src/Rtp/RtpSession.cpp @@ -36,7 +36,6 @@ void RtpSession::setParams(mINI &ini) { } RtpSession::RtpSession(const Socket::Ptr &sock) : Session(sock) { - DebugP(this); socklen_t addr_len = sizeof(_addr); getpeername(sock->rawFD(), (struct sockaddr *)&_addr, &addr_len); _is_udp = sock->sockType() == SockNum::Sock_UDP; @@ -47,7 +46,6 @@ RtpSession::RtpSession(const Socket::Ptr &sock) : Session(sock) { } RtpSession::~RtpSession() { - DebugP(this); if(_process){ RtpSelector::Instance().delProcess(_stream_id,_process.get()); } diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index fa1bf993..c02772ce 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -52,14 +52,11 @@ static unordered_map > g_mapGetter; static recursive_mutex g_mtxGetter; RtspSession::RtspSession(const Socket::Ptr &sock) : Session(sock) { - DebugP(this); GET_CONFIG(uint32_t,keep_alive_sec,Rtsp::kKeepAliveSecond); sock->setSendTimeOutSecond(keep_alive_sec); } -RtspSession::~RtspSession() { - DebugP(this); -} +RtspSession::~RtspSession() = default; void RtspSession::onError(const SockException &err) { bool is_player = !_push_src_ownership; @@ -405,7 +402,6 @@ void RtspSession::handleReq_Describe(const Parser &parser) { } void RtspSession::onAuthSuccess() { - TraceP(this); weak_ptr weak_self = dynamic_pointer_cast(shared_from_this()); MediaSource::findAsync(_media_info, weak_self.lock(), [weak_self](const MediaSource::Ptr &src){ auto strong_self = weak_self.lock(); diff --git a/src/Shell/ShellSession.cpp b/src/Shell/ShellSession.cpp index fe3ac75b..8f971749 100644 --- a/src/Shell/ShellSession.cpp +++ b/src/Shell/ShellSession.cpp @@ -25,13 +25,10 @@ static onceToken s_token([]() { }, nullptr); ShellSession::ShellSession(const Socket::Ptr &_sock) : Session(_sock) { - DebugP(this); pleaseInputUser(); } -ShellSession::~ShellSession() { - DebugP(this); -} +ShellSession::~ShellSession() = default; void ShellSession::onRecv(const Buffer::Ptr&buf) { //DebugL << hexdump(buf->data(), buf->size()); diff --git a/srt/SrtSession.cpp b/srt/SrtSession.cpp index 5faa02d2..3bb3cfc4 100644 --- a/srt/SrtSession.cpp +++ b/srt/SrtSession.cpp @@ -16,9 +16,7 @@ SrtSession::SrtSession(const Socket::Ptr &sock) // TraceL<<"after addr len "<data(); diff --git a/srt/SrtTransportImp.cpp b/srt/SrtTransportImp.cpp index 5504714b..b91505f1 100644 --- a/srt/SrtTransportImp.cpp +++ b/srt/SrtTransportImp.cpp @@ -6,10 +6,10 @@ namespace SRT { SrtTransportImp::SrtTransportImp(const EventPoller::Ptr &poller) - : SrtTransport(poller) {} + : SrtTransport(poller) { +} SrtTransportImp::~SrtTransportImp() { - InfoP(this); uint64_t duration = _alive_ticker.createdTime() / 1000; WarnP(this) << (_is_pusher ? "srt 推流器(" : "srt 播放器(") << _media_info.shortUrl() << ")断开,耗时(s):" << duration; diff --git a/webrtc/WebRtcSession.cpp b/webrtc/WebRtcSession.cpp index 87fcc116..d5012ef8 100644 --- a/webrtc/WebRtcSession.cpp +++ b/webrtc/WebRtcSession.cpp @@ -51,9 +51,7 @@ WebRtcSession::WebRtcSession(const Socket::Ptr &sock) : Session(sock) { _over_tcp = sock->sockType() == SockNum::Sock_TCP; } -WebRtcSession::~WebRtcSession() { - InfoP(this); -} +WebRtcSession::~WebRtcSession() = default; void WebRtcSession::attachServer(const Server &server) { _server = std::dynamic_pointer_cast(const_cast(server).shared_from_this());