cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #441 from open-estuary/dev 

lib/ff_config.c : Fix data overflow in more than 64 cores
This commit is contained in:
johnjiang 2019-10-24 20:58:16 +08:00 committed by GitHub
parent 7d8917714d 868cca5674
commit a36df1e44e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ff_config.c
View File

@ -69,12 +69,13 @@ xdigit2val(unsigned char c)
static int static int
parse_lcore_mask(struct ff_config *cfg, const char *coremask) parse_lcore_mask(struct ff_config *cfg, const char *coremask)
{ {
int i, j, idx = 0; int i, j, idx = 0, shift = 0, zero_num = 0;
unsigned count = 0; unsigned count = 0;
char c; char c;
int val; int val;
uint16_t *proc_lcore; uint16_t *proc_lcore;
char buf[RTE_MAX_LCORE] = {0}; char buf[RTE_MAX_LCORE] = {0};
char zero[RTE_MAX_LCORE] = {0};
if (coremask == NULL) if (coremask == NULL)
return 0; return 0;
@ -113,9 +114,12 @@ parse_lcore_mask(struct ff_config *cfg, const char *coremask)
if ((1 << j) & val) { if ((1 << j) & val) {
proc_lcore[count] = idx; proc_lcore[count] = idx;
if (cfg->dpdk.proc_id == count) { if (cfg->dpdk.proc_id == count) {
sprintf(buf, "%llx", (unsigned long long)1<<idx); zero_num = idx >> 2;
cfg->dpdk.proc_mask = strdup(buf); shift = idx & 0x3;
} memset(zero,'0',zero_num);
sprintf(buf, "%llx%s", (unsigned long long)1<<shift, zero);
cfg->dpdk.proc_mask = strdup(buf);
}
count++; count++;
} }
} }