Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
7f51d7fb
Commit
7f51d7fb
authored
May 23, 2010
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vod: remove useless lock
All the operations are done from the command thread now
parent
fc5f04d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
12 deletions
+0
-12
modules/misc/rtsp.c
modules/misc/rtsp.c
+0
-12
No files found.
modules/misc/rtsp.c
View file @
7f51d7fb
...
@@ -184,7 +184,6 @@ struct vod_sys_t
...
@@ -184,7 +184,6 @@ struct vod_sys_t
int
i_session_timeout
;
int
i_session_timeout
;
/* List of media */
/* List of media */
vlc_mutex_t
lock_media
;
int
i_media_id
;
int
i_media_id
;
int
i_media
;
int
i_media
;
vod_media_t
**
media
;
vod_media_t
**
media
;
...
@@ -296,8 +295,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -296,8 +295,6 @@ static int Open( vlc_object_t *p_this )
vlc_UrlClean
(
&
url
);
vlc_UrlClean
(
&
url
);
vlc_mutex_init
(
&
p_sys
->
lock_media
);
TAB_INIT
(
p_sys
->
i_media
,
p_sys
->
media
);
TAB_INIT
(
p_sys
->
i_media
,
p_sys
->
media
);
p_sys
->
i_media_id
=
0
;
p_sys
->
i_media_id
=
0
;
...
@@ -367,8 +364,6 @@ static void Close( vlc_object_t * p_this )
...
@@ -367,8 +364,6 @@ static void Close( vlc_object_t * p_this )
msg_Err
(
p_vod
,
"rtsp vod leaking %d medias"
,
p_sys
->
i_media
);
msg_Err
(
p_vod
,
"rtsp vod leaking %d medias"
,
p_sys
->
i_media
);
TAB_CLEAN
(
p_sys
->
i_media
,
p_sys
->
media
);
TAB_CLEAN
(
p_sys
->
i_media
,
p_sys
->
media
);
vlc_mutex_destroy
(
&
p_sys
->
lock_media
);
free
(
p_sys
->
psz_path
);
free
(
p_sys
->
psz_path
);
free
(
p_sys
->
psz_raw_mux
);
free
(
p_sys
->
psz_raw_mux
);
free
(
p_sys
);
free
(
p_sys
);
...
@@ -473,9 +468,7 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
...
@@ -473,9 +468,7 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
msg_Dbg
(
p_vod
,
"deleting media: %s"
,
p_media
->
psz_rtsp_path
);
msg_Dbg
(
p_vod
,
"deleting media: %s"
,
p_media
->
psz_rtsp_path
);
vlc_mutex_lock
(
&
p_sys
->
lock_media
);
TAB_REMOVE
(
p_sys
->
i_media
,
p_sys
->
media
,
p_media
);
TAB_REMOVE
(
p_sys
->
i_media
,
p_sys
->
media
,
p_media
);
vlc_mutex_unlock
(
&
p_sys
->
lock_media
);
httpd_UrlDelete
(
p_media
->
p_rtsp_url
);
httpd_UrlDelete
(
p_media
->
p_rtsp_url
);
...
@@ -800,9 +793,7 @@ static void* CommandThread( vlc_object_t *p_this )
...
@@ -800,9 +793,7 @@ static void* CommandThread( vlc_object_t *p_this )
if
(
cmd
.
i_type
==
RTSP_CMD_TYPE_ADD
)
if
(
cmd
.
i_type
==
RTSP_CMD_TYPE_ADD
)
{
{
vlc_mutex_lock
(
&
p_sys
->
lock_media
);
TAB_APPEND
(
p_sys
->
i_media
,
p_sys
->
media
,
cmd
.
p_media
);
TAB_APPEND
(
p_sys
->
i_media
,
p_sys
->
media
,
cmd
.
p_media
);
vlc_mutex_unlock
(
&
p_sys
->
lock_media
);
goto
next
;
goto
next
;
}
}
...
@@ -813,7 +804,6 @@ static void* CommandThread( vlc_object_t *p_this )
...
@@ -813,7 +804,6 @@ static void* CommandThread( vlc_object_t *p_this )
}
}
/* */
/* */
vlc_mutex_lock
(
&
p_sys
->
lock_media
);
for
(
i
=
0
;
i
<
p_sys
->
i_media
;
i
++
)
for
(
i
=
0
;
i
<
p_sys
->
i_media
;
i
++
)
{
{
if
(
p_sys
->
media
[
i
]
->
id
==
cmd
.
i_media_id
)
if
(
p_sys
->
media
[
i
]
->
id
==
cmd
.
i_media_id
)
...
@@ -821,7 +811,6 @@ static void* CommandThread( vlc_object_t *p_this )
...
@@ -821,7 +811,6 @@ static void* CommandThread( vlc_object_t *p_this )
}
}
if
(
i
>=
p_sys
->
i_media
)
if
(
i
>=
p_sys
->
i_media
)
{
{
vlc_mutex_unlock
(
&
p_sys
->
lock_media
);
goto
next
;
goto
next
;
}
}
p_media
=
p_sys
->
media
[
i
];
p_media
=
p_sys
->
media
[
i
];
...
@@ -859,7 +848,6 @@ static void* CommandThread( vlc_object_t *p_this )
...
@@ -859,7 +848,6 @@ static void* CommandThread( vlc_object_t *p_this )
default:
default:
break
;
break
;
}
}
vlc_mutex_unlock
(
&
p_sys
->
lock_media
);
next:
next:
free
(
cmd
.
psz_session
);
free
(
cmd
.
psz_session
);
...
...
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