From d9818dd68c162079f3ddb5443a78d0d91d55d0fe Mon Sep 17 00:00:00 2001 From: David Johnson Date: Fri, 14 Dec 2018 14:53:41 -0500 Subject: Fixes for buliding for 32bit targets: * u32/u64/uword mismatches * pointer-to-int fixes * printf formatting issues * issues with incorrect "ULL" and related suffixes * structure alignment and padding issues Change-Id: I70b989007758755fe8211c074f651150680f60b4 Signed-off-by: David Johnson --- src/vcl/vcl_cfg.c | 61 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 25 deletions(-) (limited to 'src/vcl/vcl_cfg.c') diff --git a/src/vcl/vcl_cfg.c b/src/vcl/vcl_cfg.c index 8baae82942d..12a4fd81468 100644 --- a/src/vcl/vcl_cfg.c +++ b/src/vcl/vcl_cfg.c @@ -35,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->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; @@ -75,7 +75,8 @@ vppcom_cfg_heapsize (char *conf_fname) 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; } @@ -83,7 +84,8 @@ vppcom_cfg_heapsize (char *conf_fname) 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; } @@ -102,7 +104,8 @@ vppcom_cfg_heapsize (char *conf_fname) { 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; @@ -110,8 +113,9 @@ vppcom_cfg_heapsize (char *conf_fname) 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; @@ -125,8 +129,9 @@ vppcom_cfg_heapsize (char *conf_fname) 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; @@ -153,8 +158,9 @@ vppcom_cfg_heapsize (char *conf_fname) 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; } @@ -165,8 +171,9 @@ vppcom_cfg_heapsize (char *conf_fname) 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; } } @@ -183,10 +190,11 @@ defaulted: MAP_SHARED | MAP_ANONYMOUS, -1, 0); if (vcl_mem == MAP_FAILED) { - VCFG_DBG (0, "VCL<%d>: ERROR: mmap(0, %ld == 0x%lx, " + VCFG_DBG (0, "VCL<%d>: ERROR: mmap(0, %lu == 0x%lx, " "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; } @@ -208,8 +216,9 @@ defaulted: 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 @@ -264,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); + (unsigned long) vcl_cfg->heapsize); } else if (unformat @@ -325,7 +334,7 @@ vppcom_cfg_read_file (char *conf_fname) &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)) @@ -463,9 +472,11 @@ vppcom_cfg_read_file (char *conf_fname) 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)) @@ -576,7 +587,7 @@ vppcom_cfg (vppcom_cfg_t * vcl_cfg) if (env_var_str) { u64 tmp; - if (sscanf (env_var_str, "%lu", &tmp) != 1) + if (sscanf (env_var_str, "%llu", (unsigned long long *) &tmp) != 1) { VCFG_DBG (0, "VCL<%d>: WARNING: Invalid namespace secret specified" " in the environment variable " @@ -586,9 +597,9 @@ vppcom_cfg (vppcom_cfg_t * vcl_cfg) else { vcm->cfg.namespace_secret = tmp; - VCFG_DBG (0, "VCL<%d>: configured namespace secret (%lu) from " + VCFG_DBG (0, "VCL<%d>: configured namespace secret (%llu) from " 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)) -- cgit 1.2.3-korg