#include <sys/wait.h>
#include <rte_errno.h>
-#include <rte_cfgfile.h>
#include <rte_string_fns.h>
-#include "app.h"
#include "parser.h"
static uint32_t
return 1;
}
-static struct ether_addr *
+static struct rte_ether_addr *
my_ether_aton(const char *a)
{
int i;
char *end;
- unsigned long o[ETHER_ADDR_LEN];
- static struct ether_addr ether_addr;
+ unsigned long o[RTE_ETHER_ADDR_LEN];
+ static struct rte_ether_addr ether_addr;
i = 0;
do {
if (errno != 0 || end == a || (end[0] != ':' && end[0] != 0))
return NULL;
a = end + 1;
- } while (++i != sizeof(o) / sizeof(o[0]) && end[0] != 0);
+ } while (++i != RTE_DIM(o) && end[0] != 0);
/* Junk at the end of line */
if (end[0] != 0)
return NULL;
/* Support the format XX:XX:XX:XX:XX:XX */
- if (i == ETHER_ADDR_LEN) {
+ if (i == RTE_ETHER_ADDR_LEN) {
while (i-- != 0) {
if (o[i] > UINT8_MAX)
return NULL;
ether_addr.addr_bytes[i] = (uint8_t)o[i];
}
/* Support the format XXXX:XXXX:XXXX */
- } else if (i == ETHER_ADDR_LEN / 2) {
+ } else if (i == RTE_ETHER_ADDR_LEN / 2) {
while (i-- != 0) {
if (o[i] > UINT16_MAX)
return NULL;
} else
return NULL;
- return (struct ether_addr *)ðer_addr;
+ return (struct rte_ether_addr *)ðer_addr;
}
int
}
int
-parse_mac_addr(const char *token, struct ether_addr *addr)
+parse_mac_addr(const char *token, struct rte_ether_addr *addr)
{
- struct ether_addr *tmp;
+ struct rte_ether_addr *tmp;
tmp = my_ether_aton(token);
if (tmp == NULL)
return -1;
- memcpy(addr, tmp, sizeof(struct ether_addr));
+ memcpy(addr, tmp, sizeof(struct rte_ether_addr));
return 0;
}
int
-parse_pipeline_core(uint32_t *socket,
- uint32_t *core,
- uint32_t *ht,
- const char *entry)
+parse_cpu_core(const char *entry,
+ struct cpu_core_params *p)
{
size_t num_len;
char num[8];
const char *next = skip_white_spaces(entry);
char type;
+ if (p == NULL)
+ return -EINVAL;
+
/* Expect <CORE> or [sX][cY][h]. At least one parameter is required. */
while (*next != '\0') {
/* If everything parsed nothing should left */
}
}
- *socket = s;
- *core = c;
- *ht = h;
+ p->socket_id = s;
+ p->core_id = c;
+ p->thread_id = h;
return 0;
}