Give argtype struct names a different prefix than probe struct names.

Otherwise it's possible to declare SDT probes in such a way that a name
collision occurs, causing an unexpected compilation error.

Approved by:	re (gjb)
MFC after:	1 week
This commit is contained in:
Mark Johnston 2013-09-21 22:43:50 +00:00
parent bfe5c479c0
commit 5605b69c98

View File

@ -160,11 +160,11 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
} while (0)
#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype) \
static struct sdt_argtype sdt_##prov##_##mod##_##func##_##name##num[1] \
static struct sdt_argtype sdta_##prov##_##mod##_##func##_##name##num[1] \
= { { num, type, xtype, { NULL, NULL }, \
sdt_##prov##_##mod##_##func##_##name } \
}; \
DATA_SET(sdt_argtypes_set, sdt_##prov##_##mod##_##func##_##name##num);
DATA_SET(sdt_argtypes_set, sdta_##prov##_##mod##_##func##_##name##num);
#define SDT_PROBE_DEFINE0(prov, mod, func, name, sname) \
SDT_PROBE_DEFINE(prov, mod, func, name, sname)