11b57c6980
errno_autotest testcase were failed since commit5d7b673d5f("mk: build with _GNU_SOURCE defined by default") RTE>>errno_autotest rte_strerror: 'Unknown error 11', strerror: 'Resource temporarily unavailable' Test Failed There are two different version of strerror_t() based on _GNU_SOURCE definition. /* XSI-compliant */ int strerror_r(int errnum, char *buf, size_t buflen); /* GNU-specific */ char *strerror_r(int errnum, char *buf, size_t buflen); Since the GNU-specific version returns char* the exiting "if" condition around the strerror_r fails. Switching back to XSI-compliant version to allow a) Portable strerror_r() usage as musl c library uses non GNU speficic version https://git.musl-libc.org/cgit/musl/tree/src/string/strerror_r.c b) Based on strerror_r(3) man page, it is possible that GNU-specific version need not use char *buf to fill error message instead it can use the immutable static string from the library and return it. note from strerror_r(3) man page: The GNU-specific strerror_r() returns a pointer to a string containing the error message. This may be either a pointer to a string that the function stores in buf, or a pointer to some (immutable) static string (in which case buf is unused). Fixes:5d7b673d5f("mk: build with _GNU_SOURCE defined by default") Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
51 lines
1.2 KiB
C
51 lines
1.2 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright(c) 2010-2014 Intel Corporation
|
|
*/
|
|
|
|
/* Use XSI-compliant portable version of strerror_r() */
|
|
#undef _GNU_SOURCE
|
|
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdarg.h>
|
|
#include <errno.h>
|
|
|
|
#include <rte_per_lcore.h>
|
|
#include <rte_errno.h>
|
|
#include <rte_string_fns.h>
|
|
|
|
RTE_DEFINE_PER_LCORE(int, _rte_errno);
|
|
|
|
const char *
|
|
rte_strerror(int errnum)
|
|
{
|
|
/* BSD puts a colon in the "unknown error" messages, Linux doesn't */
|
|
#ifdef RTE_EXEC_ENV_BSDAPP
|
|
static const char *sep = ":";
|
|
#else
|
|
static const char *sep = "";
|
|
#endif
|
|
#define RETVAL_SZ 256
|
|
static RTE_DEFINE_PER_LCORE(char[RETVAL_SZ], retval);
|
|
char *ret = RTE_PER_LCORE(retval);
|
|
|
|
/* since some implementations of strerror_r throw an error
|
|
* themselves if errnum is too big, we handle that case here */
|
|
if (errnum >= RTE_MAX_ERRNO)
|
|
snprintf(ret, RETVAL_SZ, "Unknown error%s %d", sep, errnum);
|
|
else
|
|
switch (errnum){
|
|
case E_RTE_SECONDARY:
|
|
return "Invalid call in secondary process";
|
|
case E_RTE_NO_CONFIG:
|
|
return "Missing rte_config structure";
|
|
default:
|
|
if (strerror_r(errnum, ret, RETVAL_SZ) != 0)
|
|
snprintf(ret, RETVAL_SZ, "Unknown error%s %d",
|
|
sep, errnum);
|
|
}
|
|
|
|
return ret;
|
|
}
|