Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 1a4b7ee28bf7413af6513fb45ad0d0736048f866 / . / meta-openembedded / meta-networking / recipes-connectivity / umip / umip / 0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
blob: 90d12da149dee782ad6c11531310af9a0dab4b1d [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]1From 19b6cf8099e1974b5fc39086fc54103b0cbc2658 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 4 Mar 2018 23:01:25 -0800
4Subject: [PATCH 2/2] replace PTHREAD_MUTEX_FAST_NP with PTHREAD_MUTEX_NORMAL
5
6PTHREAD_MUTEX_FAST_NP is not available on non-posix systems
7e.g. musl
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 src/ha.c | 2 +-
14 src/icmp6.c | 2 +-
15 src/mh.c | 2 +-
16 src/mn.c | 2 +-
17 src/movement.c | 2 +-
18 src/mpdisc_ha.c | 2 +-
19 src/mpdisc_mn.c | 2 +-
20 src/tqueue.c | 2 +-
21 src/tunnelctl.c | 2 +-
22 9 files changed, 9 insertions(+), 9 deletions(-)
23
24diff --git a/src/ha.c b/src/ha.c
25index fbdcff0..b2f811e 100644
26--- a/src/ha.c
27+++ b/src/ha.c
28@@ -1246,7 +1246,7 @@ int ha_init(void)
29 {
30 pthread_mutexattr_t mattrs;
31 pthread_mutexattr_init(&mattrs);
32- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
33+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
34 if (pthread_mutex_init(&bu_worker_mutex, &mattrs) ||
35 pthread_cond_init(&cond, NULL))
36 return -1;
37diff --git a/src/icmp6.c b/src/icmp6.c
38index 3695135..6460634 100644
39--- a/src/icmp6.c
40+++ b/src/icmp6.c
41@@ -243,7 +243,7 @@ int icmp6_init(void)
42 return -1;
43 /* create ICMP listener thread */
44 pthread_mutexattr_init(&mattrs);
45- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
46+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
47 if (pthread_mutex_init(&icmp6_sock.send_mutex, &mattrs) ||
48 pthread_rwlock_init(&handler_lock, NULL) ||
49 pthread_create(&icmp6_listener, NULL, icmp6_listen, NULL))
50diff --git a/src/mh.c b/src/mh.c
51index 60e345e..7928f4c 100644
52--- a/src/mh.c
53+++ b/src/mh.c
54@@ -204,7 +204,7 @@ int mh_init(void)
55 return -1;
56
57 pthread_mutexattr_init(&mattrs);
58- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
59+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
60 if (pthread_mutex_init(&mh_sock.send_mutex, &mattrs) ||
61 pthread_rwlock_init(&handler_lock, NULL) ||
62 pthread_create(&mh_listener, NULL, mh_listen, NULL))
63diff --git a/src/mn.c b/src/mn.c
64index 092cfcb..8f7f448 100644
65--- a/src/mn.c
66+++ b/src/mn.c
67@@ -1478,7 +1478,7 @@ static struct home_addr_info *hai_copy(struct home_addr_info *conf_hai)
68 if (hai != NULL) {
69 pthread_mutexattr_t mattrs;
70 pthread_mutexattr_init(&mattrs);
71- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
72+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
73
74 memcpy(hai, conf_hai, sizeof(struct home_addr_info));
75
76diff --git a/src/movement.c b/src/movement.c
77index d985937..6400448 100644
78--- a/src/movement.c
79+++ b/src/movement.c
80@@ -2013,7 +2013,7 @@ int md_init(void)
81 int val;
82
83 pthread_mutexattr_init(&mattrs);
84- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
85+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
86 if (pthread_mutex_init(&iface_lock, &mattrs))
87 return -1;
88
89diff --git a/src/mpdisc_ha.c b/src/mpdisc_ha.c
90index 40ba05f..fd7a90d 100644
91--- a/src/mpdisc_ha.c
92+++ b/src/mpdisc_ha.c
93@@ -559,7 +559,7 @@ int mpd_ha_init(void)
94 {
95 pthread_mutexattr_t mattrs;
96 pthread_mutexattr_init(&mattrs);
97- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
98+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
99 if (pthread_mutex_init(&mpa_lock, &mattrs) ||
100 pthread_rwlock_init(&prefix_lock, NULL) ||
101 hash_init(&mpa_hash, DOUBLE_ADDR, MPA_BUCKETS) < 0)
102diff --git a/src/mpdisc_mn.c b/src/mpdisc_mn.c
103index 4873bd6..ada02bd 100644
104--- a/src/mpdisc_mn.c
105+++ b/src/mpdisc_mn.c
106@@ -267,7 +267,7 @@ int mpd_mn_init(void)
107 {
108 pthread_mutexattr_t mattrs;
109 pthread_mutexattr_init(&mattrs);
110- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
111+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
112 if (pthread_mutex_init(&mps_lock, &mattrs))
113 return -1;
114 if (hash_init(&mps_hash, DOUBLE_ADDR, MPS_BUCKETS) < 0)
115diff --git a/src/tqueue.c b/src/tqueue.c
116index 2f7aa0b..9c185b8 100644
117--- a/src/tqueue.c
118+++ b/src/tqueue.c
119@@ -65,7 +65,7 @@ int taskqueue_init(void)
120 {
121 pthread_mutexattr_t mattrs;
122 pthread_mutexattr_init(&mattrs);
123- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
124+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
125 if (pthread_mutex_init(&mutex, &mattrs) ||
126 pthread_cond_init(&cond, NULL) ||
127 pthread_create(&tq_runner, NULL, runner, NULL))
128diff --git a/src/tunnelctl.c b/src/tunnelctl.c
129index 23fc20b..813b8ec 100644
130--- a/src/tunnelctl.c
131+++ b/src/tunnelctl.c
132@@ -433,7 +433,7 @@ int tunnelctl_init(void)
133 return -1;
134
135 pthread_mutexattr_init(&mattrs);
136- pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_FAST_NP);
137+ pthread_mutexattr_settype(&mattrs, PTHREAD_MUTEX_NORMAL);
138 if (pthread_mutex_init(&tnl_lock, &mattrs))
139 return -1;
140
141--
1422.16.2
143