X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_sched.c;h=c7239f80ab4555c021385cda621e67e0275a73f7;hb=ea0c20ea95fd5d71a10757e6598ac66233ea1495;hp=3b7cd5ebdaeaf09da51877f560ab8a01c87a39b3;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git diff --git a/app/test/test_sched.c b/app/test/test_sched.c index 3b7cd5ebda..c7239f80ab 100644 --- a/app/test/test_sched.c +++ b/app/test/test_sched.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -37,12 +37,8 @@ #include #include -#include - #include "test.h" -#if defined(RTE_LIBRTE_SCHED) && defined(RTE_ARCH_X86_64) - #include #include #include @@ -50,13 +46,6 @@ #include -#define VERIFY(exp,fmt,args...) \ - if (!(exp)) { \ - printf(fmt, ##args); \ - return -1; \ - } - - #define SUBPORT 0 #define PIPE 1 #define TC 2 @@ -85,7 +74,6 @@ static struct rte_sched_pipe_params pipe_profile[] = { }; static struct rte_sched_port_params port_param = { - .name = "port_0", .socket = 0, /* computed */ .rate = 0, /* computed */ .mtu = 1522, @@ -98,8 +86,7 @@ static struct rte_sched_port_params port_param = { }; #define NB_MBUF 32 -#define MAX_PACKET_SZ 2048 -#define MBUF_SZ (MAX_PACKET_SZ + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) +#define MBUF_DATA_SZ (2048 + RTE_PKTMBUF_HEADROOM) #define PKT_BURST_SZ 32 #define MEMPOOL_CACHE_SZ PKT_BURST_SZ #define SOCKET 0 @@ -112,17 +99,8 @@ create_mempool(void) mp = rte_mempool_lookup("test_sched"); if (!mp) - mp = rte_mempool_create("test_sched", - NB_MBUF, - MBUF_SZ, - MEMPOOL_CACHE_SZ, - sizeof(struct rte_pktmbuf_pool_private), - rte_pktmbuf_pool_init, - NULL, - rte_pktmbuf_init, - NULL, - SOCKET, - 0); + mp = rte_pktmbuf_pool_create("test_sched", NB_MBUF, + MEMPOOL_CACHE_SZ, 0, MBUF_DATA_SZ, SOCKET); return mp; } @@ -150,15 +128,15 @@ prepare_pkt(struct rte_mbuf *mbuf) rte_sched_port_pkt_write(mbuf, SUBPORT, PIPE, TC, QUEUE, e_RTE_METER_YELLOW); /* 64 byte packet */ - mbuf->pkt.pkt_len = 60; - mbuf->pkt.data_len = 60; + mbuf->pkt_len = 60; + mbuf->data_len = 60; } /** * test main entrance for library sched */ -int +static int test_sched(void) { struct rte_mempool *mp = NULL; @@ -171,49 +149,49 @@ test_sched(void) int err; mp = create_mempool(); + TEST_ASSERT_NOT_NULL(mp, "Error creating mempool\n"); port_param.socket = 0; port_param.rate = (uint64_t) 10000 * 1000 * 1000 / 8; - port_param.name = "port_0"; port = rte_sched_port_config(&port_param); - VERIFY(port != NULL, "Error config sched port\n"); + TEST_ASSERT_NOT_NULL(port, "Error config sched port\n"); - err = rte_sched_subport_config(port, SUBPORT, subport_param); - VERIFY(err == 0, "Error config sched, err=%d\n", err); + TEST_ASSERT_SUCCESS(err, "Error config sched, err=%d\n", err); for (pipe = 0; pipe < port_param.n_pipes_per_subport; pipe ++) { err = rte_sched_pipe_config(port, SUBPORT, pipe, 0); - VERIFY(err == 0, "Error config sched pipe %u, err=%d\n", pipe, err); + TEST_ASSERT_SUCCESS(err, "Error config sched pipe %u, err=%d\n", pipe, err); } for (i = 0; i < 10; i++) { in_mbufs[i] = rte_pktmbuf_alloc(mp); + TEST_ASSERT_NOT_NULL(in_mbufs[i], "Packet allocation failed\n"); prepare_pkt(in_mbufs[i]); } err = rte_sched_port_enqueue(port, in_mbufs, 10); - VERIFY(err == 10, "Wrong enqueue, err=%d\n", err); + TEST_ASSERT_EQUAL(err, 10, "Wrong enqueue, err=%d\n", err); err = rte_sched_port_dequeue(port, out_mbufs, 10); - VERIFY(err == 10, "Wrong dequeue, err=%d\n", err); + TEST_ASSERT_EQUAL(err, 10, "Wrong dequeue, err=%d\n", err); for (i = 0; i < 10; i++) { enum rte_meter_color color; uint32_t subport, traffic_class, queue; color = rte_sched_port_pkt_read_color(out_mbufs[i]); - VERIFY(color == e_RTE_METER_YELLOW, "Wrong color\n"); + TEST_ASSERT_EQUAL(color, e_RTE_METER_YELLOW, "Wrong color\n"); rte_sched_port_pkt_read_tree_path(out_mbufs[i], &subport, &pipe, &traffic_class, &queue); - VERIFY(subport == SUBPORT, "Wrong subport\n"); - VERIFY(pipe == PIPE, "Wrong pipe\n"); - VERIFY(traffic_class == TC, "Wrong traffic_class\n"); - VERIFY(queue == QUEUE, "Wrong queue\n"); + TEST_ASSERT_EQUAL(subport, SUBPORT, "Wrong subport\n"); + TEST_ASSERT_EQUAL(pipe, PIPE, "Wrong pipe\n"); + TEST_ASSERT_EQUAL(traffic_class, TC, "Wrong traffic_class\n"); + TEST_ASSERT_EQUAL(queue, QUEUE, "Wrong queue\n"); } @@ -221,24 +199,23 @@ test_sched(void) struct rte_sched_subport_stats subport_stats; uint32_t tc_ov; rte_sched_subport_read_stats(port, SUBPORT, &subport_stats, &tc_ov); - //VERIFY(subport_stats.n_pkts_tc[TC-1] == 10, "Wrong subport stats\n"); - +#if 0 + TEST_ASSERT_EQUAL(subport_stats.n_pkts_tc[TC-1], 10, "Wrong subport stats\n"); +#endif struct rte_sched_queue_stats queue_stats; uint16_t qlen; rte_sched_queue_read_stats(port, QUEUE, &queue_stats, &qlen); - //VERIFY(queue_stats.n_pkts == 10, "Wrong queue stats\n"); +#if 0 + TEST_ASSERT_EQUAL(queue_stats.n_pkts, 10, "Wrong queue stats\n"); +#endif rte_sched_port_free(port); return 0; } -#else /* RTE_LIBRTE_SCHED */ - -int -test_sched(void) -{ - printf("The Scheduler library is not included in this build\n"); - return 0; -} -#endif /* RTE_LIBRTE_SCHED */ +static struct test_command sched_cmd = { + .command = "sched_autotest", + .callback = test_sched, +}; +REGISTER_TEST_COMMAND(sched_cmd);