Skip to content

Commit

Permalink
selftests/net: Provide test_snprintf() helper
Browse files Browse the repository at this point in the history
Instead of pre-allocating a fixed-sized buffer of TEST_MSG_BUFFER_SIZE
and printing into it, call vsnprintf() with str = NULL, which will
return the needed size of the buffer. This hack is documented in
man 3 vsnprintf.

Essentially, in C++ terms, it re-invents std::stringstream, which is
going to be used to print different tracing paths and formatted strings.
Use it straight away in __test_print() - which is thread-safe version of
printing in selftests.

Signed-off-by: Dmitry Safonov <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
0x7f454c46 authored and kuba-moo committed Aug 27, 2024
1 parent 79504a4 commit 7053e78
Showing 1 changed file with 51 additions and 10 deletions.
61 changes: 51 additions & 10 deletions tools/testing/selftests/net/tcp_ao/lib/aolib.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,58 @@ extern void __test_xfail(const char *buf);
extern void __test_error(const char *buf);
extern void __test_skip(const char *buf);

__attribute__((__format__(__printf__, 2, 3)))
static inline void __test_print(void (*fn)(const char *), const char *fmt, ...)
static inline char *test_snprintf(const char *fmt, va_list vargs)
{
#define TEST_MSG_BUFFER_SIZE 4096
char buf[TEST_MSG_BUFFER_SIZE];
va_list arg;

va_start(arg, fmt);
vsnprintf(buf, sizeof(buf), fmt, arg);
va_end(arg);
fn(buf);
char *ret = NULL;
size_t size = 0;
va_list tmp;
int n = 0;

va_copy(tmp, vargs);
n = vsnprintf(ret, size, fmt, tmp);
if (n < 0)
return NULL;

size = n + 1;
ret = malloc(size);
if (!ret)
return NULL;

n = vsnprintf(ret, size, fmt, vargs);
if (n < 0 || n > size - 1) {
free(ret);
return NULL;
}
return ret;
}

static __printf(1, 2) inline char *test_sprintf(const char *fmt, ...)
{
va_list vargs;
char *ret;

va_start(vargs, fmt);
ret = test_snprintf(fmt, vargs);
va_end(vargs);

return ret;
}

static __printf(2, 3) inline void __test_print(void (*fn)(const char *),
const char *fmt, ...)
{
va_list vargs;
char *msg;

va_start(vargs, fmt);
msg = test_snprintf(fmt, vargs);
va_end(vargs);

if (!msg)
return;

fn(msg);
free(msg);
}

#define test_print(fmt, ...) \
Expand Down

0 comments on commit 7053e78

Please sign in to comment.