Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
953b8d0d
Commit
953b8d0d
authored
16 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#1678] Some usefull debug messages for mutex/semaphore deadlock problem
parent
868afabc
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-common/src/audio/audiortp.cpp
+9
-1
9 additions, 1 deletion
sflphone-common/src/audio/audiortp.cpp
sflphone-common/src/audio/audiortp.h
+1
-1
1 addition, 1 deletion
sflphone-common/src/audio/audiortp.h
with
10 additions
and
2 deletions
sflphone-common/src/audio/audiortp.cpp
+
9
−
1
View file @
953b8d0d
...
@@ -90,8 +90,9 @@ AudioRtp::closeRtpSession () {
...
@@ -90,8 +90,9 @@ AudioRtp::closeRtpSession () {
ost
::
MutexLock
m
(
_threadMutex
);
ost
::
MutexLock
m
(
_threadMutex
);
// This will make RTP threads finish.
// This will make RTP threads finish.
_debug
(
"AudioRtp::Stopping rtp session
\n
"
);
_debug
(
"AudioRtp::Stopping rtp session
\n
"
);
try
{
try
{
delete
_RTXThread
;
_RTXThread
=
0
;
delete
_RTXThread
;
_RTXThread
=
0
;
}
catch
(...)
{
}
catch
(...)
{
_debugException
(
"! ARTP Exception: when stopping audiortp
\n
"
);
_debugException
(
"! ARTP Exception: when stopping audiortp
\n
"
);
...
@@ -100,6 +101,7 @@ AudioRtp::closeRtpSession () {
...
@@ -100,6 +101,7 @@ AudioRtp::closeRtpSession () {
AudioLayer
*
audiolayer
=
Manager
::
instance
().
getAudioDriver
();
AudioLayer
*
audiolayer
=
Manager
::
instance
().
getAudioDriver
();
// audiolayer->stopStream();
// audiolayer->stopStream();
_debug
(
"AudioRtp::Audio rtp stopped
\n
"
);
return
true
;
return
true
;
}
}
...
@@ -141,7 +143,10 @@ AudioRtpRTX::AudioRtpRTX (SIPCall *sipcall, bool sym) : time(new ost::Time()), _
...
@@ -141,7 +143,10 @@ AudioRtpRTX::AudioRtpRTX (SIPCall *sipcall, bool sym) : time(new ost::Time()), _
}
}
AudioRtpRTX
::~
AudioRtpRTX
()
{
AudioRtpRTX
::~
AudioRtpRTX
()
{
_debug
(
"Delete AudioRtpRTX instance
\n
"
);
_start
.
wait
();
_start
.
wait
();
_debug
(
"Just passed AudioRtpRTX semaphore wait
\n
"
);
try
{
try
{
this
->
terminate
();
this
->
terminate
();
...
@@ -154,9 +159,11 @@ AudioRtpRTX::~AudioRtpRTX () {
...
@@ -154,9 +159,11 @@ AudioRtpRTX::~AudioRtpRTX () {
delete
_sessionRecv
;
_sessionRecv
=
NULL
;
delete
_sessionRecv
;
_sessionRecv
=
NULL
;
delete
_sessionSend
;
_sessionSend
=
NULL
;
delete
_sessionSend
;
_sessionSend
=
NULL
;
}
else
{
}
else
{
_debug
(
"Delete ost::RTPSession in AudioRtpRTX
\n
"
);
delete
_session
;
_session
=
NULL
;
delete
_session
;
_session
=
NULL
;
}
}
_debug
(
"Just killed AudioRtpRTX rtp sessions
\n
"
);
delete
[]
micData
;
micData
=
NULL
;
delete
[]
micData
;
micData
=
NULL
;
delete
[]
micDataConverted
;
micDataConverted
=
NULL
;
delete
[]
micDataConverted
;
micDataConverted
=
NULL
;
...
@@ -169,6 +176,7 @@ AudioRtpRTX::~AudioRtpRTX () {
...
@@ -169,6 +176,7 @@ AudioRtpRTX::~AudioRtpRTX () {
delete
converter
;
converter
=
NULL
;
delete
converter
;
converter
=
NULL
;
_debug
(
"AudioRtpRTX instance deleted with all ring buffers, and converters
\n
"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
sflphone-common/src/audio/audiortp.h
+
1
−
1
View file @
953b8d0d
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment