diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-02-05 23:33:21 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2016-02-11 15:02:33 +0000 |
| commit | 14a44d37a36d1f62897aa304922cea568ce1b577 (patch) | |
| tree | 9e9e28a009fdca1b5c47ec061e7e25e33731ed5a /vnet | |
| parent | 40223daf5ed332032ed9dbca06a35864575d3595 (diff) | |
Use vppinfra bitmap for dpdk coremask
Change-Id: Iec5ebadf120f742f43a681c4d394aa97ad2ae1e1
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet')
| -rw-r--r-- | vnet/vnet/devices/dpdk/init.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index 67ed251c88f..f51a5b7638e 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -1303,24 +1303,23 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if (!dm->coremask_set_manually) { vlib_thread_registration_t * tr; - uword coremask; + uword * coremask = 0; int i; /* main thread core */ - coremask = 1 << tm->main_lcore; + coremask = clib_bitmap_set(coremask, tm->main_lcore, 1); for (i = 0; i < vec_len (tm->registrations); i++) { tr = tm->registrations[i]; - if (clib_bitmap_is_zero(tr->coremask)) - continue; - coremask |= tr->coremask[0]; + coremask = clib_bitmap_or(coremask, tr->coremask); } vec_insert (dm->eal_init_args, 2, 1); dm->eal_init_args[1] = (u8 *) "-c"; - tmp = format (0, "%x%c", coremask, 0); + tmp = format (0, "%U%c", format_bitmap_hex, coremask, 0); dm->eal_init_args[2] = tmp; + clib_bitmap_free(coremask); } if (!dm->nchannels_set_manually) |