git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: nics guide
[dpdk.git]
/
app
/
test
/
test_timer.c
diff --git
a/app/test/test_timer.c
b/app/test/test_timer.c
index
4b4800b
..
73da5b6
100644
(file)
--- a/
app/test/test_timer.c
+++ b/
app/test/test_timer.c
@@
-129,7
+129,6
@@
#include <rte_memzone.h>
#include <rte_launch.h>
#include <rte_cycles.h>
#include <rte_memzone.h>
#include <rte_launch.h>
#include <rte_cycles.h>
-#include <rte_tailq.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_lcore.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_lcore.h>
@@
-247,12
+246,15
@@
static int
timer_stress2_main_loop(__attribute__((unused)) void *arg)
{
static struct rte_timer *timers;
timer_stress2_main_loop(__attribute__((unused)) void *arg)
{
static struct rte_timer *timers;
- int i;
+ int i
, ret
;
static volatile int ready = 0;
uint64_t delay = rte_get_timer_hz() / 4;
unsigned lcore_id = rte_lcore_id();
static volatile int ready = 0;
uint64_t delay = rte_get_timer_hz() / 4;
unsigned lcore_id = rte_lcore_id();
+ int32_t my_collisions = 0;
+ static rte_atomic32_t collisions = RTE_ATOMIC32_INIT(0);
if (lcore_id == rte_get_master_lcore()) {
if (lcore_id == rte_get_master_lcore()) {
+ cb_count = 0;
timers = rte_malloc(NULL, sizeof(*timers) * NB_STRESS2_TIMERS, 0);
if (timers == NULL) {
printf("Test Failed\n");
timers = rte_malloc(NULL, sizeof(*timers) * NB_STRESS2_TIMERS, 0);
if (timers == NULL) {
printf("Test Failed\n");
@@
-268,15
+270,25
@@
timer_stress2_main_loop(__attribute__((unused)) void *arg)
}
/* have all cores schedule all timers on master lcore */
}
/* have all cores schedule all timers on master lcore */
- for (i = 0; i < NB_STRESS2_TIMERS; i++)
- rte_timer_reset(&timers[i], delay, SINGLE, rte_get_master_lcore(),
+ for (i = 0; i < NB_STRESS2_TIMERS; i++)
{
+ r
et = r
te_timer_reset(&timers[i], delay, SINGLE, rte_get_master_lcore(),
timer_stress2_cb, NULL);
timer_stress2_cb, NULL);
+ /* there will be collisions when multiple cores simultaneously
+ * configure the same timers */
+ if (ret != 0)
+ my_collisions++;
+ }
+ if (my_collisions != 0)
+ rte_atomic32_add(&collisions, my_collisions);
ready = 0;
rte_delay_ms(500);
/* now check that we get the right number of callbacks */
if (lcore_id == rte_get_master_lcore()) {
ready = 0;
rte_delay_ms(500);
/* now check that we get the right number of callbacks */
if (lcore_id == rte_get_master_lcore()) {
+ my_collisions = rte_atomic32_read(&collisions);
+ if (my_collisions != 0)
+ printf("- %d timer reset collisions (OK)\n", my_collisions);
rte_timer_manage();
if (cb_count != NB_STRESS2_TIMERS) {
printf("Test Failed\n");
rte_timer_manage();
if (cb_count != NB_STRESS2_TIMERS) {
printf("Test Failed\n");
@@
-311,6
+323,13
@@
timer_stress2_main_loop(__attribute__((unused)) void *arg)
/* now check that we get the right number of callbacks */
if (lcore_id == rte_get_master_lcore()) {
rte_timer_manage();
/* now check that we get the right number of callbacks */
if (lcore_id == rte_get_master_lcore()) {
rte_timer_manage();
+
+ /* clean up statics, in case we run again */
+ rte_free(timers);
+ timers = NULL;
+ ready = 0;
+ rte_atomic32_set(&collisions, 0);
+
if (cb_count != NB_STRESS2_TIMERS) {
printf("Test Failed\n");
printf("- Stress test 2, part 2 failed\n");
if (cb_count != NB_STRESS2_TIMERS) {
printf("Test Failed\n");
printf("- Stress test 2, part 2 failed\n");