net/ixgbe: eliminate mbuf write on rearm

[dpdk.git] / examples / quota_watermark / qwctl / qwctl.c

diff --git a/examples/quota_watermark/qwctl/qwctl.c b/examples/quota_watermark/qwctl/qwctl.c
index 68920be..18ec17a 100644 (file)
--- a/examples/quota_watermark/qwctl/qwctl.c
+++ b/examples/quota_watermark/qwctl/qwctl.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
@@ -41,7 +41,6 @@
 
 #include <rte_log.h>
 #include <rte_memzone.h>
-#include <rte_ring.h>
 
 #include <cmdline_rdline.h>
 #include <cmdline_parse.h>
@@ -56,40 +55,42 @@
 
 int *quota;
 unsigned int *low_watermark;
+unsigned int *high_watermark;
 
 
 static void
 setup_shared_variables(void)
 {
-    const struct rte_memzone *qw_memzone;
+       const struct rte_memzone *qw_memzone;
 
-    qw_memzone = rte_memzone_lookup(QUOTA_WATERMARK_MEMZONE_NAME);
-    if (qw_memzone == NULL)
-        rte_exit(EXIT_FAILURE, "Couldn't find memzone\n");
+       qw_memzone = rte_memzone_lookup(QUOTA_WATERMARK_MEMZONE_NAME);
+       if (qw_memzone == NULL)
+               rte_exit(EXIT_FAILURE, "Couldn't find memzone\n");
 
-    quota = qw_memzone->addr;
-    low_watermark = (unsigned int *) qw_memzone->addr + sizeof(int);
+       quota = qw_memzone->addr;
+       low_watermark = (unsigned int *) qw_memzone->addr + 1;
+       high_watermark = (unsigned int *) qw_memzone->addr + 2;
 }
 
-int MAIN(int argc, char **argv)
+int main(int argc, char **argv)
 {
-    int ret;
-    struct cmdline *cl;
+       int ret;
+       struct cmdline *cl;
 
-    rte_set_log_level(RTE_LOG_INFO);
+       rte_log_set_global_level(RTE_LOG_INFO);
 
-    ret = rte_eal_init(argc, argv);
-    if (ret < 0)
-        rte_exit(EXIT_FAILURE, "Cannot initialize EAL\n");
+       ret = rte_eal_init(argc, argv);
+       if (ret < 0)
+               rte_exit(EXIT_FAILURE, "Cannot initialize EAL\n");
 
-    setup_shared_variables();
+       setup_shared_variables();
 
-    cl = cmdline_stdin_new(qwctl_ctx, "qwctl> ");
-    if (cl == NULL)
-        rte_exit(EXIT_FAILURE, "Cannot create cmdline instance\n");
+       cl = cmdline_stdin_new(qwctl_ctx, "qwctl> ");
+       if (cl == NULL)
+               rte_exit(EXIT_FAILURE, "Cannot create cmdline instance\n");
 
-    cmdline_interact(cl);
-    cmdline_stdin_exit(cl);
+       cmdline_interact(cl);
+       cmdline_stdin_exit(cl);
 
-    return 0;
+       return 0;
 }