import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / app / test-bbdev / test_bbdev_vector.c

diff --git a/ceph/src/spdk/dpdk/app/test-bbdev/test_bbdev_vector.c b/ceph/src/spdk/dpdk/app/test-bbdev/test_bbdev_vector.c
index 81b8ee78f65e4da0be691266f1780cd3a59de66e..e4f68e2a65acfa8b921b7aa32b4d924189c80650 100644 (file)
--- a/ceph/src/spdk/dpdk/app/test-bbdev/test_bbdev_vector.c
+++ b/ceph/src/spdk/dpdk/app/test-bbdev/test_bbdev_vector.c
@@ -2,7 +2,7 @@
  * Copyright(c) 2017 Intel Corporation
  */
 
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
        #define _WITH_GETLINE
 #endif
 #include <stdio.h>
@@ -412,6 +412,10 @@ parse_decoder_params(const char *key_token, char *token,
                vector->mask |= TEST_BBDEV_VF_NUM_MAPS;
                turbo_dec->num_maps = (uint8_t) strtoul(token, &err, 0);
                ret = ((err == NULL) || (*err != '\0')) ? -1 : 0;
+       } else if (!strcmp(key_token, "r")) {
+               vector->mask |= TEST_BBDEV_VF_R;
+               turbo_dec->tb_params.r = (uint8_t) strtoul(token, &err, 0);
+               ret = ((err == NULL) || (*err != '\0')) ? -1 : 0;
        } else if (!strcmp(key_token, "code_block_mode")) {
                vector->mask |= TEST_BBDEV_VF_CODE_BLOCK_MODE;
                turbo_dec->code_block_mode = (uint8_t) strtoul(token, &err, 0);
@@ -714,6 +718,9 @@ check_decoder(struct test_bbdev_vector *vector)
                if (!(mask & TEST_BBDEV_VF_CAB))
                        printf(
                                "WARNING: cab was not specified in vector file and will be set to 0\n");
+               if (!(mask & TEST_BBDEV_VF_R))
+                       printf(
+                               "WARNING: r was not specified in vector file and will be set to 0\n");
        } else {
                if (!(mask & TEST_BBDEV_VF_E))
                        printf(