Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
cpp-libs
libnice
Commits
1deee693
Commit
1deee693
authored
Feb 24, 2014
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
agent: Replace recursive mutex with non-recursive
This should prevent us from re-adding re-entrancy in the future
parent
ca0f5c6d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
agent/agent.c
agent/agent.c
+6
-6
No files found.
agent/agent.c
View file @
1deee693
...
...
@@ -127,9 +127,9 @@ enum
static
guint
signals
[
N_SIGNALS
];
#if GLIB_CHECK_VERSION(2,31,8)
static
G
Rec
Mutex
agent_mutex
;
/* Mutex used for thread-safe lib */
static
GMutex
agent_mutex
;
/* Mutex used for thread-safe lib */
#else
static
GStatic
Rec
Mutex
agent_mutex
=
G_STATIC_REC_MUTEX_INIT
;
static
GStaticMutex
agent_mutex
=
G_STATIC_REC_MUTEX_INIT
;
#endif
static
void
priv_free_upnp
(
NiceAgent
*
agent
);
...
...
@@ -137,23 +137,23 @@ static void priv_free_upnp (NiceAgent *agent);
#if GLIB_CHECK_VERSION(2,31,8)
void
agent_lock
(
void
)
{
g_
rec_
mutex_lock
(
&
agent_mutex
);
g_mutex_lock
(
&
agent_mutex
);
}
void
agent_unlock
(
void
)
{
g_
rec_
mutex_unlock
(
&
agent_mutex
);
g_mutex_unlock
(
&
agent_mutex
);
}
#else
void
agent_lock
(
void
)
{
g_static_
rec_
mutex_lock
(
&
agent_mutex
);
g_static_mutex_lock
(
&
agent_mutex
);
}
void
agent_unlock
(
void
)
{
g_static_
rec_
mutex_unlock
(
&
agent_mutex
);
g_static_mutex_unlock
(
&
agent_mutex
);
}
#endif
...
...
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