Hello,
I did merge of current master branch to api-next. There are bunch of
reject, most of them due to new time api.
It might be not easy to review. Bit it will be good to do some review to
check that I did not lost significant patches.
Merged branch here:
https://git.linaro.org/people/maxim.uvarov/odp.git api-next
Web link to reject message
https://git.linaro.org/people/maxim.uvarov/odp.git/commit/1aabbe8080c6edd52ef1a79db99b89ac6bb14283
commit 1aabbe8080c6edd52ef1a79db99b89ac6bb14283
Merge: 8608024 433f1cd
Author: Maxim Uvarov <maxim.uva...@linaro.org>
Date: Thu Dec 10 13:03:29 2015 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org>
Conflicts:
example/generator/odp_generator.c
include/odp/api/crypto.h
include/odp/api/time.h
platform/linux-generic/include/odp/plat/time_types.h
platform/linux-generic/include/odp_cpu_internal.h
platform/linux-generic/include/odp_crypto_internal.h
platform/linux-generic/odp_cpu.c
platform/linux-generic/odp_crypto.c
platform/linux-generic/odp_schedule.c
platform/linux-generic/odp_time.c
test/performance/odp_pktio_perf.c
test/performance/odp_scheduling.c
test/validation/classification/odp_classification_test_pmr.c
test/validation/crypto/crypto.h
test/validation/crypto/odp_crypto_test_inp.c
test/validation/crypto/test_vectors.h
test/validation/crypto/test_vectors_len.h
test/validation/pktio/pktio.c
test/validation/queue/queue.c
test/validation/time/time.c
test/validation/time/time.h
diff --cc include/odp/api/version.h
index e00777f,58bb7ec..5498c9f
--- a/include/odp/api/version.h
+++ b/include/odp/api/version.h
@@@ -53,17 -46,10 +53,17 @@@ extern "C"
* to the API. For an API with common generation and major version,
but with
* different minor numbers the two versions are backward compatible.
*/
- #define ODP_VERSION_API_MINOR 1
+ #define ODP_VERSION_API_MINOR 0
/**
- * Returns ODP API version string
+ * ODP API version string
+ *
+ * The API version string defines ODP API version in this format:
+ * @verbatim <generation>.<major>.<minor> @endverbatim
+ *
+ * The string is null terminated.
+ *
+ * @return Pointer to API version string
*/
const char *odp_version_api_str(void);
diff --cc test/validation/classification/odp_classification_test_pmr.c
index 2fa524d,1502b9a..120ddd2
--- a/test/validation/classification/odp_classification_test_pmr.c
+++ b/test/validation/classification/odp_classification_test_pmr.c
@@@ -89,57 -83,17 +83,62 @@@ int create_default_inq(odp_pktio_t pkti
ODP_QUEUE_TYPE_PKTIN,
qtype == ODP_QUEUE_TYPE_POLL ? NULL : &qparam);
- CU_ASSERT(inq_def != ODP_QUEUE_INVALID);
+ CU_ASSERT_FATAL(inq_def != ODP_QUEUE_INVALID);
if (0 > odp_pktio_inq_setdef(pktio, inq_def))
- return ODP_QUEUE_INVALID;
+ return -1;
+ if (odp_pktio_start(pktio)) {
+ fprintf(stderr, "unable to start loop\n");
- return ODP_QUEUE_INVALID;
++ return -1;
+ }
+
- return inq_def;
+ return 0;
+}
+
+void configure_default_cos(odp_pktio_t pktio, odp_cos_t *cos,
+ odp_queue_t *queue, odp_pool_t *pool)
+{
+ odp_pool_param_t pool_param;
+ odp_pool_t default_pool;
+ odp_cos_t default_cos;
+ odp_queue_t default_queue;
+ int retval;
+ char cosname[ODP_COS_NAME_LEN];
+ char poolname[ODP_POOL_NAME_LEN];
+ char queuename[ODP_QUEUE_NAME_LEN];
+
+ odp_pool_param_init(&pool_param);
+ pool_param.pkt.seg_len = SHM_PKT_BUF_SIZE;
+ pool_param.pkt.len = SHM_PKT_BUF_SIZE;
+ pool_param.pkt.num = SHM_PKT_NUM_BUFS;
+ pool_param.type = ODP_POOL_PACKET;
+ sprintf(poolname, "%s", "DefaultPool");
+
+ default_pool = odp_pool_create(poolname, &pool_param);
+ CU_ASSERT(default_pool != ODP_POOL_INVALID);
+
+ sprintf(queuename, "DefaultQueue");
+ default_queue = queue_create(queuename, true);
+ CU_ASSERT(default_queue != ODP_QUEUE_INVALID);
+
+ sprintf(cosname, "DefaultCos");
+ default_cos = odp_cos_create(cosname);
+ CU_ASSERT(default_cos != ODP_COS_INVALID);
+
+ retval = odp_cos_queue_set(default_cos, default_queue);
+ CU_ASSERT(retval == 0);
+
+ retval = odp_cls_cos_pool_set(default_cos, default_pool);
+ CU_ASSERT(retval == 0);
+
+ retval = odp_pktio_default_cos_set(pktio, default_cos);
+ CU_ASSERT(retval == 0);
+
+ *cos = default_cos;
+ *queue = default_queue;
+ *pool = default_pool;
+ return;
}
int classification_suite_pmr_term(void)
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
