diff options
| author |   Dave Barach <dave@barachs.net> | 2017-09-01 19:12:11 -0400 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2017-09-06 18:30:55 +0000 |
| commit | 91f3e744a37b9f6f3c87ac45e54142f16fd2d3d5 (patch) | |
| tree | cbb3e1c008206a3209538dc41f8901bb10b7ca9c /src/vnet/tcp/builtin_server.c | |
| parent | 2951d901a5b6ac48b0203b2da9e35ea419b9b4d6 (diff) | |
Improve "show segment-manager segments"
Clean up private-segment fifo preallocation
Change-Id: I53c630ed81d48f2832a204992d73635536926983
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vnet/tcp/builtin_server.c')
| -rw-r--r-- | src/vnet/tcp/builtin_server.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/vnet/tcp/builtin_server.c b/src/vnet/tcp/builtin_server.c index 295c189d869..93314529973 100644 --- a/src/vnet/tcp/builtin_server.c +++ b/src/vnet/tcp/builtin_server.c @@ -369,7 +369,7 @@ server_create_command_fn (vlib_main_t * vm, unformat_input_t * input, builtin_server_main_t *bsm = &builtin_server_main; u8 server_uri_set = 0; int rv; - u32 tmp; + u64 tmp; bsm->no_echo = 0; bsm->fifo_size = 64 << 10; @@ -392,12 +392,14 @@ server_create_command_fn (vlib_main_t * vm, unformat_input_t * input, else if (unformat (input, "private-segment-count %d", &bsm->private_segment_count)) ; - else if (unformat (input, "private-segment-size %dm", &tmp)) - bsm->private_segment_size = tmp << 20; - else if (unformat (input, "private-segment-size %dg", &tmp)) - bsm->private_segment_size = tmp << 30; - else if (unformat (input, "private-segment-size %d", &tmp)) - bsm->private_segment_size = tmp; + else if (unformat (input, "private-segment-size %U", + unformat_memory_size, &tmp)) + { + if (tmp >= 0x100000000ULL) + return clib_error_return + (0, "private segment size %lld (%llu) too large", tmp, tmp); + bsm->private_segment_size = tmp; + } else if (unformat (input, "uri %s", &bsm->server_uri)) server_uri_set = 1; else |