mbuf: remove the rte_pktmbuf structure

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

diff --git a/app/test/test_sched.c b/app/test/test_sched.c
index c127d64..c957d80 100644 (file)
--- a/app/test/test_sched.c
+++ b/app/test/test_sched.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   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 <stdint.h>
 #include <unistd.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
-#if defined(RTE_LIBRTE_SCHED) && defined(RTE_ARCH_X86_64)
-
 #include <rte_cycles.h>
 #include <rte_ether.h>
 #include <rte_ip.h>
@@ -85,9 +81,9 @@ 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,
        .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT,
        .n_subports_per_port = 1,
        .n_pipes_per_subport = 4096,
@@ -149,15 +145,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;
@@ -173,12 +169,11 @@ test_sched(void)
 
        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");
 
-       
+
        err = rte_sched_subport_config(port, SUBPORT, subport_param);
        VERIFY(err == 0, "Error config sched, err=%d\n", err);
 
@@ -232,12 +227,8 @@ test_sched(void)
        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);