#include <locale.h>
#include <unistd.h>
+#include <rte_string_fns.h>
#include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_malloc.h>
#include "ark_pktgen.h"
rte_malloc("ark_pkt_gen_inst_pmd",
sizeof(struct ark_pkt_gen_inst), 0);
if (inst == NULL) {
- PMD_DRV_LOG(ERR, "Failed to malloc ark_pkt_gen_inst.\n");
+ ARK_PMD_LOG(ERR, "Failed to malloc ark_pkt_gen_inst.\n");
return inst;
}
inst->regs = (struct ark_pkt_gen_regs *)adr;
while (!ark_pktgen_paused(handle)) {
usleep(1000);
if (cnt++ > 100) {
- PMD_DRV_LOG(ERR, "Pktgen %d failed to pause.\n",
+ ARK_PMD_LOG(NOTICE, "Pktgen %d failed to pause.\n",
inst->ordinal);
break;
}
}
- PMD_DEBUG_LOG(DEBUG, "Pktgen %d paused.\n", inst->ordinal);
+ ARK_PMD_LOG(DEBUG, "Pktgen %d paused.\n", inst->ordinal);
}
void
if (!ark_pktgen_is_running(handle) &&
!ark_pktgen_paused(handle)) {
- PMD_DEBUG_LOG(DEBUG, "Pktgen %d is not running"
+ ARK_PMD_LOG(DEBUG, "Pktgen %d is not running"
" and is not paused. No need to reset.\n",
inst->ordinal);
return;
if (ark_pktgen_is_running(handle) &&
!ark_pktgen_paused(handle)) {
- PMD_DEBUG_LOG(DEBUG,
+ ARK_PMD_LOG(DEBUG,
"Pktgen %d is not paused. Pausing first.\n",
inst->ordinal);
ark_pktgen_pause(handle);
}
- PMD_DEBUG_LOG(DEBUG, "Resetting pktgen %d.\n", inst->ordinal);
+ ARK_PMD_LOG(DEBUG, "Resetting pktgen %d.\n", inst->ordinal);
inst->regs->pkt_start_stop = (1 << 8);
}
int wait_cycle = 10;
if (ark_pktgen_is_gen_forever(handle))
- PMD_DRV_LOG(ERR, "Pktgen wait_done will not terminate"
+ ARK_PMD_LOG(NOTICE, "Pktgen wait_done will not terminate"
" because gen_forever=1\n");
while (!ark_pktgen_tx_done(handle) && (wait_cycle > 0)) {
usleep(1000);
wait_cycle--;
- PMD_DEBUG_LOG(DEBUG,
+ ARK_PMD_LOG(DEBUG,
"Waiting for pktgen %d to finish sending...\n",
inst->ordinal);
}
- PMD_DEBUG_LOG(DEBUG, "Pktgen %d done.\n", inst->ordinal);
+ ARK_PMD_LOG(DEBUG, "Pktgen %d done.\n", inst->ordinal);
}
uint32_t
return &toptions[i];
}
- PMD_DRV_LOG(ERR,
+ ARK_PMD_LOG(ERR,
"Pktgen: Could not find requested option!, "
"option = %s\n",
id
o->v.INT = atoll(val);
break;
case OTSTRING:
- snprintf(o->v.STR, ARK_MAX_STR_LEN, "%s", val);
+ strlcpy(o->v.STR, val, ARK_MAX_STR_LEN);
break;
}
return 1;
if (options("reset")->v.BOOL)
ark_pktgen_reset(handle);
if (options("run")->v.BOOL) {
- PMD_DEBUG_LOG(DEBUG, "Starting packet generator on port %d\n",
+ ARK_PMD_LOG(DEBUG, "Starting packet generator on port %d\n",
options("port")->v.INT);
ark_pktgen_run(handle);
}