<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/13436">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make all library-internal static buffers thread-local<br><br>We have a number of library-internal static global buffers which are<br>mainly used for various stringification functions. This worked as<br>all of the related Osmocom programs were strictly single-threaded.<br><br>Let's make those buffers at least thread-local. This way every thread<br>gets their own set of buffers, and it's safe for multiple threads to<br>execute the same functions once. They're of course still not<br>re-entrant. If you need re-entrancy, you will need to use the _c()<br>or _buf() suffix version of those functions and work with your own<br>(stack or heap) buffers.<br><br>Change-Id: I50eb2436a7c1261d79a9d2955584dce92780ca07<br>---<br>M src/fsm.c<br>M src/gb/gprs_ns.c<br>M src/gsm/abis_nm.c<br>M src/gsm/apn.c<br>M src/gsm/gsm0808_utils.c<br>M src/gsm/gsm23003.c<br>M src/gsm/gsm48.c<br>M src/gsm/gsm_utils.c<br>M src/gsm/rsl.c<br>M src/msgb.c<br>M src/sim/core.c<br>M src/socket.c<br>M src/utils.c<br>13 files changed, 32 insertions(+), 33 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/fsm.c b/src/fsm.c</span><br><span>index 882a2b4..411797d 100644</span><br><span>--- a/src/fsm.c</span><br><span>+++ b/src/fsm.c</span><br><span>@@ -545,7 +545,7 @@</span><br><span> */</span><br><span> const char *osmo_fsm_event_name(struct osmo_fsm *fsm, uint32_t event)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[32];</span><br><span> if (!fsm->event_names) {</span><br><span> snprintf(buf, sizeof(buf), "%"PRIu32, event);</span><br><span> return buf;</span><br><span>@@ -575,7 +575,7 @@</span><br><span> */</span><br><span> const char *osmo_fsm_state_name(struct osmo_fsm *fsm, uint32_t state)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[32];</span><br><span> if (state >= fsm->num_states) {</span><br><span> snprintf(buf, sizeof(buf), "unknown %"PRIu32, state);</span><br><span> return buf;</span><br><span>diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c</span><br><span>index cee4885..c77ebb3 100644</span><br><span>--- a/src/gb/gprs_ns.c</span><br><span>+++ b/src/gb/gprs_ns.c</span><br><span>@@ -1552,7 +1552,7 @@</span><br><span> </span><br><span> const char *gprs_ns_ll_str(const struct gprs_nsvc *nsvc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[80];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[80];</span><br><span> return gprs_ns_ll_str_buf(buf, sizeof(buf), nsvc);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c</span><br><span>index a4c0e41..3fb8f0f 100644</span><br><span>--- a/src/gsm/abis_nm.c</span><br><span>+++ b/src/gsm/abis_nm.c</span><br><span>@@ -939,7 +939,7 @@</span><br><span> </span><br><span> const char *abis_nm_dump_foh(const struct abis_om_fom_hdr *foh)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char foh_buf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char foh_buf[128];</span><br><span> return abis_nm_dump_foh_buf(foh_buf, sizeof(foh_buf), foh);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gsm/apn.c b/src/gsm/apn.c</span><br><span>index 88b45a4..a7074ea 100644</span><br><span>--- a/src/gsm/apn.c</span><br><span>+++ b/src/gsm/apn.c</span><br><span>@@ -31,7 +31,7 @@</span><br><span> #define APN_OI_GPRS_FMT "mnc%03u.mcc%03u.gprs"</span><br><span> #define APN_GPRS_FMT "%s.mnc%03u.mcc%03u.gprs"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static char apn_strbuf[APN_MAXLEN+1];</span><br><span style="color: hsl(120, 100%, 40%);">+static __thread char apn_strbuf[APN_MAXLEN+1];</span><br><span> </span><br><span> char *osmo_apn_qualify_buf(char *buf, size_t buf_len, unsigned int mcc, unsigned int mnc, const char *ni)</span><br><span> {</span><br><span>diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c</span><br><span>index 26f7944..70eed15 100644</span><br><span>--- a/src/gsm/gsm0808_utils.c</span><br><span>+++ b/src/gsm/gsm0808_utils.c</span><br><span>@@ -611,7 +611,7 @@</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static char dbuf[256];</span><br><span style="color: hsl(120, 100%, 40%);">+static __thread char dbuf[256];</span><br><span> </span><br><span> /*! Dump LCLS parameters (GCR excluded) into string for printing.</span><br><span> * \param[out] buf caller-allocated output string buffer</span><br><span>@@ -1819,7 +1819,7 @@</span><br><span> */</span><br><span> const char *gsm0808_cell_id_name(const struct gsm0808_cell_id *cid)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[64];</span><br><span> return gsm0808_cell_id_name_buf(buf, sizeof(buf), cid);</span><br><span> }</span><br><span> </span><br><span>@@ -1829,7 +1829,7 @@</span><br><span> */</span><br><span> const char *gsm0808_cell_id_name2(const struct gsm0808_cell_id *cid)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[64];</span><br><span> return gsm0808_cell_id_name_buf(buf, sizeof(buf), cid);</span><br><span> }</span><br><span> </span><br><span>@@ -1886,7 +1886,7 @@</span><br><span> * See also gsm0808_cell_id_list_name_buf(). */</span><br><span> const char *gsm0808_cell_id_list_name(const struct gsm0808_cell_id_list2 *cil)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[1024];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[1024];</span><br><span> gsm0808_cell_id_list_name_buf(buf, sizeof(buf), cil);</span><br><span> return buf;</span><br><span> }</span><br><span>@@ -1913,7 +1913,7 @@</span><br><span> </span><br><span> const char *gsm0808_channel_type_name(const struct gsm0808_channel_type *ct)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[128];</span><br><span> return gsm0808_channel_type_name_buf(buf, sizeof(buf), ct);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c</span><br><span>index a97ed07..4cc2671 100644</span><br><span>--- a/src/gsm/gsm23003.c</span><br><span>+++ b/src/gsm/gsm23003.c</span><br><span>@@ -107,7 +107,7 @@</span><br><span> */</span><br><span> const char *osmo_mcc_name(uint16_t mcc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[8];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[8];</span><br><span> return osmo_mcc_name_buf(buf, sizeof(buf), mcc);</span><br><span> }</span><br><span> </span><br><span>@@ -158,7 +158,7 @@</span><br><span> */</span><br><span> const char *osmo_mnc_name(uint16_t mnc, bool mnc_3_digits)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[8];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[8];</span><br><span> return osmo_mnc_name_buf(buf, sizeof(buf), mnc, mnc_3_digits);</span><br><span> }</span><br><span> </span><br><span>@@ -182,7 +182,7 @@</span><br><span> */</span><br><span> const char *osmo_plmn_name(const struct osmo_plmn_id *plmn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[16];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[16];</span><br><span> return osmo_plmn_name_buf(buf, sizeof(buf), plmn);</span><br><span> }</span><br><span> </span><br><span>@@ -193,7 +193,7 @@</span><br><span> */</span><br><span> const char *osmo_plmn_name2(const struct osmo_plmn_id *plmn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[16];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[16];</span><br><span> return osmo_plmn_name_buf(buf, sizeof(buf), plmn);</span><br><span> }</span><br><span> </span><br><span>@@ -230,7 +230,7 @@</span><br><span> */</span><br><span> const char *osmo_lai_name(const struct osmo_location_area_id *lai)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[32];</span><br><span> return osmo_lai_name_buf(buf, sizeof(buf), lai);</span><br><span> }</span><br><span> </span><br><span>@@ -265,7 +265,7 @@</span><br><span> */</span><br><span> const char *osmo_cgi_name(const struct osmo_cell_global_id *cgi)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[32];</span><br><span> return osmo_cgi_name_buf(buf, sizeof(buf), cgi);</span><br><span> }</span><br><span> </span><br><span>@@ -276,7 +276,7 @@</span><br><span> */</span><br><span> const char *osmo_cgi_name2(const struct osmo_cell_global_id *cgi)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[32];</span><br><span> return osmo_cgi_name_buf(buf, sizeof(buf), cgi);</span><br><span> }</span><br><span> </span><br><span>@@ -320,7 +320,7 @@</span><br><span> */</span><br><span> const char *osmo_gummei_name(const struct osmo_gummei *gummei)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[32];</span><br><span> return osmo_gummei_name_buf(buf, sizeof(buf), gummei);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c</span><br><span>index c2c19cf..c97337b 100644</span><br><span>--- a/src/gsm/gsm48.c</span><br><span>+++ b/src/gsm/gsm48.c</span><br><span>@@ -203,7 +203,7 @@</span><br><span> */</span><br><span> const char *osmo_rai_name(const struct gprs_ra_id *rai)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[32];</span><br><span> return osmo_rai_name_buf(buf, sizeof(buf), rai);</span><br><span> }</span><br><span> </span><br><span>@@ -502,7 +502,7 @@</span><br><span> */</span><br><span> const char *osmo_mi_name(const uint8_t *mi, uint8_t mi_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char mi_name[10 + GSM48_MI_SIZE + 1];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char mi_name[10 + GSM48_MI_SIZE + 1];</span><br><span> return osmo_mi_name_buf(mi_name, sizeof(mi_name), mi, mi_len);</span><br><span> }</span><br><span> </span><br><span>@@ -1150,7 +1150,7 @@</span><br><span> */</span><br><span> const char *gsm48_pdisc_msgtype_name(uint8_t pdisc, uint8_t msg_type)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char namebuf[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char namebuf[64];</span><br><span> return gsm48_pdisc_msgtype_name_buf(namebuf, sizeof(namebuf), pdisc, msg_type);</span><br><span> }</span><br><span> </span><br><span>@@ -1303,7 +1303,7 @@</span><br><span> */</span><br><span> const char *osmo_gsm48_classmark_a5_name(const struct osmo_gsm48_classmark *cm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[128];</span><br><span> return osmo_gsm48_classmark_a5_name_buf(buf, sizeof(buf), cm);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c</span><br><span>index 07f053c..f154c2b 100644</span><br><span>--- a/src/gsm/gsm_utils.c</span><br><span>+++ b/src/gsm/gsm_utils.c</span><br><span>@@ -897,7 +897,7 @@</span><br><span> </span><br><span> char *osmo_dump_gsmtime(const struct gsm_time *tm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[64];</span><br><span> return osmo_dump_gsmtime_buf(buf, sizeof(buf), tm);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c</span><br><span>index 0409734..3be0111 100644</span><br><span>--- a/src/gsm/rsl.c</span><br><span>+++ b/src/gsm/rsl.c</span><br><span>@@ -264,7 +264,7 @@</span><br><span> */</span><br><span> const char *rsl_chan_nr_str(uint8_t chan_nr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char str[20];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char str[20];</span><br><span> return rsl_chan_nr_str_buf(str, sizeof(str), chan_nr);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/msgb.c b/src/msgb.c</span><br><span>index 940135f..4edbdf3 100644</span><br><span>--- a/src/msgb.c</span><br><span>+++ b/src/msgb.c</span><br><span>@@ -511,7 +511,7 @@</span><br><span> */</span><br><span> const char *msgb_hexdump(const struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[4100];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[4100];</span><br><span> return msgb_hexdump_buf(buf, sizeof(buf), msg);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/sim/core.c b/src/sim/core.c</span><br><span>index 63b3000..b93633c 100644</span><br><span>--- a/src/sim/core.c</span><br><span>+++ b/src/sim/core.c</span><br><span>@@ -300,8 +300,7 @@</span><br><span> </span><br><span> char *osim_print_sw(const struct osim_card_hdl *ch, uint16_t sw_in)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: do we want to mark this as __thread? */</span><br><span style="color: hsl(0, 100%, 40%);">- static char sw_print_buf[256];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char sw_print_buf[256];</span><br><span> return osim_print_sw_buf(sw_print_buf, sizeof(sw_print_buf), ch, sw_in);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 37976e2..1e303bf 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -824,7 +824,7 @@</span><br><span> */</span><br><span> const char *osmo_sock_get_name2(int fd)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char str[OSMO_SOCK_NAME_MAXLEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char str[OSMO_SOCK_NAME_MAXLEN];</span><br><span> osmo_sock_get_name_buf(str, sizeof(str), fd);</span><br><span> return str;</span><br><span> }</span><br><span>diff --git a/src/utils.c b/src/utils.c</span><br><span>index 59dc816..c38f530 100644</span><br><span>--- a/src/utils.c</span><br><span>+++ b/src/utils.c</span><br><span>@@ -41,7 +41,7 @@</span><br><span> *</span><br><span> * \file utils.c */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static char namebuf[255];</span><br><span style="color: hsl(120, 100%, 40%);">+static __thread char namebuf[255];</span><br><span> </span><br><span> /*! get human-readable string for given value</span><br><span> * \param[in] vs Array of value_string tuples</span><br><span>@@ -219,7 +219,7 @@</span><br><span> return nibblepos >> 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static char hexd_buff[4096];</span><br><span style="color: hsl(120, 100%, 40%);">+static __thread char hexd_buff[4096];</span><br><span> static const char hex_chars[] = "0123456789abcdef";</span><br><span> </span><br><span> /*! Convert binary sequence to hexadecimal ASCII string.</span><br><span>@@ -492,7 +492,7 @@</span><br><span> * sizeof(uint64_t), only the least significant bytes of value are encoded. */</span><br><span> uint8_t *osmo_encode_big_endian(uint64_t value, size_t data_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static uint8_t buf[sizeof(uint64_t)];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread uint8_t buf[sizeof(uint64_t)];</span><br><span> OSMO_ASSERT(data_len <= ARRAY_SIZE(buf));</span><br><span> osmo_store64be_ext(value, buf, data_len);</span><br><span> return buf;</span><br><span>@@ -908,7 +908,7 @@</span><br><span> */</span><br><span> const char *osmo_str_tolower(const char *src)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[128];</span><br><span> osmo_str_tolower_buf(buf, sizeof(buf), src);</span><br><span> return buf;</span><br><span> }</span><br><span>@@ -967,7 +967,7 @@</span><br><span> */</span><br><span> const char *osmo_str_toupper(const char *src)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[128];</span><br><span> osmo_str_toupper_buf(buf, sizeof(buf), src);</span><br><span> return buf;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/13436">change 13436</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/13436"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I50eb2436a7c1261d79a9d2955584dce92780ca07 </div>
<div style="display:none"> Gerrit-Change-Number: 13436 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Max <suraev@alumni.ntnu.no> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>