app: no more bare metal environment

[dpdk.git] / app / test-acl / main.c

diff --git a/app/test-acl/main.c b/app/test-acl/main.c
index d654409..9d4dce6 100644 (file)
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -62,7 +62,9 @@
 
 #endif /*RTE_LIBRTE_ACL_STANDALONE */
 
-#include "main.h"
+#define        RTE_LOGTYPE_TESTACL     RTE_LOGTYPE_USER1
+
+#define        APP_NAME        "TESTACL"
 
 #define GET_CB_FIELD(in, fd, base, lim, dlm)   do {            \
        unsigned long val;                                      \
@@ -772,6 +774,15 @@ acx_init(void)
        if (config.acx == NULL)
                rte_exit(rte_errno, "failed to create ACL context\n");
 
+       /* set default classify method to scalar for this context. */
+       if (config.scalar) {
+               ret = rte_acl_set_ctx_classify(config.acx,
+                       RTE_ACL_CLASSIFY_SCALAR);
+               if (ret != 0)
+                       rte_exit(ret, "failed to setup classify method "
+                               "for ACL context\n");
+       }
+
        /* add ACL rules. */
        f = fopen(config.rule_file, "r");
        if (f == NULL)
@@ -780,7 +791,7 @@ acx_init(void)
 
        ret = add_cb_rules(f, config.acx);
        if (ret != 0)
-               rte_exit(rte_errno, "failed to add rules into ACL context\n");
+               rte_exit(ret, "failed to add rules into ACL context\n");
 
        fclose(f);
 
@@ -815,13 +826,8 @@ search_ip5tuples_once(uint32_t categories, uint32_t step, int scalar)
                        v += config.trace_sz;
                }
 
-               if (scalar != 0)
-                       ret = rte_acl_classify_scalar(config.acx, data,
-                               results, n, categories);
-
-               else
-                       ret = rte_acl_classify(config.acx, data,
-                               results, n, categories);
+               ret = rte_acl_classify(config.acx, data, results,
+                       n, categories);
 
                if (ret != 0)
                        rte_exit(ret, "classify for ipv%c_5tuples returns %d\n",
@@ -1008,7 +1014,7 @@ get_input_opts(int argc, char **argv)
 }
 
 int
-MAIN(int argc, char **argv)
+main(int argc, char **argv)
 {
        int ret;
        uint32_t lcore;