Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tcp: track lost rxt segments in byte tracker
[vpp.git]
/
src
/
vcl
/
vcl_cfg.c
diff --git
a/src/vcl/vcl_cfg.c
b/src/vcl/vcl_cfg.c
index
402bb91
..
cce60ba
100644
(file)
--- a/
src/vcl/vcl_cfg.c
+++ b/
src/vcl/vcl_cfg.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2018 Cisco and/or its affiliates.
+ * Copyright (c) 2018
-2019
Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this
* You may obtain a copy of the License at:
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this
* You may obtain a copy of the License at:
@@
-23,7
+23,6
@@
static vppcom_main_t _vppcom_main = {
.debug = VPPCOM_DEBUG_INIT,
.is_init = 0,
.app_index = ~0,
.debug = VPPCOM_DEBUG_INIT,
.is_init = 0,
.app_index = ~0,
- .my_client_index = ~0
};
vppcom_main_t *vcm = &_vppcom_main;
};
vppcom_main_t *vcm = &_vppcom_main;
@@
-36,7
+35,7
@@
vppcom_cfg_init (vppcom_cfg_t * vcl_cfg)
vcl_cfg->heapsize = (256ULL << 20);
vcl_cfg->max_workers = 16;
vcl_cfg->vpp_api_q_length = 1024;
vcl_cfg->heapsize = (256ULL << 20);
vcl_cfg->max_workers = 16;
vcl_cfg->vpp_api_q_length = 1024;
- vcl_cfg->segment_baseva =
0x200000000ULL
;
+ vcl_cfg->segment_baseva =
HIGH_SEGMENT_BASEVA
;
vcl_cfg->segment_size = (256 << 20);
vcl_cfg->add_segment_size = (128 << 20);
vcl_cfg->preallocated_fifo_pairs = 8;
vcl_cfg->segment_size = (256 << 20);
vcl_cfg->add_segment_size = (128 << 20);
vcl_cfg->preallocated_fifo_pairs = 8;
@@
-76,7
+75,8
@@
vppcom_cfg_heapsize (char *conf_fname)
if (fp == NULL)
{
VCFG_DBG (0, "VCL<%d>: using default heapsize %lu (0x%lx)",
if (fp == NULL)
{
VCFG_DBG (0, "VCL<%d>: using default heapsize %lu (0x%lx)",
- getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
+ getpid (), (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
goto defaulted;
}
goto defaulted;
}
@@
-84,7
+84,8
@@
vppcom_cfg_heapsize (char *conf_fname)
if (argv == NULL)
{
VCFG_DBG (0, "VCL<%d>: calloc failed, using default heapsize %lu"
if (argv == NULL)
{
VCFG_DBG (0, "VCL<%d>: calloc failed, using default heapsize %lu"
- " (0x%lx)", getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
+ " (0x%lx)", getpid (), (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
goto defaulted;
}
goto defaulted;
}
@@
-103,7
+104,8
@@
vppcom_cfg_heapsize (char *conf_fname)
{
VCFG_DBG (0, "VCL<%d>: realloc failed, using default "
"heapsize %lu (0x%lx)", getpid (),
{
VCFG_DBG (0, "VCL<%d>: realloc failed, using default "
"heapsize %lu (0x%lx)", getpid (),
- vcl_cfg->heapsize, vcl_cfg->heapsize);
+ (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
goto defaulted;
}
argv = tmp;
goto defaulted;
}
argv = tmp;
@@
-111,8
+113,9
@@
vppcom_cfg_heapsize (char *conf_fname)
if (arg == NULL)
{
VCFG_DBG (0, "VCL<%d>: strndup failed, using default "
if (arg == NULL)
{
VCFG_DBG (0, "VCL<%d>: strndup failed, using default "
- "heapsize %ld (0x%lx)", getpid (),
- vcl_cfg->heapsize, vcl_cfg->heapsize);
+ "heapsize %lu (0x%lx)", getpid (),
+ (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
goto defaulted;
}
argv[argc - 1] = arg;
goto defaulted;
}
argv[argc - 1] = arg;
@@
-126,8
+129,9
@@
vppcom_cfg_heapsize (char *conf_fname)
char **tmp = realloc (argv, (argc + 1) * sizeof (char *));
if (tmp == NULL)
{
char **tmp = realloc (argv, (argc + 1) * sizeof (char *));
if (tmp == NULL)
{
- VCFG_DBG (0, "VCL<%d>: realloc failed, using default heapsize %ld "
- "(0x%lx)", getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
+ VCFG_DBG (0, "VCL<%d>: realloc failed, using default heapsize %lu "
+ "(0x%lx)", getpid (), (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
goto defaulted;
}
argv = tmp;
goto defaulted;
}
argv = tmp;
@@
-154,8
+158,9
@@
vppcom_cfg_heapsize (char *conf_fname)
if (size == 0)
{
VCFG_DBG (0, "VCL<%d>: parse error '%s %s', using default "
if (size == 0)
{
VCFG_DBG (0, "VCL<%d>: parse error '%s %s', using default "
- "heapsize %ld (0x%lx)", getpid (), argv[i],
- argv[i + 1], vcl_cfg->heapsize, vcl_cfg->heapsize);
+ "heapsize %lu (0x%lx)", getpid (), argv[i],
+ argv[i + 1], (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
goto defaulted;
}
goto defaulted;
}
@@
-166,8
+171,9
@@
vppcom_cfg_heapsize (char *conf_fname)
else
{
VCFG_DBG (0, "VCL<%d>: parse error '%s %s', using default "
else
{
VCFG_DBG (0, "VCL<%d>: parse error '%s %s', using default "
- "heapsize %ld (0x%lx)", getpid (), argv[i],
- argv[i + 1], vcl_cfg->heapsize, vcl_cfg->heapsize);
+ "heapsize %lu (0x%lx)", getpid (), argv[i],
+ argv[i + 1], (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
goto defaulted;
}
}
goto defaulted;
}
}
@@
-184,10
+190,11
@@
defaulted:
MAP_SHARED | MAP_ANONYMOUS, -1, 0);
if (vcl_mem == MAP_FAILED)
{
MAP_SHARED | MAP_ANONYMOUS, -1, 0);
if (vcl_mem == MAP_FAILED)
{
- VCFG_DBG (0, "VCL<%d>: ERROR: mmap(0, %l
d
== 0x%lx, "
+ VCFG_DBG (0, "VCL<%d>: ERROR: mmap(0, %l
u
== 0x%lx, "
"PROT_READ | PROT_WRITE,MAP_SHARED | MAP_ANONYMOUS, "
"PROT_READ | PROT_WRITE,MAP_SHARED | MAP_ANONYMOUS, "
- "-1, 0) failed!", getpid (), vcl_cfg->heapsize,
- vcl_cfg->heapsize);
+ "-1, 0) failed!", getpid (),
+ (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
ASSERT (vcl_mem != MAP_FAILED);
return;
}
ASSERT (vcl_mem != MAP_FAILED);
return;
}
@@
-209,8
+216,9
@@
defaulted:
clib_memcpy (vcl_mem, &_vppcom_main, sizeof (_vppcom_main));
vcm = vcl_mem;
clib_memcpy (vcl_mem, &_vppcom_main, sizeof (_vppcom_main));
vcm = vcl_mem;
- VCFG_DBG (0, "VCL<%d>: allocated VCL heap = %p, size %ld (0x%lx)",
- getpid (), heap, vcl_cfg->heapsize, vcl_cfg->heapsize);
+ VCFG_DBG (0, "VCL<%d>: allocated VCL heap = %p, size %lu (0x%lx)",
+ getpid (), heap, (unsigned long) vcl_cfg->heapsize,
+ (unsigned long) vcl_cfg->heapsize);
}
void
}
void
@@
-265,7
+273,7
@@
vppcom_cfg_read_file (char *conf_fname)
&vcl_cfg->heapsize))
{
VCFG_DBG (0, "VCL<%d>: configured heapsize %lu", getpid (),
&vcl_cfg->heapsize))
{
VCFG_DBG (0, "VCL<%d>: configured heapsize %lu", getpid (),
- vcl_cfg->heapsize);
+
(unsigned long)
vcl_cfg->heapsize);
}
else
if (unformat
}
else
if (unformat
@@
-326,7
+334,7
@@
vppcom_cfg_read_file (char *conf_fname)
&vcl_cfg->segment_baseva))
{
VCFG_DBG (0, "VCL<%d>: configured segment_baseva 0x%lx",
&vcl_cfg->segment_baseva))
{
VCFG_DBG (0, "VCL<%d>: configured segment_baseva 0x%lx",
- getpid (), vcl_cfg->segment_baseva);
+ getpid (),
(unsigned long)
vcl_cfg->segment_baseva);
}
else if (unformat (line_input, "segment-size 0x%x",
&vcl_cfg->segment_size))
}
else if (unformat (line_input, "segment-size 0x%x",
&vcl_cfg->segment_size))
@@
-335,84
+343,84
@@
vppcom_cfg_read_file (char *conf_fname)
getpid (), vcl_cfg->segment_size,
vcl_cfg->segment_size);
}
getpid (), vcl_cfg->segment_size,
vcl_cfg->segment_size);
}
- else if (unformat (line_input, "segment-size %
d
",
+ else if (unformat (line_input, "segment-size %
u
",
&vcl_cfg->segment_size))
{
&vcl_cfg->segment_size))
{
- VCFG_DBG (0, "VCL<%d>: configured segment_size %
d
(0x%x)",
+ VCFG_DBG (0, "VCL<%d>: configured segment_size %
u
(0x%x)",
getpid (), vcl_cfg->segment_size,
vcl_cfg->segment_size);
}
else if (unformat (line_input, "add-segment-size 0x%x",
&vcl_cfg->add_segment_size))
{
getpid (), vcl_cfg->segment_size,
vcl_cfg->segment_size);
}
else if (unformat (line_input, "add-segment-size 0x%x",
&vcl_cfg->add_segment_size))
{
- VCFG_DBG (0, "VCL<%d>: configured add_segment_size 0x%x (%
d
)",
+ VCFG_DBG (0, "VCL<%d>: configured add_segment_size 0x%x (%
u
)",
getpid (), vcl_cfg->add_segment_size,
vcl_cfg->add_segment_size);
}
getpid (), vcl_cfg->add_segment_size,
vcl_cfg->add_segment_size);
}
- else if (unformat (line_input, "add-segment-size %
d
",
+ else if (unformat (line_input, "add-segment-size %
u
",
&vcl_cfg->add_segment_size))
{
&vcl_cfg->add_segment_size))
{
- VCFG_DBG (0, "VCL<%d>: configured add_segment_size %
d
(0x%x)",
+ VCFG_DBG (0, "VCL<%d>: configured add_segment_size %
u
(0x%x)",
getpid (), vcl_cfg->add_segment_size,
vcl_cfg->add_segment_size);
}
getpid (), vcl_cfg->add_segment_size,
vcl_cfg->add_segment_size);
}
- else if (unformat (line_input, "preallocated-fifo-pairs %
d
",
+ else if (unformat (line_input, "preallocated-fifo-pairs %
u
",
&vcl_cfg->preallocated_fifo_pairs))
{
&vcl_cfg->preallocated_fifo_pairs))
{
- VCFG_DBG (0, "VCL<%d>: configured preallocated_fifo_pairs %
d
"
+ VCFG_DBG (0, "VCL<%d>: configured preallocated_fifo_pairs %
u
"
"(0x%x)", getpid (), vcl_cfg->preallocated_fifo_pairs,
vcl_cfg->preallocated_fifo_pairs);
}
"(0x%x)", getpid (), vcl_cfg->preallocated_fifo_pairs,
vcl_cfg->preallocated_fifo_pairs);
}
- else if (unformat (line_input, "rx-fifo-size 0x%
l
x",
+ else if (unformat (line_input, "rx-fifo-size 0x%x",
&vcl_cfg->rx_fifo_size))
{
&vcl_cfg->rx_fifo_size))
{
- VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size 0x%x (%
d
)",
+ VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size 0x%x (%
u
)",
getpid (), vcl_cfg->rx_fifo_size,
vcl_cfg->rx_fifo_size);
}
getpid (), vcl_cfg->rx_fifo_size,
vcl_cfg->rx_fifo_size);
}
- else if (unformat (line_input, "rx-fifo-size %
d
",
+ else if (unformat (line_input, "rx-fifo-size %
u
",
&vcl_cfg->rx_fifo_size))
{
&vcl_cfg->rx_fifo_size))
{
- VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size %
d
(0x%x)",
+ VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size %
u
(0x%x)",
getpid (), vcl_cfg->rx_fifo_size,
vcl_cfg->rx_fifo_size);
}
getpid (), vcl_cfg->rx_fifo_size,
vcl_cfg->rx_fifo_size);
}
- else if (unformat (line_input, "tx-fifo-size 0x%
l
x",
+ else if (unformat (line_input, "tx-fifo-size 0x%x",
&vcl_cfg->tx_fifo_size))
{
&vcl_cfg->tx_fifo_size))
{
- VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size 0x%x (%
d
)",
+ VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size 0x%x (%
u
)",
getpid (), vcl_cfg->tx_fifo_size,
vcl_cfg->tx_fifo_size);
}
getpid (), vcl_cfg->tx_fifo_size,
vcl_cfg->tx_fifo_size);
}
- else if (unformat (line_input, "tx-fifo-size %
ld
",
+ else if (unformat (line_input, "tx-fifo-size %
u
",
&vcl_cfg->tx_fifo_size))
{
&vcl_cfg->tx_fifo_size))
{
- VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size %
d
(0x%x)",
+ VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size %
u
(0x%x)",
getpid (), vcl_cfg->tx_fifo_size,
vcl_cfg->tx_fifo_size);
}
getpid (), vcl_cfg->tx_fifo_size,
vcl_cfg->tx_fifo_size);
}
- else if (unformat (line_input, "event-queue-size 0x%
l
x",
+ else if (unformat (line_input, "event-queue-size 0x%x",
&vcl_cfg->event_queue_size))
{
&vcl_cfg->event_queue_size))
{
- VCFG_DBG (0, "VCL<%d>: configured event_queue_size 0x%x (%
d
)",
+ VCFG_DBG (0, "VCL<%d>: configured event_queue_size 0x%x (%
u
)",
getpid (), vcl_cfg->event_queue_size,
vcl_cfg->event_queue_size);
}
getpid (), vcl_cfg->event_queue_size,
vcl_cfg->event_queue_size);
}
- else if (unformat (line_input, "event-queue-size %
ld
",
+ else if (unformat (line_input, "event-queue-size %
u
",
&vcl_cfg->event_queue_size))
{
&vcl_cfg->event_queue_size))
{
- VCFG_DBG (0, "VCL<%d>: configured event_queue_size %
d
(0x%x)",
+ VCFG_DBG (0, "VCL<%d>: configured event_queue_size %
u
(0x%x)",
getpid (), vcl_cfg->event_queue_size,
vcl_cfg->event_queue_size);
}
getpid (), vcl_cfg->event_queue_size,
vcl_cfg->event_queue_size);
}
- else if (unformat (line_input, "listen-queue-size 0x%
l
x",
+ else if (unformat (line_input, "listen-queue-size 0x%x",
&vcl_cfg->listen_queue_size))
{
VCFG_DBG (0, "VCL<%d>: configured listen_queue_size 0x%x (%u)",
getpid (), vcl_cfg->listen_queue_size,
vcl_cfg->listen_queue_size);
}
&vcl_cfg->listen_queue_size))
{
VCFG_DBG (0, "VCL<%d>: configured listen_queue_size 0x%x (%u)",
getpid (), vcl_cfg->listen_queue_size,
vcl_cfg->listen_queue_size);
}
- else if (unformat (line_input, "listen-queue-size %
ld
",
+ else if (unformat (line_input, "listen-queue-size %
u
",
&vcl_cfg->listen_queue_size))
{
VCFG_DBG (0, "VCL<%d>: configured listen_queue_size %u (0x%x)",
&vcl_cfg->listen_queue_size))
{
VCFG_DBG (0, "VCL<%d>: configured listen_queue_size %u (0x%x)",
@@
-464,9
+472,10
@@
vppcom_cfg_read_file (char *conf_fname)
else if (unformat (line_input, "namespace-secret %lu",
&vcl_cfg->namespace_secret))
{
else if (unformat (line_input, "namespace-secret %lu",
&vcl_cfg->namespace_secret))
{
- VCFG_DBG (0, "VCL<%d>: configured namespace_secret %lu (0x%lx)",
- getpid (), vcl_cfg->namespace_secret,
- vcl_cfg->namespace_secret);
+ VCFG_DBG (0, "VCL<%d>: configured namespace_secret %llu "
+ "(0x%llx)", getpid (),
+ (unsigned long long) vcl_cfg->namespace_secret,
+ (unsigned long long) vcl_cfg->namespace_secret);
}
else if (unformat (line_input, "namespace-id %v",
&vcl_cfg->namespace_id))
}
else if (unformat (line_input, "namespace-id %v",
&vcl_cfg->namespace_id))
@@
-490,6
+499,12
@@
vppcom_cfg_read_file (char *conf_fname)
VCFG_DBG (0, "VCL<%d>: configured with mq with eventfd",
getpid ());
}
VCFG_DBG (0, "VCL<%d>: configured with mq with eventfd",
getpid ());
}
+ else if (unformat (line_input, "tls-engine %u",
+ &vcl_cfg->tls_engine))
+ {
+ VCFG_DBG (0, "VCL<%d>: configured tls-engine %u (0x%x)",
+ getpid (), vcl_cfg->tls_engine, vcl_cfg->tls_engine);
+ }
else if (unformat (line_input, "}"))
{
vc_cfg_input = 0;
else if (unformat (line_input, "}"))
{
vc_cfg_input = 0;
@@
-570,14
+585,13
@@
vppcom_cfg (vppcom_cfg_t * vcl_cfg)
clib_memcpy (vcm->cfg.namespace_id, env_var_str, ns_id_vec_len);
VCFG_DBG (0, "VCL<%d>: configured namespace_id (%s) from "
clib_memcpy (vcm->cfg.namespace_id, env_var_str, ns_id_vec_len);
VCFG_DBG (0, "VCL<%d>: configured namespace_id (%s) from "
- VPPCOM_ENV_APP_NAMESPACE_ID "!", getpid (),
- (char *) vcm->cfg.namespace_id);
+ VPPCOM_ENV_APP_NAMESPACE_ID "!", getpid (), env_var_str);
}
env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_SECRET);
if (env_var_str)
{
u64 tmp;
}
env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_SECRET);
if (env_var_str)
{
u64 tmp;
- if (sscanf (env_var_str, "%l
u",
&tmp) != 1)
+ if (sscanf (env_var_str, "%l
lu", (unsigned long long *)
&tmp) != 1)
{
VCFG_DBG (0, "VCL<%d>: WARNING: Invalid namespace secret specified"
" in the environment variable "
{
VCFG_DBG (0, "VCL<%d>: WARNING: Invalid namespace secret specified"
" in the environment variable "
@@
-587,9
+601,9
@@
vppcom_cfg (vppcom_cfg_t * vcl_cfg)
else
{
vcm->cfg.namespace_secret = tmp;
else
{
vcm->cfg.namespace_secret = tmp;
- VCFG_DBG (0, "VCL<%d>: configured namespace secret (%lu) from "
+ VCFG_DBG (0, "VCL<%d>: configured namespace secret (%l
l
u) from "
VPPCOM_ENV_APP_NAMESPACE_SECRET "!", getpid (),
VPPCOM_ENV_APP_NAMESPACE_SECRET "!", getpid (),
- vcm->cfg.namespace_secret);
+
(unsigned long long)
vcm->cfg.namespace_secret);
}
}
if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP))
}
}
if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP))