1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD: trace: do not declare trace_registre_source() inline

Browse Source 
This one is referenced in initcalls by its pointer, it makes no sense
to declare it inline. At best it causes function duplication, at worst
it doesn't build on older compilers.
This commit is contained in:
Willy Tarreau 2022-03-02 14:53:00 +01:00
parent 368479c3fc
commit 4de2cda104
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/haproxy/trace.h
View File

@ -130,6 +130,8 @@ void __trace(enum trace_level level, uint64_t mask, struct trace_source *src,
const void *a1, const void *a2, const void *a3, const void *a4),
const struct ist msg);
void trace_register_source(struct trace_source *source);
/* return a single char to describe a trace state */
static inline char trace_state_char(enum trace_state st)
{
@ -144,21 +146,6 @@ static inline char trace_event_char(uint64_t conf, uint64_t ev)
return (conf & ev) ? '+' : '-';
}
/* registers trace source <source>. Modifies the list element!
* The {start,pause,stop,report} events are not changed so the source may
* preset them.
*/
static inline void trace_register_source(struct trace_source *source)
{
source->lockon = TRACE_LOCKON_NOTHING;
source->level = TRACE_LEVEL_USER;
source->verbosity = 1;
source->sink = NULL;
source->state = TRACE_STATE_STOPPED;
source->lockon_ptr = NULL;
LIST_APPEND(&trace_sources, &source->source_link);
}
#endif /* _HAPROXY_TRACE_H */
/*

15
src/trace.c
View File

@ -265,6 +265,21 @@ void __trace(enum trace_level level, uint64_t mask, struct trace_source *src,
}
}
/* registers trace source <source>. Modifies the list element!
* The {start,pause,stop,report} events are not changed so the source may
* preset them.
*/
void trace_register_source(struct trace_source *source)
{
source->lockon = TRACE_LOCKON_NOTHING;
source->level = TRACE_LEVEL_USER;
source->verbosity = 1;
source->sink = NULL;
source->state = TRACE_STATE_STOPPED;
source->lockon_ptr = NULL;
LIST_APPEND(&trace_sources, &source->source_link);
}
struct trace_source *trace_find_source(const char *name)
{
struct trace_source *src;