d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "bsnmpclient(3): make it thread-safe"

Browse Source 
This reverts commit 89e3d5671b.

As pointed out, there are several problems with that commit:

1. The new semantics, while useful for clients where multiple
   threads use separate contexts, breaks clients which correctly
   share a single one
2. Change in semantics would require a library version bump
3. It doesn't build with GCC
This commit is contained in:
Edward Tomasz Napierala 2020-12-29 19:55:05 +00:00
parent 916806472a
commit f53120073b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/bsnmp/lib/asn1.c
View File

@ -1019,7 +1019,7 @@ asn_oid2str_r(const struct asn_oid *oid, char *buf)
char *
asn_oid2str(const struct asn_oid *oid)
{
__thread static char str[ASN_OIDSTRLEN];
static char str[ASN_OIDSTRLEN];
return (asn_oid2str_r(oid, str));
}

4
contrib/bsnmp/lib/snmpclient.c
View File

@ -71,7 +71,7 @@
#define DEBUG_PARSE 0
/* global context */
__thread struct snmp_client snmp_client;
struct snmp_client snmp_client;
/* List of all outstanding requests */
struct sent_pdu {
@ -86,7 +86,7 @@ struct sent_pdu {
};
LIST_HEAD(sent_pdu_list, sent_pdu);
__thread static struct sent_pdu_list sent_pdus;
static struct sent_pdu_list sent_pdus;
/*
* Prototype table entry. All C-structure produced by the table function must

2
contrib/bsnmp/lib/snmpclient.h
View File

@ -114,7 +114,7 @@ struct snmp_client {
};
/* the global context */
extern __thread struct snmp_client snmp_client;
extern struct snmp_client snmp_client;
/* initizialies a snmp_client structure */
void snmp_client_init(struct snmp_client *);