net: add rte prefix to IP defines

[dpdk.git] / app / test / test_sched.c

diff --git a/app/test/test_sched.c b/app/test/test_sched.c
index 1ef6910..10d54c5 100644 (file)
--- a/app/test/test_sched.c
+++ b/app/test/test_sched.c
@@ -1,34 +1,5 @@
-/*-
- *   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
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * 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
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdlib.h>
@@ -79,16 +50,15 @@ static struct rte_sched_port_params port_param = {
        .mtu = 1522,
        .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT,
        .n_subports_per_port = 1,
-       .n_pipes_per_subport = 4096,
-       .qsize = {64, 64, 64, 64},
+       .n_pipes_per_subport = 1024,
+       .qsize = {32, 32, 32, 32},
        .pipe_profiles = pipe_profile,
        .n_pipe_profiles = 1,
 };
 
 #define NB_MBUF          32
 #define MBUF_DATA_SZ     (2048 + RTE_PKTMBUF_HEADROOM)
-#define PKT_BURST_SZ     32
-#define MEMPOOL_CACHE_SZ PKT_BURST_SZ
+#define MEMPOOL_CACHE_SZ 0
 #define SOCKET           0
 
 
@@ -106,26 +76,31 @@ create_mempool(void)
 }
 
 static void
-prepare_pkt(struct rte_mbuf *mbuf)
+prepare_pkt(struct rte_sched_port *port, struct rte_mbuf *mbuf)
 {
-       struct ether_hdr *eth_hdr;
-       struct vlan_hdr *vlan1, *vlan2;
-       struct ipv4_hdr *ip_hdr;
+       struct rte_ether_hdr *eth_hdr;
+       struct rte_vlan_hdr *vlan1, *vlan2;
+       struct rte_ipv4_hdr *ip_hdr;
 
        /* Simulate a classifier */
-       eth_hdr = rte_pktmbuf_mtod(mbuf, struct ether_hdr *);
-       vlan1 = (struct vlan_hdr *)(&eth_hdr->ether_type );
-       vlan2 = (struct vlan_hdr *)((uintptr_t)&eth_hdr->ether_type + sizeof(struct vlan_hdr));
-       eth_hdr = (struct ether_hdr *)((uintptr_t)&eth_hdr->ether_type + 2 *sizeof(struct vlan_hdr));
-       ip_hdr = (struct ipv4_hdr *)((uintptr_t)eth_hdr +  sizeof(eth_hdr->ether_type));
+       eth_hdr = rte_pktmbuf_mtod(mbuf, struct rte_ether_hdr *);
+       vlan1 = (struct rte_vlan_hdr *)(&eth_hdr->ether_type);
+       vlan2 = (struct rte_vlan_hdr *)(
+               (uintptr_t)&eth_hdr->ether_type + sizeof(struct rte_vlan_hdr));
+       eth_hdr = (struct rte_ether_hdr *)(
+               (uintptr_t)&eth_hdr->ether_type +
+               2 * sizeof(struct rte_vlan_hdr));
+       ip_hdr = (struct rte_ipv4_hdr *)(
+               (uintptr_t)eth_hdr + sizeof(eth_hdr->ether_type));
 
        vlan1->vlan_tci = rte_cpu_to_be_16(SUBPORT);
        vlan2->vlan_tci = rte_cpu_to_be_16(PIPE);
-       eth_hdr->ether_type =  rte_cpu_to_be_16(ETHER_TYPE_IPv4);
-       ip_hdr->dst_addr = IPv4(0,0,TC,QUEUE);
+       eth_hdr->ether_type =  rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);
+       ip_hdr->dst_addr = RTE_IPv4(0,0,TC,QUEUE);
 
 
-       rte_sched_port_pkt_write(mbuf, SUBPORT, PIPE, TC, QUEUE, e_RTE_METER_YELLOW);
+       rte_sched_port_pkt_write(port, mbuf, SUBPORT, PIPE, TC, QUEUE,
+                                       RTE_COLOR_YELLOW);
 
        /* 64 byte packet */
        mbuf->pkt_len  = 60;
@@ -168,7 +143,7 @@ test_sched(void)
        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]);
+               prepare_pkt(port, in_mbufs[i]);
        }
 
 
@@ -179,13 +154,13 @@ test_sched(void)
        TEST_ASSERT_EQUAL(err, 10, "Wrong dequeue, err=%d\n", err);
 
        for (i = 0; i < 10; i++) {
-               enum rte_meter_color color;
+               enum rte_color color;
                uint32_t subport, traffic_class, queue;
 
                color = rte_sched_port_pkt_read_color(out_mbufs[i]);
-               TEST_ASSERT_EQUAL(color, e_RTE_METER_YELLOW, "Wrong color\n");
+               TEST_ASSERT_EQUAL(color, RTE_COLOR_YELLOW, "Wrong color\n");
 
-               rte_sched_port_pkt_read_tree_path(out_mbufs[i],
+               rte_sched_port_pkt_read_tree_path(port, out_mbufs[i],
                                &subport, &pipe, &traffic_class, &queue);
 
                TEST_ASSERT_EQUAL(subport, SUBPORT, "Wrong subport\n");
@@ -214,8 +189,4 @@ test_sched(void)
        return 0;
 }
 
-static struct test_command sched_cmd = {
-       .command = "sched_autotest",
-       .callback = test_sched,
-};
-REGISTER_TEST_COMMAND(sched_cmd);
+REGISTER_TEST_COMMAND(sched_autotest, test_sched);