Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
8b8b4f54
Commit
8b8b4f54
authored
Feb 25, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ugly hack to prevent crash when logging an error while destroying libvlc
parent
0d0f59ac
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
src/misc/objects.c
src/misc/objects.c
+11
-5
No files found.
src/misc/objects.c
View file @
8b8b4f54
...
@@ -358,16 +358,22 @@ void __vlc_object_destroy( vlc_object_t *p_this )
...
@@ -358,16 +358,22 @@ void __vlc_object_destroy( vlc_object_t *p_this )
vlc_object_internals_t
*
p_priv
=
vlc_internals
(
p_this
);
vlc_object_internals_t
*
p_priv
=
vlc_internals
(
p_this
);
int
i_delay
=
0
;
int
i_delay
=
0
;
/* FIXME: ugly hack - we cannot use the message queue after
* msg_Destroy(). */
vlc_object_t
*
logger
=
p_this
;
if
(
p_this
->
p_libvlc
==
p_this
)
logger
=
NULL
;
if
(
p_this
->
i_children
)
if
(
p_this
->
i_children
)
{
{
msg_Err
(
p_this
,
"cannot delete object (%i, %s) with children"
,
msg_Err
(
logger
,
"cannot delete object (%i, %s) with children"
,
p_this
->
i_object_id
,
p_this
->
psz_object_name
);
p_this
->
i_object_id
,
p_this
->
psz_object_name
);
return
;
return
;
}
}
if
(
p_this
->
p_parent
)
if
(
p_this
->
p_parent
)
{
{
msg_Err
(
p_this
,
"cannot delete object (%i, %s) with a parent"
,
msg_Err
(
logger
,
"cannot delete object (%i, %s) with a parent"
,
p_this
->
i_object_id
,
p_this
->
psz_object_name
);
p_this
->
i_object_id
,
p_this
->
psz_object_name
);
return
;
return
;
}
}
...
@@ -379,21 +385,21 @@ void __vlc_object_destroy( vlc_object_t *p_this )
...
@@ -379,21 +385,21 @@ void __vlc_object_destroy( vlc_object_t *p_this )
/* Don't warn immediately ... 100ms seems OK */
/* Don't warn immediately ... 100ms seems OK */
if
(
i_delay
==
2
)
if
(
i_delay
==
2
)
{
{
msg_Warn
(
p_this
,
msg_Warn
(
logger
,
"refcount is %u, delaying before deletion (id=%d,type=%d)"
,
"refcount is %u, delaying before deletion (id=%d,type=%d)"
,
p_priv
->
i_refcount
,
p_this
->
i_object_id
,
p_priv
->
i_refcount
,
p_this
->
i_object_id
,
p_this
->
i_object_type
);
p_this
->
i_object_type
);
}
}
else
if
(
i_delay
==
10
)
else
if
(
i_delay
==
10
)
{
{
msg_Err
(
p_this
,
msg_Err
(
logger
,
"refcount is %u, delaying again (id=%d,type=%d)"
,
"refcount is %u, delaying again (id=%d,type=%d)"
,
p_priv
->
i_refcount
,
p_this
->
i_object_id
,
p_priv
->
i_refcount
,
p_this
->
i_object_id
,
p_this
->
i_object_type
);
p_this
->
i_object_type
);
}
}
else
if
(
i_delay
==
20
)
else
if
(
i_delay
==
20
)
{
{
msg_Err
(
p_this
,
msg_Err
(
logger
,
"waited too long, cancelling destruction (id=%d,type=%d)"
,
"waited too long, cancelling destruction (id=%d,type=%d)"
,
p_this
->
i_object_id
,
p_this
->
i_object_type
);
p_this
->
i_object_id
,
p_this
->
i_object_type
);
return
;
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment