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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
509024df
Commit
509024df
authored
10 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
contrib: ucommon: add patch to fix deadlock
Refs #57625
parent
ad091746
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
daemon/contrib/src/ucommon/deadlock.patch
+37
-0
37 additions, 0 deletions
daemon/contrib/src/ucommon/deadlock.patch
daemon/contrib/src/ucommon/rules.mak
+1
-0
1 addition, 0 deletions
daemon/contrib/src/ucommon/rules.mak
with
38 additions
and
0 deletions
daemon/contrib/src/ucommon/deadlock.patch
0 → 100644
+
37
−
0
View file @
509024df
From 711879af512b37b5e28f757b2c5bc13a3411b650 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 16 Oct 2014 12:28:49 -0400
Subject: [PATCH] commoncpp: fix deadlock
Remove's a static Mutex which is not needed.
---
commoncpp/socket.cpp | 2 --
inc/commoncpp/socket.h | 2 --
2 files changed, 4 deletions(-)
diff --git a/commoncpp/socket.cpp b/commoncpp/socket.cpp
index 9dcd975..4a0e71f 100644
--- a/commoncpp/socket.cpp
+++ b/commoncpp/socket.cpp
@@ -115,8 +115,6 @@
socket_t Socket::dupSocket(socket_t so, State state)
}
#endif
-Mutex Socket::mutex;
-
void Socket::setSocket(void)
{
flags.thrown = false;
diff --git a/inc/commoncpp/socket.h b/inc/commoncpp/socket.h
index d6b5ab2..44c47f4 100644
--- a/inc/commoncpp/socket.h
+++ b/inc/commoncpp/socket.h
@@ -171,8 +171,6 @@
class __EXPORT Socket : protected ucommon::Socket
protected:
static socket_t dupSocket(socket_t s,Socket::State state);
- static Mutex mutex;
-
mutable struct {
bool thrown: 1;
bool broadcast: 1;
This diff is collapsed.
Click to expand it.
daemon/contrib/src/ucommon/rules.mak
+
1
−
0
View file @
509024df
...
@@ -21,6 +21,7 @@ ucommon: ucommon-$(UCOMMON_VERSION).tar.gz .sum-ucommon
...
@@ -21,6 +21,7 @@ ucommon: ucommon-$(UCOMMON_VERSION).tar.gz .sum-ucommon
$(
APPLY
)
$(
SRC
)
/ucommon/usedefines.patch
$(
APPLY
)
$(
SRC
)
/ucommon/usedefines.patch
$(
APPLY
)
$(
SRC
)
/ucommon/any-addr-and-overloads.patch
$(
APPLY
)
$(
SRC
)
/ucommon/any-addr-and-overloads.patch
$(
APPLY
)
$(
SRC
)
/ucommon/skip_programs.patch
$(
APPLY
)
$(
SRC
)
/ucommon/skip_programs.patch
$(
APPLY
)
$(
SRC
)
/ucommon/deadlock.patch
$(
UPDATE_AUTOCONFIG
)
&&
cd
$(
UNPACK_DIR
)
&&
autoreconf
-fi
$(
UPDATE_AUTOCONFIG
)
&&
cd
$(
UNPACK_DIR
)
&&
autoreconf
-fi
$(
MOVE
)
$(
MOVE
)
...
...
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