d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: don't inline string functions

Browse Source 
It makes no sense to inline string functions, in fact snprintf
can't be inlined because the function supports variable number of
arguments.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
[Thomas: update includes]
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Stephen Hemminger 2014-05-02 16:42:53 -07:00 committed by Thomas Monjalon
parent 591a9d7985
commit e5ac7c2ff3
6 changed files with 105 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/test/test_cmdline_num.c
View File

@ -31,6 +31,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <stdio.h>
#include <string.h>
#include <inttypes.h>

1
app/test/test_eal_fs.c
View File

@ -36,6 +36,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
/* eal_filesystem.h is not a public header file, so use relative path */
#include "../../lib/librte_eal/linuxapp/eal/include/eal_filesystem.h"

1
lib/librte_eal/bsdapp/eal/Makefile
View File

@ -67,6 +67,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_memory.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_tailqs.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_errno.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_cpuflags.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_string_fns.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_hexdump.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_devargs.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_vdev.c

97
lib/librte_eal/common/eal_common_string_fns.c Normal file
View File

@ -0,0 +1,97 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include <errno.h>
#include <rte_string_fns.h>
/* safe version os snprintf */
int
rte_snprintf(char *buffer, int buflen, const char *format, ...)
{
int len;
va_list ap;
if (buffer == NULL && buflen != 0)
goto einval_error;
if (format == NULL) {
if (buflen > 0)
buffer[0] = '\0';
goto einval_error;
}
va_start(ap, format);
len = vsnprintf(buffer, buflen, format, ap);
va_end(ap);
if (len >= buflen && buflen > 0)
buffer[buflen - 1] = '\0';
return len;
einval_error:
errno = EINVAL;
return -1;
}
/* split string into tokens */
int
rte_strsplit(char *string, int stringlen,
char **tokens, int maxtokens, char delim)
{
int i, tok = 0;
int tokstart = 1; /* first token is right at start of string */
if (string == NULL || tokens == NULL)
goto einval_error;
for (i = 0; i < stringlen; i++) {
if (string[i] == '\0' || tok >= maxtokens)
break;
if (tokstart) {
tokstart = 0;
tokens[tok++] = &string[i];
}
if (string[i] == delim) {
string[i] = '\0';
tokstart = 1;
}
}
return tok;
einval_error:
errno = EINVAL;
return -1;
}

64
lib/librte_eal/common/include/rte_string_fns.h
View File

@ -44,11 +44,6 @@
extern "C" {
#endif
#include <stdio.h>
#include <stdarg.h>
#include <stddef.h>
#include <errno.h>
/**
* Safer version of snprintf that writes up to buflen characters to
* the output buffer and ensures that the resultant string is null-terminated,
@ -72,33 +67,8 @@ extern "C" {
* buffer been sufficiently big.
*
*/
static inline int
rte_snprintf(char *buffer, int buflen, const char *format, ...)
{
int len;
va_list ap;
if (buffer == NULL && buflen != 0)
goto einval_error;
if (format == NULL) {
if (buflen > 0)
buffer[0] = '\0';
goto einval_error;
}
va_start(ap, format);
len = vsnprintf(buffer, buflen, format, ap);
va_end(ap);
if (len >= buflen && buflen > 0)
buffer[buflen - 1] = '\0';
return len;
einval_error:
errno = EINVAL;
return -1;
}
int
rte_snprintf(char *buffer, int buflen, const char *format, ...);
/**
* Takes string "string" parameter and splits it at character "delim"
@ -126,38 +96,12 @@ rte_snprintf(char *buffer, int buflen, const char *format, ...)
* @return
* The number of tokens in the tokens array.
*/
static inline int
int
rte_strsplit(char *string, int stringlen,
char **tokens, int maxtokens, char delim)
{
int i, tok = 0;
int tokstart = 1; /* first token is right at start of string */
if (string == NULL || tokens == NULL)
goto einval_error;
for (i = 0; i < stringlen; i++) {
if (string[i] == '\0' || tok >= maxtokens)
break;
if (tokstart) {
tokstart = 0;
tokens[tok++] = &string[i];
}
if (string[i] == delim) {
string[i] = '\0';
tokstart = 1;
}
}
return tok;
einval_error:
errno = EINVAL;
return -1;
}
char **tokens, int maxtokens, char delim);
#ifdef __cplusplus
}
#endif
#endif /* RTE_STRING_FNS_H */

1
lib/librte_eal/linuxapp/eal/Makefile
View File

@ -75,6 +75,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_memory.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_tailqs.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_errno.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_cpuflags.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_string_fns.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_hexdump.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_devargs.c
SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_vdev.c