git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-242-ge4842694

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, next has been updated via e4842694a95771c87694aedae015669427bf2b21 (commit) via 28c81e87089e43692ead705cee56da2513c309b2 (commit) via c397d62bf8b29162e59d8796f10c87ebe5f37168 (commit) via bae3d1f5adbaba5f798b1e08d744f96bab1b6964 (commit) from 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e4842694a95771c87694aedae015669427bf2b21 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 19:58:00 2017 +0300 linux-gen: crypto, ipsec: use auth_iv Separate handling of authentication IV data. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 71140863..62e3a75a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -35,9 +35,7 @@ * Keep sorted: first by key length, then by IV length */ static const odp_crypto_cipher_capability_t cipher_capa_null[] = { -{.key_len = 0, .iv_len = 0}, -/* Special case for GMAC */ -{.key_len = 0, .iv_len = 12} }; +{.key_len = 0, .iv_len = 0} }; static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = { {.key_len = 24, .iv_len = 8} }; @@ -85,7 +83,8 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { -{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; +{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0}, + .iv_len = 12 } }; /** Forward declaration of session structure */ typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; @@ -122,6 +121,7 @@ struct odp_crypto_generic_session_t { struct { uint8_t key[EVP_MAX_KEY_LENGTH]; + uint8_t iv_data[EVP_MAX_IV_LENGTH]; uint32_t key_length; uint32_t bytes; union { @@ -710,10 +710,10 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->cipher_iv_ptr) - iv_ptr = param->cipher_iv_ptr; - else if (session->p.cipher_iv.data) - iv_ptr = session->cipher.iv_data; + if (param->auth_iv_ptr) + iv_ptr = param->auth_iv_ptr; + else if (session->p.auth_iv.data) + iv_ptr = session->auth.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -752,10 +752,10 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->cipher_iv_ptr) - iv_ptr = param->cipher_iv_ptr; - else if (session->p.cipher_iv.data) - iv_ptr = session->cipher.iv_data; + if (param->auth_iv_ptr) + iv_ptr = param->auth_iv_ptr; + else if (session->p.auth_iv.data) + iv_ptr = session->auth.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -976,11 +976,21 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, goto err; } + if (session->p.auth_iv.length > EVP_MAX_IV_LENGTH) { + ODP_DBG("Maximum auth IV length exceeded\n"); + *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; + goto err; + } + /* Copy IV data */ if (session->p.cipher_iv.data) memcpy(session->cipher.iv_data, session->p.cipher_iv.data, session->p.cipher_iv.length); + if (session->p.auth_iv.data) + memcpy(session->auth.iv_data, session->p.auth_iv.data, + session->p.auth_iv.length); + /* Derive order */ if (ODP_CRYPTO_OP_ENCODE == param->op) session->do_cipher_first = param->auth_cipher_text; @@ -1172,6 +1182,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, packet_param.session = param->session; packet_param.cipher_iv_ptr = param->cipher_iv_ptr; + packet_param.auth_iv_ptr = param->auth_iv_ptr; packet_param.hash_result_offset = param->hash_result_offset; packet_param.aad_ptr = param->aad_ptr; packet_param.cipher_range = param->cipher_range; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 2a01ccd1..98af98c6 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -480,6 +480,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->in.hdr_len - ipsec_sa->icv_len; param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -562,7 +563,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, return -1; } - param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; state->in.hdr_len = (ah.ah_len + 2) * 4; state->in.trl_len = 0; @@ -1082,6 +1083,7 @@ static int ipsec_out_esp(odp_packet_t *pkt, } param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); esp.spi = _odp_cpu_to_be_32(ipsec_sa->spi); @@ -1231,7 +1233,7 @@ static int ipsec_out_ah(odp_packet_t *pkt, return -1; } - param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) { status->error.alg = 1; diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 53dc0943..64507d2a 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -420,7 +420,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->use_counter_iv = 1; ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; - crypto_param.cipher_iv.length = 12; + crypto_param.auth_iv.length = 12; break; default: break; commit 28c81e87089e43692ead705cee56da2513c309b2 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 19:47:54 2017 +0300 api: crypto: add separate auth IV GMAC auth algorithm requires IV to work. Instead of hacking the ODP_CIPHER_ALG_NULL iv to include value for ODP_AUTH_ALG_GMAC, provide separate iv (in auth capability, session params and operation params). Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 6688879a..d2a1d1dd 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -333,6 +333,9 @@ typedef struct odp_crypto_session_param_t { */ odp_crypto_key_t auth_key; + /** Authentication Initialization Vector (IV) */ + odp_crypto_iv_t auth_iv; + /** Authentication digest length in bytes * * Use odp_crypto_auth_capability() for supported digest lengths. @@ -408,6 +411,9 @@ typedef struct odp_crypto_op_param_t { uint8_t *cipher_iv_ptr; }; + /** Override session authentication IV pointer */ + uint8_t *auth_iv_ptr; + /** Offset from start of packet for hash result * * Specifies the offset where the hash result is to be stored. In case @@ -449,6 +455,9 @@ typedef struct odp_crypto_packet_op_param_t { uint8_t *cipher_iv_ptr; }; + /** Override session IV pointer for authentication */ + uint8_t *auth_iv_ptr; + /** Offset from start of packet for hash result * * Specifies the offset where the hash result is to be stored. In case @@ -614,6 +623,9 @@ typedef struct odp_crypto_auth_capability_t { /** Key length in bytes */ uint32_t key_len; + /** IV length in bytes */ + uint32_t iv_len; + /** Additional Authenticated Data (AAD) lengths */ struct { /** Minimum AAD length in bytes */ commit c397d62bf8b29162e59d8796f10c87ebe5f37168 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 4 01:05:53 2018 +0300 api: crypto: use cipher_iv_ptr instead of override_iv_ptr In preparation to add auth-specific IV, rename override_iv_ptr field to ciper_iv_ptr. Provide deprecated compatibility field override_iv_ptr. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 001f5208..c0978d0d 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -635,7 +635,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t *pkt, if (esp) { params.cipher_range.offset = ipv4_data_p(ip) + hdr_len - buf; params.cipher_range.length = ipv4_data_len(ip) - hdr_len; - params.override_iv_ptr = esp->iv; + params.cipher_iv_ptr = esp->iv; } /* Issue crypto request */ diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 102d1a2e..6688879a 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -400,8 +400,13 @@ typedef struct odp_crypto_op_param_t { */ odp_packet_t out_pkt; - /** Override session IV pointer */ - uint8_t *override_iv_ptr; + /** Override session IV pointer for cipher */ + union { + /** @deprecated use cipher_iv_ptr */ + uint8_t *ODP_DEPRECATE(override_iv_ptr); + /** Override session IV pointer for cipher */ + uint8_t *cipher_iv_ptr; + }; /** Offset from start of packet for hash result * @@ -436,8 +441,13 @@ typedef struct odp_crypto_packet_op_param_t { /** Session handle from creation */ odp_crypto_session_t session; - /** Override session IV pointer */ - uint8_t *override_iv_ptr; + /** Override session IV pointer for cipher */ + union { + /** @deprecated use cipher_iv_ptr */ + uint8_t *ODP_DEPRECATE(override_iv_ptr); + /** Override session IV pointer for cipher */ + uint8_t *cipher_iv_ptr; + }; /** Offset from start of packet for hash result * diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 8e6e1a43..71140863 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -483,8 +483,8 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, void *iv_ptr; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -517,8 +517,8 @@ odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, void *iv_ptr; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -588,8 +588,8 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -638,8 +638,8 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -710,8 +710,8 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -752,8 +752,8 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -1171,7 +1171,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, int rc; packet_param.session = param->session; - packet_param.override_iv_ptr = param->override_iv_ptr; + packet_param.cipher_iv_ptr = param->cipher_iv_ptr; packet_param.hash_result_offset = param->hash_result_offset; packet_param.aad_ptr = param->aad_ptr; packet_param.cipher_range = param->cipher_range; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 0ef8b88a..2a01ccd1 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -479,7 +479,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->ip_hdr_len - state->in.hdr_len - ipsec_sa->icv_len; - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -562,7 +562,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; state->in.hdr_len = (ah.ah_len + 2) * 4; state->in.trl_len = 0; @@ -1081,7 +1081,7 @@ static int ipsec_out_esp(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); esp.spi = _odp_cpu_to_be_32(ipsec_sa->spi); @@ -1231,7 +1231,7 @@ static int ipsec_out_ah(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) { status->error.alg = 1; diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 526057c7..9398c5da 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -79,7 +79,7 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) static int alg_op(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -100,8 +100,8 @@ static int alg_op(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; @@ -154,7 +154,7 @@ static int alg_op(odp_packet_t pkt, static int alg_packet_op(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -172,8 +172,8 @@ static int alg_packet_op(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; @@ -211,7 +211,7 @@ static int alg_packet_op(odp_packet_t pkt, static int alg_packet_op_enq(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -230,8 +230,8 @@ static int alg_packet_op_enq(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; commit bae3d1f5adbaba5f798b1e08d744f96bab1b6964 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 4 01:05:53 2018 +0300 api: crypto: use cipher_iv instead of iv in session params In preparation to add auth-specific IV, rename iv field to ciper_iv. Provide deprecated compatibility field iv. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index bd4c1eab..220df782 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -92,13 +92,13 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, params.cipher_alg = cipher_sa->alg.u.cipher; params.cipher_key.data = cipher_sa->key.data; params.cipher_key.length = cipher_sa->key.length; - params.iv.data = entry->state.iv; - params.iv.length = cipher_sa->iv_len; + params.cipher_iv.data = entry->state.iv; + params.cipher_iv.length = cipher_sa->iv_len; mode = cipher_sa->mode; } else { params.cipher_alg = ODP_CIPHER_ALG_NULL; - params.iv.data = NULL; - params.iv.length = 0; + params.cipher_iv.data = NULL; + params.cipher_iv.length = 0; } /* Auth */ @@ -113,10 +113,10 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, } /* Generate an IV */ - if (params.iv.length) { - int32_t size = params.iv.length; + if (params.cipher_iv.length) { + int32_t size = params.cipher_iv.length; - int32_t ret = odp_random_data(params.iv.data, size, 1); + int32_t ret = odp_random_data(params.cipher_iv.data, size, 1); if (ret != size) return -1; } diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 4fa7a1c9..102d1a2e 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -313,7 +313,13 @@ typedef struct odp_crypto_session_param_t { odp_crypto_key_t cipher_key; /** Cipher Initialization Vector (IV) */ - odp_crypto_iv_t iv; + union { + /** @deprecated Use cipher_iv */ + odp_crypto_iv_t ODP_DEPRECATE(iv); + + /** Cipher Initialization Vector (IV) */ + odp_crypto_iv_t cipher_iv; + }; /** Authentication algorithm * diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 325a9d06..8e6e1a43 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -485,7 +485,7 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -519,7 +519,7 @@ odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -541,8 +541,9 @@ static int process_cipher_param(odp_crypto_generic_session_t *session, return -1; /* Verify IV len is correct */ - if (!((0 == session->p.iv.length) || - ((uint32_t)EVP_CIPHER_iv_length(cipher) == session->p.iv.length))) + if (!((0 == session->p.cipher_iv.length) || + ((uint32_t)EVP_CIPHER_iv_length(cipher) == + session->p.cipher_iv.length))) return -1; session->cipher.evp_cipher = cipher; @@ -570,7 +571,7 @@ aes_gcm_encrypt_init(odp_crypto_generic_session_t *session) EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, session->cipher.key_data, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); } @@ -589,7 +590,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -620,7 +621,7 @@ aes_gcm_decrypt_init(odp_crypto_generic_session_t *session) EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, session->cipher.key_data, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); } @@ -639,7 +640,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -695,7 +696,7 @@ aes_gmac_gen_init(odp_crypto_generic_session_t *session) EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, session->auth.key, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); } @@ -711,7 +712,7 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -737,7 +738,7 @@ aes_gmac_check_init(odp_crypto_generic_session_t *session) EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, session->auth.key, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); } @@ -753,7 +754,7 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -969,16 +970,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, /* Copy parameters */ session->p = *param; - if (session->p.iv.length > EVP_MAX_IV_LENGTH) { + if (session->p.cipher_iv.length > EVP_MAX_IV_LENGTH) { ODP_DBG("Maximum IV length exceeded\n"); *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; goto err; } /* Copy IV data */ - if (session->p.iv.data) - memcpy(session->cipher.iv_data, session->p.iv.data, - session->p.iv.length); + if (session->p.cipher_iv.data) + memcpy(session->cipher.iv_data, session->p.cipher_iv.data, + session->p.cipher_iv.length); /* Derive order */ if (ODP_CRYPTO_OP_ENCODE == param->op) diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 1a63858a..53dc0943 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -362,13 +362,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) crypto_param.auth_alg = param->crypto.auth_alg; crypto_param.auth_key = param->crypto.auth_key; - crypto_param.iv.length = + crypto_param.cipher_iv.length = _odp_ipsec_cipher_iv_len(crypto_param.cipher_alg); crypto_param.auth_digest_len = _odp_ipsec_auth_digest_len(crypto_param.auth_alg); - if ((uint32_t)-1 == crypto_param.iv.length || + if ((uint32_t)-1 == crypto_param.cipher_iv.length || (uint32_t)-1 == crypto_param.auth_digest_len) goto error; @@ -420,7 +420,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->use_counter_iv = 1; ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; - crypto_param.iv.length = 12; + crypto_param.cipher_iv.length = 12; break; default: break; diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index f6524bc6..1d598ebb 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -193,7 +193,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key24, .length = sizeof(test_key24) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 8, }, @@ -208,7 +208,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key24, .length = sizeof(test_key24) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 8, }, @@ -240,7 +240,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key16, .length = sizeof(test_key16) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 16, }, @@ -255,7 +255,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key16, .length = sizeof(test_key16) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 16, }, @@ -287,7 +287,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key16, .length = sizeof(test_key16) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 12, }, diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index ec477535..526057c7 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -315,9 +315,9 @@ static void alg_test(odp_crypto_op_t op, .data = ref->auth_key, .length = ref->auth_key_length }; - odp_crypto_iv_t iv = { - .data = ovr_iv ? NULL : ref->iv, - .length = ref->iv_length + odp_crypto_iv_t cipher_iv = { + .data = ovr_iv ? NULL : ref->cipher_iv, + .length = ref->cipher_iv_length }; /* Create a crypto session */ @@ -331,7 +331,7 @@ static void alg_test(odp_crypto_op_t op, ses_params.compl_queue = suite_context.queue; ses_params.output_pool = suite_context.pool; ses_params.cipher_key = cipher_key; - ses_params.iv = iv; + ses_params.cipher_iv = cipher_iv; ses_params.auth_key = auth_key; ses_params.auth_digest_len = ref->digest_length; ses_params.auth_aad_len = ref->aad_length; @@ -381,17 +381,17 @@ static void alg_test(odp_crypto_op_t op, if (!suite_context.packet) rc = alg_op(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, + ovr_iv ? ref->cipher_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); else if (ODP_CRYPTO_ASYNC == suite_context.op_mode) rc = alg_packet_op_enq(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, + ovr_iv ? ref->cipher_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); else rc = alg_packet_op(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, + ovr_iv ? ref->cipher_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); if (rc < 0) @@ -518,7 +518,7 @@ static void check_alg(odp_crypto_op_t op, if (cipher_capa[i].key_len == ref[idx].cipher_key_length && cipher_capa[i].iv_len == - ref[idx].iv_length) { + ref[idx].cipher_iv_length) { cipher_idx = i; break; } @@ -529,7 +529,7 @@ static void check_alg(odp_crypto_op_t op, ", iv_len=%" PRIu32 "\n", cipher_alg_name(cipher_alg), ref[idx].cipher_key_length, - ref[idx].iv_length); + ref[idx].cipher_iv_length); continue; } diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 6592a335..195f9ce5 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -14,8 +14,8 @@ typedef struct crypto_test_reference_s { uint8_t cipher_key[MAX_KEY_LEN]; uint32_t auth_key_length; uint8_t auth_key[MAX_KEY_LEN]; - uint32_t iv_length; - uint8_t iv[MAX_IV_LEN]; + uint32_t cipher_iv_length; + uint8_t cipher_iv[MAX_IV_LEN]; uint32_t length; uint8_t plaintext[MAX_DATA_LEN]; uint8_t ciphertext[MAX_DATA_LEN]; @@ -49,8 +49,8 @@ static crypto_test_reference_t tdes_cbc_reference[] = { .cipher_key = { 0x62, 0x7f, 0x46, 0x0e, 0x08, 0x10, 0x4a, 0x10, 0x43, 0xcd, 0x26, 0x5d, 0x58, 0x40, 0xea, 0xf1, 0x31, 0x3e, 0xdf, 0x97, 0xdf, 0x2a, 0x8a, 0x8c}, - .iv_length = TDES_CBC_IV_LEN, - .iv = { 0x8e, 0x29, 0xf7, 0x5e, 0xa7, 0x7e, 0x54, 0x75 }, + .cipher_iv_length = TDES_CBC_IV_LEN, + .cipher_iv = { 0x8e, 0x29, 0xf7, 0x5e, 0xa7, 0x7e, 0x54, 0x75 }, .length = 8, .plaintext = { 0x32, 0x6a, 0x49, 0x4c, 0xd3, 0x3f, 0xe7, 0x56 }, .ciphertext = { 0xb2, 0x2b, 0x8d, 0x66, 0xde, 0x97, 0x06, 0x92 } @@ -60,8 +60,8 @@ static crypto_test_reference_t tdes_cbc_reference[] = { .cipher_key = { 0x37, 0xae, 0x5e, 0xbf, 0x46, 0xdf, 0xf2, 0xdc, 0x07, 0x54, 0xb9, 0x4f, 0x31, 0xcb, 0xb3, 0x85, 0x5e, 0x7f, 0xd3, 0x6d, 0xc8, 0x70, 0xbf, 0xae}, - .iv_length = TDES_CBC_IV_LEN, - .iv = {0x3d, 0x1d, 0xe3, 0xcc, 0x13, 0x2e, 0x3b, 0x65 }, + .cipher_iv_length = TDES_CBC_IV_LEN, + .cipher_iv = {0x3d, 0x1d, 0xe3, 0xcc, 0x13, 0x2e, 0x3b, 0x65 }, .length = 16, .plaintext = { 0x84, 0x40, 0x1f, 0x78, 0xfe, 0x6c, 0x10, 0x87, 0x6d, 0x8e, 0xa2, 0x30, 0x94, 0xea, 0x53, 0x09 }, @@ -75,9 +75,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x06, 0xa9, 0x21, 0x40, 0x36, 0xb8, 0xa1, 0x5b, 0x51, 0x2e, 0x03, 0xd5, 0x34, 0x12, 0x00, 0x06}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x3d, 0xaf, 0xba, 0x42, 0x9d, 0x9e, 0xb4, 0x30, - 0xb4, 0x22, 0xda, 0x80, 0x2c, 0x9f, 0xac, 0x41 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x3d, 0xaf, 0xba, 0x42, 0x9d, 0x9e, 0xb4, 0x30, + 0xb4, 0x22, 0xda, 0x80, 0x2c, 0x9f, 0xac, 0x41 }, .length = 16, .plaintext = "Single block msg", .ciphertext = { 0xe3, 0x53, 0x77, 0x9c, 0x10, 0x79, 0xae, 0xb8, @@ -87,9 +87,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0xc2, 0x86, 0x69, 0x6d, 0x88, 0x7c, 0x9a, 0xa0, 0x61, 0x1b, 0xbb, 0x3e, 0x20, 0x25, 0xa4, 0x5a}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, - 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, + 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58 }, .length = 32, .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, @@ -104,9 +104,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x6c, 0x3e, 0xa0, 0x47, 0x76, 0x30, 0xce, 0x21, 0xa2, 0xce, 0x33, 0x4a, 0xa7, 0x46, 0xc2, 0xcd}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0xc7, 0x82, 0xdc, 0x4c, 0x09, 0x8c, 0x66, 0xcb, - 0xd9, 0xcd, 0x27, 0xd8, 0x25, 0x68, 0x2c, 0x81 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0xc7, 0x82, 0xdc, 0x4c, 0x09, 0x8c, 0x66, 0xcb, + 0xd9, 0xcd, 0x27, 0xd8, 0x25, 0x68, 0x2c, 0x81 }, .length = 48, .plaintext = "This is a 48-byte message (exactly 3 AES blocks)", .ciphertext = { 0xd0, 0xa0, 0x2b, 0x38, 0x36, 0x45, 0x17, 0x53, @@ -120,9 +120,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x56, 0xe4, 0x7a, 0x38, 0xc5, 0x59, 0x89, 0x74, 0xbc, 0x46, 0x90, 0x3d, 0xba, 0x29, 0x03, 0x49}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x8c, 0xe8, 0x2e, 0xef, 0xbe, 0xa0, 0xda, 0x3c, - 0x44, 0x69, 0x9e, 0xd7, 0xdb, 0x51, 0xb7, 0xd9 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x8c, 0xe8, 0x2e, 0xef, 0xbe, 0xa0, 0xda, 0x3c, + 0x44, 0x69, 0x9e, 0xd7, 0xdb, 0x51, 0xb7, 0xd9 }, .length = 64, .plaintext = { 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, @@ -146,9 +146,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88, 0x01, 0x23, 0x45, 0x67 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88, 0x01, 0x23, 0x45, 0x67 }, .length = 32, .plaintext = { 0x45, 0x00, 0x00, 0x28, 0xa4, 0xad, 0x40, 0x00, 0x40, 0x06, 0x78, 0x80, 0x0a, 0x01, 0x03, 0x8f, @@ -165,9 +165,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, - 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c }, .length = 48, .plaintext = { 0x45, 0x00, 0x00, 0x30, 0x69, 0xa6, 0x40, 0x00, 0x80, 0x06, 0x26, 0x90, 0xc0, 0xa8, 0x01, 0x02, @@ -189,9 +189,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { .cipher_key_length = AES128_CTR_KEY_LEN, .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -215,9 +215,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -242,9 +242,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -273,9 +273,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x2e, 0x44, 0x3b, 0x68, 0x49, 0x56, 0xed, 0x7e, - 0x3b, 0x24, 0x4c, 0xfe }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x2e, 0x44, 0x3b, 0x68, 0x49, 0x56, 0xed, 0x7e, + 0x3b, 0x24, 0x4c, 0xfe }, .length = 72, .plaintext = { 0x45, 0x00, 0x00, 0x48, 0x69, 0x9a, 0x00, 0x00, 0x80, 0x11, 0x4d, 0xb7, 0xc0, 0xa8, 0x01, 0x02, @@ -306,9 +306,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88 }, .length = 64, .plaintext = { 0x45, 0x00, 0x00, 0x3e, 0x69, 0x8f, 0x00, 0x00, 0x80, 0x11, 0x4d, 0xcc, 0xc0, 0xa8, 0x01, 0x02, @@ -336,9 +336,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }, .length = 64, .plaintext = { 0x45, 0x00, 0x00, 0x3c, 0x99, 0xc5, 0x00, 0x00, 0x80, 0x01, 0xcb, 0x7a, 0x40, 0x67, 0x93, 0x18, @@ -366,9 +366,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x3d, 0xe0, 0x98, 0x74, 0xb3, 0x88, 0xe6, 0x49, 0x19, 0x88, 0xd0, 0xc3, 0x60, 0x7e, 0xae, 0x1f}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x57, 0x69, 0x0e, 0x43, 0x4e, 0x28, 0x00, 0x00, - 0xa2, 0xfc, 0xa1, 0xa3 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x57, 0x69, 0x0e, 0x43, 0x4e, 0x28, 0x00, 0x00, + 0xa2, 0xfc, 0xa1, 0xa3 }, .length = 28, .plaintext = { 0x45, 0x00, 0x00, 0x1c, 0x42, 0xa2, 0x00, 0x00, 0x80, 0x01, 0x44, 0x1f, 0x40, 0x67, 0x93, 0xb6, @@ -390,9 +390,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88 }, .length = 40, .plaintext = { 0x45, 0x00, 0x00, 0x28, 0xa4, 0xad, 0x40, 0x00, 0x40, 0x06, 0x78, 0x80, 0x0a, 0x01, 0x03, 0x8f, @@ -416,9 +416,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, 0x05, - 0x06, 0x07, 0x08 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08 }, .length = 52, .plaintext = { 0x45, 0x00, 0x00, 0x30, 0x69, 0xa6, 0x40, 0x00, 0x80, 0x06, 0x26, 0x90, 0xc0, 0xa8, 0x01, 0x02, @@ -447,9 +447,9 @@ static crypto_test_reference_t aes_gmac_reference[] = { .auth_key_length = AES128_GCM_KEY_LEN, .auth_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }, .length = 68, .plaintext = { 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ----------------------------------------------------------------------- Summary of changes: example/ipsec/odp_ipsec.c | 2 +- example/ipsec/odp_ipsec_cache.c | 14 +-- include/odp/api/spec/crypto.h | 38 ++++++-- platform/linux-generic/odp_crypto.c | 82 +++++++++-------- platform/linux-generic/odp_ipsec.c | 10 ++- platform/linux-generic/odp_ipsec_sad.c | 6 +- test/performance/odp_crypto.c | 10 +-- test/validation/api/crypto/odp_crypto_test_inp.c | 36 ++++---- test/validation/api/crypto/test_vectors.h | 108 +++++++++++------------ 9 files changed, 174 insertions(+), 132 deletions(-) hooks/post-receive --

7 years, 4 months

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-238-g5a58bbf2

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, next has been updated via 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb (commit) via 115de92568af53becceae8300fe2f2b6a3436cfc (commit) via 2f62f234d0b83f4deedcfb75213a6e901e87d902 (commit) via d3e7f84960c29b58ad78de745b4bc3d5f26fc77d (commit) via fd22012f6f8e621fb22d5f4d6c15347f9535a902 (commit) via c2837dee41364443bc95aa97611e3d721ef16813 (commit) via eba4477a5cd5300d608ddfc53ff00cd3e51805a6 (commit) via 3e90ecc0bfa4487a29fbdff7ccc1cf5a2a1e8bc0 (commit) via dfa1ee94dae761166126445739be0dd6843f6792 (commit) via 01014bb374153d7bc879b3e1d26e79a6dfe5c329 (commit) via d7f9a326839de8d731d95ba3a1c45114198887d1 (commit) via b07985be674cef618fabeb7111ffa4dbb3e74fef (commit) via 74948cab5525f59e016dc984d95cb51f2ce2f963 (commit) via 4ffba79dfc573070f61da8894877783601e3aff4 (commit) via 4fc0e934df0bbd0779c6051595add213f752272a (commit) via 69367466a8c3e30509b1f86c4751285aab37efb8 (commit) via d1da7104eb4875287c816aec7e145a7504239156 (commit) via 409d87e542b9f018467c2c62bb07a8e4f2a15993 (commit) via f4d395f2a80646c0609b62fbe37cd14465df74ac (commit) via dab09417bf432da56aeddb2feaef9e6a11b739d7 (commit) via f7938ef11ede6ed6843bb7608a98ab3d15cf8e1c (commit) via 9e40c760b95077a4ca4e652e4d39a4304e5828f6 (commit) via 7c733ea2be5898660a3d02cdd2cf1f0a64a50e0c (commit) via e8d209cc33a34c7ee92053e3f240c542068816dd (commit) via 157737a4629a569f453762f92be2e3d174dfe1e5 (commit) via e4fec7da3e89c20cfe3c4d96c5fbe02ebbea57b3 (commit) from d5419e8857b2bc61d3be17fe53f171550fee426b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: example/generator/Makefile.am | 5 - example/generator/generator_run.sh | 17 -- platform/linux-generic/m4/configure.m4 | 2 + platform/linux-generic/test/Makefile.am | 4 + platform/linux-generic/test/example/Makefile.am | 1 + .../test/example/generator/Makefile.am | 4 + .../test/example/generator/generator_run.sh | 45 +++++ .../test/validation/api/pktio/pktio_run_pcap.sh | 1 + test/validation/api/atomic/Makefile.am | 2 +- test/validation/api/atomic/atomic.c | 25 ++- test/validation/api/atomic/atomic.h | 39 ---- test/validation/api/atomic/atomic_main.c | 14 -- test/validation/api/barrier/Makefile.am | 2 +- test/validation/api/barrier/barrier.c | 13 +- test/validation/api/barrier/barrier.h | 30 ---- test/validation/api/barrier/barrier_main.c | 14 -- test/validation/api/buffer/Makefile.am | 2 +- test/validation/api/buffer/buffer.c | 17 +- test/validation/api/buffer/buffer.h | 32 ---- test/validation/api/buffer/buffer_main.c | 14 -- test/validation/api/chksum/Makefile.am | 2 +- test/validation/api/chksum/chksum.c | 9 +- test/validation/api/chksum/chksum.h | 26 --- test/validation/api/chksum/chksum_main.c | 12 -- test/validation/api/classification/Makefile.am | 2 +- .../validation/api/classification/classification.c | 2 +- .../validation/api/classification/classification.h | 42 ----- .../api/classification/classification_main.c | 14 -- .../api/classification/odp_classification_basic.c | 14 +- .../classification/odp_classification_test_pmr.c | 24 +-- .../api/classification/odp_classification_tests.c | 8 +- test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/cpumask/cpumask.c | 9 +- test/validation/api/cpumask/cpumask.h | 28 --- test/validation/api/cpumask/cpumask_main.c | 14 -- test/validation/api/crypto/Makefile.am | 5 +- test/validation/api/crypto/crypto.c | 135 -------------- test/validation/api/crypto/crypto.h | 59 ------ test/validation/api/crypto/crypto_main.c | 14 -- test/validation/api/crypto/odp_crypto_test_inp.c | 197 +++++++++++++++++---- test/validation/api/crypto/odp_crypto_test_inp.h | 26 --- test/validation/api/errno/Makefile.am | 2 +- test/validation/api/errno/errno.c | 5 +- test/validation/api/errno/errno.h | 24 --- test/validation/api/errno/errno_main.c | 14 -- test/validation/api/event/Makefile.am | 2 +- test/validation/api/event/event.c | 3 +- test/validation/api/event/event.h | 12 -- test/validation/api/event/event_main.c | 13 -- test/validation/api/hash/Makefile.am | 2 +- test/validation/api/hash/hash.c | 5 +- test/validation/api/hash/hash.h | 24 --- test/validation/api/hash/hash_main.c | 14 -- test/validation/api/lock/Makefile.am | 2 +- test/validation/api/lock/lock.c | 31 ++-- test/validation/api/lock/lock.h | 46 ----- test/validation/api/lock/lock_main.c | 14 -- test/validation/api/packet/Makefile.am | 2 +- test/validation/api/packet/packet.c | 67 ++++--- test/validation/api/packet/packet.h | 57 ------ test/validation/api/packet/packet_main.c | 14 -- test/validation/api/pktio/Makefile.am | 2 +- test/validation/api/pktio/parser.c | 36 ++-- test/validation/api/pktio/parser.h | 12 -- test/validation/api/pktio/pktio.c | 79 ++++----- test/validation/api/pktio/pktio.h | 67 ------- test/validation/api/pktio/pktio_main.c | 14 -- test/validation/api/pool/Makefile.am | 2 +- test/validation/api/pool/pool.c | 17 +- test/validation/api/pool/pool.h | 30 ---- test/validation/api/pool/pool_main.c | 14 -- test/validation/api/queue/Makefile.am | 2 +- test/validation/api/queue/queue.c | 15 +- test/validation/api/queue/queue.h | 31 ---- test/validation/api/queue/queue_main.c | 14 -- test/validation/api/random/Makefile.am | 2 +- test/validation/api/random/random.c | 9 +- test/validation/api/random/random.h | 26 --- test/validation/api/random/random_main.c | 14 -- test/validation/api/scheduler/Makefile.am | 2 +- test/validation/api/scheduler/scheduler.c | 77 ++++---- test/validation/api/scheduler/scheduler.h | 62 ------- test/validation/api/scheduler/scheduler_main.c | 14 -- test/validation/api/shmem/Makefile.am | 2 +- test/validation/api/shmem/shmem.c | 11 +- test/validation/api/shmem/shmem.h | 27 --- test/validation/api/shmem/shmem_main.c | 14 -- test/validation/api/std_clib/Makefile.am | 2 +- test/validation/api/std_clib/std_clib.c | 3 +- test/validation/api/std_clib/std_clib.h | 21 --- test/validation/api/std_clib/std_clib_main.c | 14 -- test/validation/api/system/Makefile.am | 2 +- test/validation/api/system/system.c | 44 ++--- test/validation/api/system/system.h | 45 ----- test/validation/api/system/system_main.c | 14 -- test/validation/api/thread/Makefile.am | 2 +- test/validation/api/thread/thread.c | 13 +- test/validation/api/thread/thread.h | 33 ---- test/validation/api/thread/thread_main.c | 14 -- test/validation/api/time/Makefile.am | 2 +- test/validation/api/time/time.c | 33 ++-- test/validation/api/time/time_main.c | 14 -- test/validation/api/time/time_test.h | 38 ---- test/validation/api/timer/Makefile.am | 2 +- test/validation/api/timer/timer.c | 11 +- test/validation/api/timer/timer.h | 27 --- test/validation/api/timer/timer_main.c | 14 -- test/validation/api/traffic_mngr/Makefile.am | 9 +- test/validation/api/traffic_mngr/traffic_mngr.c | 41 +++-- test/validation/api/traffic_mngr/traffic_mngr.h | 45 ----- .../api/traffic_mngr/traffic_mngr_main.c | 14 -- 111 files changed, 552 insertions(+), 1780 deletions(-) delete mode 100755 example/generator/generator_run.sh create mode 100644 platform/linux-generic/test/example/Makefile.am create mode 100644 platform/linux-generic/test/example/generator/Makefile.am create mode 100755 platform/linux-generic/test/example/generator/generator_run.sh delete mode 100644 test/validation/api/atomic/atomic.h delete mode 100644 test/validation/api/atomic/atomic_main.c delete mode 100644 test/validation/api/barrier/barrier.h delete mode 100644 test/validation/api/barrier/barrier_main.c delete mode 100644 test/validation/api/buffer/buffer.h delete mode 100644 test/validation/api/buffer/buffer_main.c delete mode 100644 test/validation/api/chksum/chksum.h delete mode 100644 test/validation/api/chksum/chksum_main.c delete mode 100644 test/validation/api/classification/classification_main.c delete mode 100644 test/validation/api/cpumask/cpumask.h delete mode 100644 test/validation/api/cpumask/cpumask_main.c delete mode 100644 test/validation/api/crypto/crypto.c delete mode 100644 test/validation/api/crypto/crypto.h delete mode 100644 test/validation/api/crypto/crypto_main.c delete mode 100644 test/validation/api/crypto/odp_crypto_test_inp.h delete mode 100644 test/validation/api/errno/errno.h delete mode 100644 test/validation/api/errno/errno_main.c delete mode 100644 test/validation/api/event/event.h delete mode 100644 test/validation/api/event/event_main.c delete mode 100644 test/validation/api/hash/hash.h delete mode 100644 test/validation/api/hash/hash_main.c delete mode 100644 test/validation/api/lock/lock.h delete mode 100644 test/validation/api/lock/lock_main.c delete mode 100644 test/validation/api/packet/packet.h delete mode 100644 test/validation/api/packet/packet_main.c delete mode 100644 test/validation/api/pktio/pktio.h delete mode 100644 test/validation/api/pktio/pktio_main.c delete mode 100644 test/validation/api/pool/pool.h delete mode 100644 test/validation/api/pool/pool_main.c delete mode 100644 test/validation/api/queue/queue.h delete mode 100644 test/validation/api/queue/queue_main.c delete mode 100644 test/validation/api/random/random.h delete mode 100644 test/validation/api/random/random_main.c delete mode 100644 test/validation/api/scheduler/scheduler.h delete mode 100644 test/validation/api/scheduler/scheduler_main.c delete mode 100644 test/validation/api/shmem/shmem.h delete mode 100644 test/validation/api/shmem/shmem_main.c delete mode 100644 test/validation/api/std_clib/std_clib.h delete mode 100644 test/validation/api/std_clib/std_clib_main.c delete mode 100644 test/validation/api/system/system.h delete mode 100644 test/validation/api/system/system_main.c delete mode 100644 test/validation/api/thread/thread.h delete mode 100644 test/validation/api/thread/thread_main.c delete mode 100644 test/validation/api/time/time_main.c delete mode 100644 test/validation/api/time/time_test.h delete mode 100644 test/validation/api/timer/timer.h delete mode 100644 test/validation/api/timer/timer_main.c delete mode 100644 test/validation/api/traffic_mngr/traffic_mngr.h delete mode 100644 test/validation/api/traffic_mngr/traffic_mngr_main.c hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-238-g5a58bbf2

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb (commit) from 115de92568af53becceae8300fe2f2b6a3436cfc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Feb 14 22:41:18 2018 +0300 example: generator move to platform tests run generator example with null pktio from linux-generic test directory. Null pktio might not be implemented on other odp implementations. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 63f4ae60..7deeef40 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -3,8 +3,3 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_generator odp_generator_SOURCES = odp_generator.c - -if test_example -TESTS = generator_run.sh -endif -EXTRA_DIST = generator_run.sh diff --git a/example/generator/generator_run.sh b/example/generator/generator_run.sh deleted file mode 100755 index 2d741a8d..00000000 --- a/example/generator/generator_run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2018, Linaro Limited -# All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -./odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u -STATUS=$? - -if [ "$STATUS" -ne 0 ]; then - echo "Error: status was: $STATUS, expected 0" - exit 1 -fi - -exit 0 diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7fa3652e..935894b8 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -19,6 +19,8 @@ AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc platform/linux-generic/test/Makefile + platform/linux-generic/test/example/Makefile + platform/linux-generic/test/example/generator/Makefile platform/linux-generic/test/validation/api/shmem/Makefile platform/linux-generic/test/validation/api/pktio/Makefile platform/linux-generic/test/mmap_vlan_ins/Makefile diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 99934099..e317ff73 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -3,6 +3,10 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation SUBDIRS = performance +if test_example +SUBDIRS += example +endif + if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ diff --git a/platform/linux-generic/test/example/Makefile.am b/platform/linux-generic/test/example/Makefile.am new file mode 100644 index 00000000..41d28752 --- /dev/null +++ b/platform/linux-generic/test/example/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = generator diff --git a/platform/linux-generic/test/example/generator/Makefile.am b/platform/linux-generic/test/example/generator/Makefile.am new file mode 100644 index 00000000..3bdfdc69 --- /dev/null +++ b/platform/linux-generic/test/example/generator/Makefile.am @@ -0,0 +1,4 @@ +TESTS_ENVIRONMENT = EXAMPLE_DIR=${top_builddir}/example/generator + +TESTS = generator_run.sh +EXTRA_DIST = generator_run.sh diff --git a/platform/linux-generic/test/example/generator/generator_run.sh b/platform/linux-generic/test/example/generator/generator_run.sh new file mode 100755 index 00000000..3e7fabfe --- /dev/null +++ b/platform/linux-generic/test/example/generator/generator_run.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +# directory where platform test sources are, including scripts +TEST_SRC_DIR=$(dirname $0) + +# exit codes expected by automake for skipped tests +TEST_SKIPPED=77 + +# directories where binary can be found: +# -in the validation dir when running make check (intree or out of tree) +# -in the script directory, when running after 'make install', or +# -in the validation when running standalone intree. +# -in the current directory. +# running stand alone out of tree requires setting PATH +PATH="${EXAMPLE_DIR}/:$PATH" +PATH="`pwd`/example/generator/:$PATH" +PATH="$(dirname $0)/../../../../../example/generator:$PATH" +PATH=".:$PATH" + +bin_path=$(which odp_generator${EXEEXT}) +if [ -x "$bin_path" ] ; then + echo "running with odp_generator: $bin_path" +else + echo "cannot odp_generator: please set you PATH for it." + pwd + echo $PATH + exit 1 +fi + + +odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u +STATUS=$? + +if [ "$STATUS" -ne 0 ]; then + echo "Error: status was: $STATUS, expected 0" + exit 1 +fi + +exit 0 ----------------------------------------------------------------------- Summary of changes: example/generator/Makefile.am | 5 --- example/generator/generator_run.sh | 17 -------- platform/linux-generic/m4/configure.m4 | 2 + platform/linux-generic/test/Makefile.am | 4 ++ platform/linux-generic/test/example/Makefile.am | 1 + .../test/example/generator/Makefile.am | 4 ++ .../test/example/generator/generator_run.sh | 45 ++++++++++++++++++++++ 7 files changed, 56 insertions(+), 22 deletions(-) delete mode 100755 example/generator/generator_run.sh create mode 100644 platform/linux-generic/test/example/Makefile.am create mode 100644 platform/linux-generic/test/example/generator/Makefile.am create mode 100755 platform/linux-generic/test/example/generator/generator_run.sh hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-237-g115de925

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 115de92568af53becceae8300fe2f2b6a3436cfc (commit) via 2f62f234d0b83f4deedcfb75213a6e901e87d902 (commit) via d3e7f84960c29b58ad78de745b4bc3d5f26fc77d (commit) via fd22012f6f8e621fb22d5f4d6c15347f9535a902 (commit) via c2837dee41364443bc95aa97611e3d721ef16813 (commit) via eba4477a5cd5300d608ddfc53ff00cd3e51805a6 (commit) via 3e90ecc0bfa4487a29fbdff7ccc1cf5a2a1e8bc0 (commit) via dfa1ee94dae761166126445739be0dd6843f6792 (commit) via 01014bb374153d7bc879b3e1d26e79a6dfe5c329 (commit) via d7f9a326839de8d731d95ba3a1c45114198887d1 (commit) via b07985be674cef618fabeb7111ffa4dbb3e74fef (commit) via 74948cab5525f59e016dc984d95cb51f2ce2f963 (commit) via 4ffba79dfc573070f61da8894877783601e3aff4 (commit) via 4fc0e934df0bbd0779c6051595add213f752272a (commit) via 69367466a8c3e30509b1f86c4751285aab37efb8 (commit) via d1da7104eb4875287c816aec7e145a7504239156 (commit) via 409d87e542b9f018467c2c62bb07a8e4f2a15993 (commit) via f4d395f2a80646c0609b62fbe37cd14465df74ac (commit) via dab09417bf432da56aeddb2feaef9e6a11b739d7 (commit) via f7938ef11ede6ed6843bb7608a98ab3d15cf8e1c (commit) via 9e40c760b95077a4ca4e652e4d39a4304e5828f6 (commit) via 7c733ea2be5898660a3d02cdd2cf1f0a64a50e0c (commit) via e8d209cc33a34c7ee92053e3f240c542068816dd (commit) via 157737a4629a569f453762f92be2e3d174dfe1e5 (commit) via e4fec7da3e89c20cfe3c4d96c5fbe02ebbea57b3 (commit) from d5419e8857b2bc61d3be17fe53f171550fee426b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 115de92568af53becceae8300fe2f2b6a3436cfc Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:25:20 2018 +0300 validation: traffic_mngr: do not run the test twice Currently tm test will be run twice: from the subdir and from main validation/api dir. Run it only once together with the rest of tests. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index 1f49d4cb..a9b8550d 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -2,14 +2,9 @@ include ../Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${builddir} -TESTSCRIPTS = traffic_mngr.sh -TEST_EXTENSIONS = .sh - -TESTS = $(TESTSCRIPTS) - test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr.c LDADD += -lm -dist_check_SCRIPTS = $(TESTSCRIPTS) +dist_check_SCRIPTS = traffic_mngr.sh test_SCRIPTS = $(dist_check_SCRIPTS) commit 2f62f234d0b83f4deedcfb75213a6e901e87d902 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: pktio: simplify test infrastructure Merge separate file with just main() function into main test files. Split single pktio test into pktio and parser tests. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh index bf9fc456..5ab45094 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh @@ -25,6 +25,7 @@ if [ -x "$pktio_main_path" ] ; then echo "running with $pktio_main_path" else echo "cannot find pktio_main${EXEEXT}: please set you PATH for it." + exit 1 fi PCAP_FNAME=vald.pcap diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am index a6a16e2f..ffd1827b 100644 --- a/test/validation/api/pktio/Makefile.am +++ b/test/validation/api/pktio/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = pktio_main -pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h +pktio_main_SOURCES = pktio.c parser.c parser.h diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c index 1788d4d6..e0431441 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio/parser.c @@ -14,7 +14,6 @@ #include <stdlib.h> #include "parser.h" -#include "pktio.h" #define MAX_NUM_IFACES 2 #define PKT_POOL_NUM 256 @@ -208,6 +207,21 @@ static odp_packet_t recv_and_cmp_packet(odp_pktin_queue_t pktin, return pkt; } +static void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst) +{ + uint32_t len; + odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len); + int ret; + + ret = odp_pktio_mac_addr(src, &eth->src, ODP_PKTIO_MACADDR_MAXSIZE); + CU_ASSERT(ret == ODPH_ETHADDR_LEN); + CU_ASSERT(ret <= ODP_PKTIO_MACADDR_MAXSIZE); + + ret = odp_pktio_mac_addr(dst, &eth->dst, ODP_PKTIO_MACADDR_MAXSIZE); + CU_ASSERT(ret == ODPH_ETHADDR_LEN); + CU_ASSERT(ret <= ODP_PKTIO_MACADDR_MAXSIZE); +} + /** * Creates a test packet from data array and loops it through the test pktio * interfaces forcing packet parsing. @@ -257,7 +271,7 @@ static odp_packet_t loopback_packet(pktio_info_t *pktio_a, return pkt; } -void parser_test_arp(void) +static void parser_test_arp(void) { odp_packet_t pkt; @@ -273,7 +287,7 @@ void parser_test_arp(void) odp_packet_free(pkt); } -void parser_test_ipv4_icmp(void) +static void parser_test_ipv4_icmp(void) { odp_packet_t pkt; @@ -291,7 +305,7 @@ void parser_test_ipv4_icmp(void) odp_packet_free(pkt); } -void parser_test_ipv4_tcp(void) +static void parser_test_ipv4_tcp(void) { odp_packet_t pkt; @@ -308,7 +322,7 @@ void parser_test_ipv4_tcp(void) odp_packet_free(pkt); } -void parser_test_ipv4_udp(void) +static void parser_test_ipv4_udp(void) { odp_packet_t pkt; @@ -325,7 +339,7 @@ void parser_test_ipv4_udp(void) odp_packet_free(pkt); } -void parser_test_vlan_ipv4_udp(void) +static void parser_test_vlan_ipv4_udp(void) { odp_packet_t pkt; @@ -343,7 +357,7 @@ void parser_test_vlan_ipv4_udp(void) odp_packet_free(pkt); } -void parser_test_vlan_qinq_ipv4_udp(void) +static void parser_test_vlan_qinq_ipv4_udp(void) { odp_packet_t pkt; @@ -362,7 +376,7 @@ void parser_test_vlan_qinq_ipv4_udp(void) odp_packet_free(pkt); } -void parser_test_ipv6_icmp(void) +static void parser_test_ipv6_icmp(void) { odp_packet_t pkt; @@ -380,7 +394,7 @@ void parser_test_ipv6_icmp(void) odp_packet_free(pkt); } -void parser_test_ipv6_tcp(void) +static void parser_test_ipv6_tcp(void) { odp_packet_t pkt; @@ -397,7 +411,7 @@ void parser_test_ipv6_tcp(void) odp_packet_free(pkt); } -void parser_test_ipv6_udp(void) +static void parser_test_ipv6_udp(void) { odp_packet_t pkt; @@ -414,7 +428,7 @@ void parser_test_ipv6_udp(void) odp_packet_free(pkt); } -void parser_test_vlan_ipv6_udp(void) +static void parser_test_vlan_ipv6_udp(void) { odp_packet_t pkt; diff --git a/test/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h index d95ecca1..688990fb 100644 --- a/test/validation/api/pktio/parser.h +++ b/test/validation/api/pktio/parser.h @@ -9,18 +9,6 @@ #include <odp_cunit_common.h> -/* test functions: */ -void parser_test_arp(void); -void parser_test_ipv4_icmp(void); -void parser_test_ipv4_tcp(void); -void parser_test_ipv4_udp(void); -void parser_test_vlan_ipv4_udp(void); -void parser_test_vlan_qinq_ipv4_udp(void); -void parser_test_ipv6_icmp(void); -void parser_test_ipv6_tcp(void); -void parser_test_ipv6_udp(void); -void parser_test_vlan_ipv6_udp(void); - /* test array init/term functions: */ int parser_suite_term(void); int parser_suite_init(void); diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index b20272ff..a0496642 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -12,7 +12,6 @@ #include <odp/helper/odph_api.h> #include <stdlib.h> -#include "pktio.h" #include "parser.h" #define PKT_BUF_NUM 32 @@ -150,7 +149,7 @@ static void set_pool_len(odp_pool_param_t *params, odp_pool_capability_t *capa) } } -void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst) +static void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst) { uint32_t len; odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len); @@ -751,59 +750,59 @@ static void test_txrx(odp_pktin_mode_t in_mode, int num_pkts, } } -void pktio_test_plain_queue(void) +static void pktio_test_plain_queue(void) { test_txrx(ODP_PKTIN_MODE_QUEUE, 1, TXRX_MODE_SINGLE); test_txrx(ODP_PKTIN_MODE_QUEUE, TX_BATCH_LEN, TXRX_MODE_SINGLE); } -void pktio_test_plain_multi(void) +static void pktio_test_plain_multi(void) { test_txrx(ODP_PKTIN_MODE_QUEUE, TX_BATCH_LEN, TXRX_MODE_MULTI); test_txrx(ODP_PKTIN_MODE_QUEUE, 1, TXRX_MODE_MULTI); } -void pktio_test_plain_multi_event(void) +static void pktio_test_plain_multi_event(void) { test_txrx(ODP_PKTIN_MODE_QUEUE, 1, TXRX_MODE_MULTI_EVENT); test_txrx(ODP_PKTIN_MODE_QUEUE, TX_BATCH_LEN, TXRX_MODE_MULTI_EVENT); } -void pktio_test_sched_queue(void) +static void pktio_test_sched_queue(void) { test_txrx(ODP_PKTIN_MODE_SCHED, 1, TXRX_MODE_SINGLE); test_txrx(ODP_PKTIN_MODE_SCHED, TX_BATCH_LEN, TXRX_MODE_SINGLE); } -void pktio_test_sched_multi(void) +static void pktio_test_sched_multi(void) { test_txrx(ODP_PKTIN_MODE_SCHED, TX_BATCH_LEN, TXRX_MODE_MULTI); test_txrx(ODP_PKTIN_MODE_SCHED, 1, TXRX_MODE_MULTI); } -void pktio_test_sched_multi_event(void) +static void pktio_test_sched_multi_event(void) { test_txrx(ODP_PKTIN_MODE_SCHED, 1, TXRX_MODE_MULTI_EVENT); test_txrx(ODP_PKTIN_MODE_SCHED, TX_BATCH_LEN, TXRX_MODE_MULTI_EVENT); } -void pktio_test_recv(void) +static void pktio_test_recv(void) { test_txrx(ODP_PKTIN_MODE_DIRECT, 1, TXRX_MODE_SINGLE); } -void pktio_test_recv_multi(void) +static void pktio_test_recv_multi(void) { test_txrx(ODP_PKTIN_MODE_DIRECT, TX_BATCH_LEN, TXRX_MODE_MULTI); } -void pktio_test_recv_multi_event(void) +static void pktio_test_recv_multi_event(void) { test_txrx(ODP_PKTIN_MODE_DIRECT, 1, TXRX_MODE_MULTI_EVENT); test_txrx(ODP_PKTIN_MODE_DIRECT, TX_BATCH_LEN, TXRX_MODE_MULTI_EVENT); } -void pktio_test_recv_queue(void) +static void pktio_test_recv_queue(void) { odp_pktio_t pktio_tx, pktio_rx; odp_pktio_t pktio[MAX_NUM_IFACES]; @@ -1005,25 +1004,25 @@ static void test_recv_tmo(recv_tmo_mode_e mode) } } -void pktio_test_recv_tmo(void) +static void pktio_test_recv_tmo(void) { test_recv_tmo(RECV_TMO); } -void pktio_test_recv_mq_tmo(void) +static void pktio_test_recv_mq_tmo(void) { test_recv_tmo(RECV_MQ_TMO); test_recv_tmo(RECV_MQ_TMO_NO_IDX); } -void pktio_test_recv_mtu(void) +static void pktio_test_recv_mtu(void) { packet_len = USE_MTU; pktio_test_sched_multi(); packet_len = PKT_LEN_NORMAL; } -void pktio_test_mtu(void) +static void pktio_test_mtu(void) { int ret; uint32_t maxlen; @@ -1046,7 +1045,7 @@ void pktio_test_mtu(void) CU_ASSERT(ret == 0); } -void pktio_test_promisc(void) +static void pktio_test_promisc(void) { int ret; odp_pktio_capability_t capa; @@ -1084,7 +1083,7 @@ void pktio_test_promisc(void) CU_ASSERT(ret == 0); } -void pktio_test_mac(void) +static void pktio_test_mac(void) { unsigned char mac_addr[ODP_PKTIO_MACADDR_MAXSIZE]; unsigned char mac_addr_ref[ODP_PKTIO_MACADDR_MAXSIZE] = { @@ -1137,7 +1136,7 @@ void pktio_test_mac(void) CU_ASSERT(0 == ret); } -void pktio_test_open(void) +static void pktio_test_open(void) { odp_pktio_t pktio; odp_pktio_param_t pktio_param; @@ -1158,7 +1157,7 @@ void pktio_test_open(void) CU_ASSERT(pktio == ODP_PKTIO_INVALID); } -void pktio_test_lookup(void) +static void pktio_test_lookup(void) { odp_pktio_t pktio, pktio_inval; odp_pktio_param_t pktio_param; @@ -1181,7 +1180,7 @@ void pktio_test_lookup(void) CU_ASSERT(odp_pktio_lookup(iface_name[0]) == ODP_PKTIO_INVALID); } -void pktio_test_index(void) +static void pktio_test_index(void) { odp_pktio_t pktio; odp_pktio_param_t pktio_param; @@ -1217,7 +1216,7 @@ static void pktio_test_print(void) } } -void pktio_test_pktio_config(void) +static void pktio_test_pktio_config(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1242,7 +1241,7 @@ void pktio_test_pktio_config(void) CU_ASSERT_FATAL(odp_pktio_close(pktio) == 0); } -void pktio_test_info(void) +static void pktio_test_info(void) { odp_pktio_t pktio; odp_pktio_info_t pktio_info; @@ -1269,7 +1268,7 @@ void pktio_test_info(void) } } -void pktio_test_pktin_queue_config_direct(void) +static void pktio_test_pktin_queue_config_direct(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1310,7 +1309,7 @@ void pktio_test_pktin_queue_config_direct(void) CU_ASSERT_FATAL(odp_pktio_close(pktio) == 0); } -void pktio_test_pktin_queue_config_sched(void) +static void pktio_test_pktin_queue_config_sched(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1348,7 +1347,7 @@ void pktio_test_pktin_queue_config_sched(void) CU_ASSERT_FATAL(odp_pktio_close(pktio) == 0); } -void pktio_test_pktin_queue_config_queue(void) +static void pktio_test_pktin_queue_config_queue(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1384,7 +1383,7 @@ void pktio_test_pktin_queue_config_queue(void) CU_ASSERT(odp_pktio_close(pktio) == 0); } -void pktio_test_pktout_queue_config(void) +static void pktio_test_pktout_queue_config(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1450,7 +1449,7 @@ static void _print_pktio_stats(odp_pktio_stats_t *s, const char *name) * get statistics counters. ethtool strings are not standardised * and sysfs may not be supported. skip pktio_stats test until * we will solve that.*/ -int pktio_check_statistics_counters(void) +static int pktio_check_statistics_counters(void) { odp_pktio_t pktio; odp_pktio_stats_t stats; @@ -1474,7 +1473,7 @@ int pktio_check_statistics_counters(void) return ODP_TEST_INACTIVE; } -void pktio_test_statistics_counters(void) +static void pktio_test_statistics_counters(void) { odp_pktio_t pktio_rx, pktio_tx; odp_pktio_t pktio[MAX_NUM_IFACES] = { @@ -1584,7 +1583,7 @@ void pktio_test_statistics_counters(void) } } -void pktio_test_start_stop(void) +static void pktio_test_start_stop(void) { odp_pktio_t pktio[MAX_NUM_IFACES]; odp_pktio_t pktio_in; @@ -1713,7 +1712,7 @@ void pktio_test_start_stop(void) * biggest packet we can allocate then the test won't be able to * attempt to send packets larger than the max len, so skip the test. */ -int pktio_check_send_failure(void) +static int pktio_check_send_failure(void) { odp_pktio_t pktio_tx; uint32_t maxlen; @@ -1750,7 +1749,7 @@ int pktio_check_send_failure(void) return ODP_TEST_ACTIVE; } -void pktio_test_send_failure(void) +static void pktio_test_send_failure(void) { odp_pktio_t pktio_tx, pktio_rx; odp_packet_t pkt_tbl[TX_BATCH_LEN]; @@ -1907,7 +1906,7 @@ cleanup: CU_ASSERT(odp_pool_destroy(pkt_pool) == 0); } -void pktio_test_recv_on_wonly(void) +static void pktio_test_recv_on_wonly(void) { odp_pktio_t pktio; int ret; @@ -1935,7 +1934,7 @@ void pktio_test_recv_on_wonly(void) CU_ASSERT_FATAL(ret == 0); } -void pktio_test_send_on_ronly(void) +static void pktio_test_send_on_ronly(void) { odp_pktio_t pktio; int ret; @@ -1963,7 +1962,7 @@ void pktio_test_send_on_ronly(void) CU_ASSERT_FATAL(ret == 0); } -int pktio_check_pktin_ts(void) +static int pktio_check_pktin_ts(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1986,7 +1985,7 @@ int pktio_check_pktin_ts(void) return ODP_TEST_ACTIVE; } -void pktio_test_pktin_ts(void) +static void pktio_test_pktin_ts(void) { odp_pktio_t pktio_tx, pktio_rx; odp_pktio_t pktio[MAX_NUM_IFACES]; @@ -2142,19 +2141,19 @@ static int pktio_suite_init(void) return 0; } -int pktio_suite_init_unsegmented(void) +static int pktio_suite_init_unsegmented(void) { pool_segmentation = PKT_POOL_UNSEGMENTED; return pktio_suite_init(); } -int pktio_suite_init_segmented(void) +static int pktio_suite_init_segmented(void) { pool_segmentation = PKT_POOL_SEGMENTED; return pktio_suite_init(); } -int pktio_suite_term(void) +static int pktio_suite_term(void) { char pool_name[ODP_POOL_NAME_LEN]; odp_pool_t pool; @@ -2245,7 +2244,7 @@ odp_suiteinfo_t pktio_suites[] = { ODP_SUITE_INFO_NULL }; -int pktio_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/pktio/pktio.h b/test/validation/api/pktio/pktio.h deleted file mode 100644 index b8799d9e..00000000 --- a/test/validation/api/pktio/pktio.h +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_PKTIO_H_ -#define _ODP_TEST_PKTIO_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void pktio_test_plain_queue(void); -void pktio_test_plain_multi(void); -void pktio_test_sched_queue(void); -void pktio_test_sched_multi(void); -void pktio_test_recv(void); -void pktio_test_recv_multi(void); -void pktio_test_recv_queue(void); -void pktio_test_recv_tmo(void); -void pktio_test_recv_mq_tmo(void); -void pktio_test_recv_mtu(void); -void pktio_test_mtu(void); -void pktio_test_promisc(void); -void pktio_test_mac(void); -void pktio_test_inq_remdef(void); -void pktio_test_open(void); -void pktio_test_lookup(void); -void pktio_test_index(void); -void pktio_test_info(void); -void pktio_test_inq(void); -void pktio_test_pktio_config(void); -void pktio_test_pktin_queue_config_direct(void); -void pktio_test_pktin_queue_config_sched(void); -void pktio_test_pktin_queue_config_queue(void); -void pktio_test_pktout_queue_config(void); -void pktio_test_start_stop(void); -int pktio_check_send_failure(void); -void pktio_test_send_failure(void); -void pktio_test_recv_on_wonly(void); -void pktio_test_send_on_ronly(void); -void pktio_test_plain_multi_event(void); -void pktio_test_sched_multi_event(void); -void pktio_test_recv_multi_event(void); -int pktio_check_statistics_counters(void); -void pktio_test_statistics_counters(void); -int pktio_check_pktin_ts(void); -void pktio_test_pktin_ts(void); - -/* test arrays: */ -extern odp_testinfo_t pktio_suite[]; - -/* test array init/term functions: */ -int pktio_suite_term(void); -int pktio_suite_init_segmented(void); -int pktio_suite_init_unsegmented(void); - -/* test registry: */ -extern odp_suiteinfo_t pktio_suites[]; - -/* main test program: */ -int pktio_main(int argc, char *argv[]); - -/* functions shared by parser test suite */ -void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst); - -#endif diff --git a/test/validation/api/pktio/pktio_main.c b/test/validation/api/pktio/pktio_main.c deleted file mode 100644 index 13d2407a..00000000 --- a/test/validation/api/pktio/pktio_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "pktio.h" - -int main(int argc, char *argv[]) -{ - return pktio_main(argc, argv); -} commit d3e7f84960c29b58ad78de745b4bc3d5f26fc77d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: classification: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am index 303a3576..e17f9f65 100644 --- a/test/validation/api/classification/Makefile.am +++ b/test/validation/api/classification/Makefile.am @@ -1,7 +1,7 @@ include ../Makefile.inc test_PROGRAMS = classification_main -classification_main_SOURCES = classification_main.c \ +classification_main_SOURCES = \ odp_classification_basic.c \ odp_classification_tests.c \ odp_classification_testsuites.h \ diff --git a/test/validation/api/classification/classification.c b/test/validation/api/classification/classification.c index ef621f72..e89ffbee 100644 --- a/test/validation/api/classification/classification.c +++ b/test/validation/api/classification/classification.c @@ -28,7 +28,7 @@ odp_suiteinfo_t classification_suites[] = { ODP_SUITE_INFO_NULL, }; -int classification_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/classification/classification.h b/test/validation/api/classification/classification.h index 326177ad..4a540218 100644 --- a/test/validation/api/classification/classification.h +++ b/test/validation/api/classification/classification.h @@ -76,46 +76,4 @@ #define DEFAULT_TOS ((DEFAULT_DSCP << ODPH_IP_TOS_DSCP_SHIFT) | \ DEFAULT_ECN) -/* test functions: */ -void classification_test_create_cos(void); -void classification_test_destroy_cos(void); -void classification_test_create_pmr_match(void); -void classification_test_cos_set_queue(void); -void classification_test_cos_set_pool(void); -void classification_test_cos_set_drop(void); -void classification_test_pmr_composite_create(void); -void classification_test_pmr_composite_destroy(void); - -void classification_test_pktio_set_skip(void); -void classification_test_pktio_set_headroom(void); -void classification_test_pktio_configure(void); -void classification_test_pktio_test(void); - -void classification_test_pmr_term_tcp_dport(void); -void classification_test_pmr_term_tcp_sport(void); -void classification_test_pmr_term_udp_dport(void); -void classification_test_pmr_term_udp_sport(void); -void classification_test_pmr_term_ipproto(void); -void classification_test_pmr_term_dmac(void); -void classification_test_pmr_term_packet_len(void); -void classification_test_pmr_term_vlan_id_0(void); -void classification_test_pmr_term_vlan_id_x(void); -void classification_test_pmr_term_eth_type_0(void); -void classification_test_pmr_term_eth_type_x(void); -void classification_test_pktin_classifier_flag(void); - -/* test arrays: */ -extern odp_testinfo_t classification_suite_basic[]; -extern odp_testinfo_t classification_suite[]; - -/* test array init/term functions: */ -int classification_suite_init(void); -int classification_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t classification_suites[]; - -/* main test program: */ -int classification_main(int argc, char *argv[]); - #endif diff --git a/test/validation/api/classification/classification_main.c b/test/validation/api/classification/classification_main.c deleted file mode 100644 index 51909d00..00000000 --- a/test/validation/api/classification/classification_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "classification.h" - -int main(int argc, char *argv[]) -{ - return classification_main(argc, argv); -} diff --git a/test/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c index 20f07374..8b3738b7 100644 --- a/test/validation/api/classification/odp_classification_basic.c +++ b/test/validation/api/classification/odp_classification_basic.c @@ -12,7 +12,7 @@ #define PMR_SET_NUM 5 -void classification_test_create_cos(void) +static void classification_test_create_cos(void) { odp_cos_t cos; odp_cls_cos_param_t cls_param; @@ -37,7 +37,7 @@ void classification_test_create_cos(void) odp_queue_destroy(queue); } -void classification_test_destroy_cos(void) +static void classification_test_destroy_cos(void) { odp_cos_t cos; char name[ODP_COS_NAME_LEN]; @@ -69,7 +69,7 @@ void classification_test_destroy_cos(void) odp_queue_destroy(queue); } -void classification_test_create_pmr_match(void) +static void classification_test_create_pmr_match(void) { odp_pmr_t pmr; uint16_t val; @@ -139,7 +139,7 @@ void classification_test_create_pmr_match(void) odp_pktio_close(pktio); } -void classification_test_cos_set_queue(void) +static void classification_test_cos_set_queue(void) { int retval; char cosname[ODP_COS_NAME_LEN]; @@ -182,7 +182,7 @@ void classification_test_cos_set_queue(void) odp_pool_destroy(pool); } -void classification_test_cos_set_pool(void) +static void classification_test_cos_set_pool(void) { int retval; char cosname[ODP_COS_NAME_LEN]; @@ -221,7 +221,7 @@ void classification_test_cos_set_pool(void) odp_pool_destroy(cos_pool); } -void classification_test_cos_set_drop(void) +static void classification_test_cos_set_drop(void) { int retval; char cosname[ODP_COS_NAME_LEN]; @@ -256,7 +256,7 @@ void classification_test_cos_set_drop(void) odp_queue_destroy(queue); } -void classification_test_pmr_composite_create(void) +static void classification_test_pmr_composite_create(void) { odp_pmr_t pmr_composite; int retval; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 87d04b6b..f21b8add 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -88,7 +88,7 @@ int classification_suite_pmr_term(void) return retcode; } -void classification_test_pktin_classifier_flag(void) +static void classification_test_pktin_classifier_flag(void) { odp_packet_t pkt; odph_tcphdr_t *tcp; @@ -184,7 +184,7 @@ void classification_test_pktin_classifier_flag(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_tcp_dport(void) +static void classification_test_pmr_term_tcp_dport(void) { odp_packet_t pkt; odph_tcphdr_t *tcp; @@ -298,7 +298,7 @@ void classification_test_pmr_term_tcp_dport(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_tcp_sport(void) +static void classification_test_pmr_term_tcp_sport(void) { odp_packet_t pkt; odph_tcphdr_t *tcp; @@ -410,7 +410,7 @@ void classification_test_pmr_term_tcp_sport(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_udp_dport(void) +static void classification_test_pmr_term_udp_dport(void) { odp_packet_t pkt; odph_udphdr_t *udp; @@ -526,7 +526,7 @@ void classification_test_pmr_term_udp_dport(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_udp_sport(void) +static void classification_test_pmr_term_udp_sport(void) { odp_packet_t pkt; odph_udphdr_t *udp; @@ -641,7 +641,7 @@ void classification_test_pmr_term_udp_sport(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_ipproto(void) +static void classification_test_pmr_term_ipproto(void) { odp_packet_t pkt; uint32_t seqno; @@ -750,7 +750,7 @@ void classification_test_pmr_term_ipproto(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_dmac(void) +static void classification_test_pmr_term_dmac(void) { odp_packet_t pkt; uint32_t seqno; @@ -856,7 +856,7 @@ void classification_test_pmr_term_dmac(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_packet_len(void) +static void classification_test_pmr_term_packet_len(void) { odp_packet_t pkt; uint32_t seqno; @@ -968,7 +968,7 @@ void classification_test_pmr_term_packet_len(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_vlan_id_0(void) +static void classification_test_pmr_term_vlan_id_0(void) { odp_packet_t pkt; uint32_t seqno; @@ -1081,7 +1081,7 @@ void classification_test_pmr_term_vlan_id_0(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_vlan_id_x(void) +static void classification_test_pmr_term_vlan_id_x(void) { odp_packet_t pkt; uint32_t seqno; @@ -1195,7 +1195,7 @@ void classification_test_pmr_term_vlan_id_x(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_eth_type_0(void) +static void classification_test_pmr_term_eth_type_0(void) { odp_packet_t pkt; uint32_t seqno; @@ -1304,7 +1304,7 @@ void classification_test_pmr_term_eth_type_0(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_eth_type_x(void) +static void classification_test_pmr_term_eth_type_x(void) { odp_packet_t pkt; uint32_t seqno; diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index c7f5d0d4..4cd727f9 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -399,7 +399,7 @@ void test_pktio_error_cos(void) odp_packet_free(pkt); } -void classification_test_pktio_set_skip(void) +static void classification_test_pktio_set_skip(void) { int retval; size_t offset = 5; @@ -417,7 +417,7 @@ void classification_test_pktio_set_skip(void) CU_ASSERT(retval == 0); } -void classification_test_pktio_set_headroom(void) +static void classification_test_pktio_set_headroom(void) { size_t headroom; int retval; @@ -681,7 +681,7 @@ void test_pktio_pmr_composite_cos(void) odp_packet_free(pkt); } -void classification_test_pktio_configure(void) +static void classification_test_pktio_configure(void) { /* Configure the Different CoS for the pktio interface */ if (TEST_DEFAULT) @@ -698,7 +698,7 @@ void classification_test_pktio_configure(void) configure_pktio_pmr_composite(); } -void classification_test_pktio_test(void) +static void classification_test_pktio_test(void) { /* Test Different CoS on the pktio interface */ if (TEST_DEFAULT) commit fd22012f6f8e621fb22d5f4d6c15347f9535a902 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: crypto: simplify test infrastructure Merge separate file with just main() function into main test file. Merge crypto.c file containing several small functions into test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am index 238ce189..cc4d49d6 100644 --- a/test/validation/api/crypto/Makefile.am +++ b/test/validation/api/crypto/Makefile.am @@ -1,10 +1,7 @@ include ../Makefile.inc test_PROGRAMS = crypto_main -crypto_main_SOURCES = crypto_main.c \ - crypto.c \ - crypto.h \ +crypto_main_SOURCES = \ odp_crypto_test_inp.c \ - odp_crypto_test_inp.h \ test_vectors.h \ test_vectors_len.h diff --git a/test/validation/api/crypto/crypto.c b/test/validation/api/crypto/crypto.c deleted file mode 100644 index 7298d544..00000000 --- a/test/validation/api/crypto/crypto.c +++ /dev/null @@ -1,135 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <odp_api.h> -#include <odp_cunit_common.h> -#include "odp_crypto_test_inp.h" -#include "crypto.h" - -#define PKT_POOL_NUM 64 -#define PKT_POOL_LEN (1 * 1024) - -odp_suiteinfo_t crypto_suites[] = { - {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, - crypto_suite_term, crypto_suite}, - {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, - crypto_suite_term, crypto_suite}, - {ODP_CRYPTO_PACKET_SYNC_INP, crypto_suite_packet_sync_init, - crypto_suite_term, crypto_suite}, - {ODP_CRYPTO_PACKET_ASYNC_INP, crypto_suite_packet_async_init, - crypto_suite_term, crypto_suite}, - ODP_SUITE_INFO_NULL, -}; - -int crypto_init(odp_instance_t *inst) -{ - odp_pool_param_t params; - odp_pool_t pool; - odp_queue_t out_queue; - odp_pool_capability_t pool_capa; - - if (0 != odp_init_global(inst, NULL, NULL)) { - fprintf(stderr, "error: odp_init_global() failed.\n"); - return -1; - } - - if (0 != odp_init_local(*inst, ODP_THREAD_CONTROL)) { - fprintf(stderr, "error: odp_init_local() failed.\n"); - return -1; - } - - if (odp_pool_capability(&pool_capa) < 0) { - fprintf(stderr, "error: odp_pool_capability() failed.\n"); - return -1; - } - - odp_pool_param_init(&params); - params.pkt.seg_len = PKT_POOL_LEN; - params.pkt.len = PKT_POOL_LEN; - params.pkt.num = PKT_POOL_NUM; - params.type = ODP_POOL_PACKET; - - if (pool_capa.pkt.max_seg_len && - PKT_POOL_LEN > pool_capa.pkt.max_seg_len) { - fprintf(stderr, "Warning: small packet segment length\n"); - params.pkt.seg_len = pool_capa.pkt.max_seg_len; - } - - if (pool_capa.pkt.max_len && - PKT_POOL_LEN > pool_capa.pkt.max_len) { - fprintf(stderr, "Pool max packet length too small\n"); - return -1; - } - - pool = odp_pool_create("packet_pool", &params); - - if (ODP_POOL_INVALID == pool) { - fprintf(stderr, "Packet pool creation failed.\n"); - return -1; - } - out_queue = odp_queue_create("crypto-out", NULL); - if (ODP_QUEUE_INVALID == out_queue) { - fprintf(stderr, "Crypto outq creation failed.\n"); - return -1; - } - - return 0; -} - -int crypto_term(odp_instance_t inst) -{ - odp_pool_t pool; - odp_queue_t out_queue; - - out_queue = odp_queue_lookup("crypto-out"); - if (ODP_QUEUE_INVALID != out_queue) { - if (odp_queue_destroy(out_queue)) - fprintf(stderr, "Crypto outq destroy failed.\n"); - } else { - fprintf(stderr, "Crypto outq not found.\n"); - } - - pool = odp_pool_lookup("packet_pool"); - if (ODP_POOL_INVALID != pool) { - if (odp_pool_destroy(pool)) - fprintf(stderr, "Packet pool destroy failed.\n"); - } else { - fprintf(stderr, "Packet pool not found.\n"); - } - - if (0 != odp_term_local()) { - fprintf(stderr, "error: odp_term_local() failed.\n"); - return -1; - } - - if (0 != odp_term_global(inst)) { - fprintf(stderr, "error: odp_term_global() failed.\n"); - return -1; - } - - return 0; -} - -int crypto_main(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - odp_cunit_register_global_init(crypto_init); - odp_cunit_register_global_term(crypto_term); - - ret = odp_cunit_register(crypto_suites); - - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} diff --git a/test/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h deleted file mode 100644 index 078a1909..00000000 --- a/test/validation/api/crypto/crypto.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_CRYPTO_H_ -#define _ODP_TEST_CRYPTO_H_ - -#include "odp_cunit_common.h" - -/* test functions: */ -void crypto_test_enc_alg_null(void); -void crypto_test_dec_alg_null(void); -void crypto_test_enc_alg_3des_cbc(void); -void crypto_test_enc_alg_3des_cbc_ovr_iv(void); -void crypto_test_dec_alg_3des_cbc(void); -void crypto_test_dec_alg_3des_cbc_ovr_iv(void); -void crypto_test_enc_alg_aes_cbc(void); -void crypto_test_enc_alg_aes_cbc_ovr_iv(void); -void crypto_test_dec_alg_aes_cbc(void); -void crypto_test_dec_alg_aes_cbc_ovr_iv(void); -void crypto_test_enc_alg_aes_ctr(void); -void crypto_test_enc_alg_aes_ctr_ovr_iv(void); -void crypto_test_dec_alg_aes_ctr(void); -void crypto_test_dec_alg_aes_ctr_ovr_iv(void); -void crypto_test_enc_alg_aes_gcm(void); -void crypto_test_enc_alg_aes_gcm_ovr_iv(void); -void crypto_test_dec_alg_aes_gcm(void); -void crypto_test_dec_alg_aes_gcm_ovr_iv(void); -void crypto_test_gen_alg_hmac_md5(void); -void crypto_test_check_alg_hmac_md5(void); -void crypto_test_gen_alg_hmac_sha1(void); -void crypto_test_check_alg_hmac_sha1(void); -void crypto_test_gen_alg_hmac_sha256(void); -void crypto_test_check_alg_hmac_sha256(void); -void crypto_test_gen_alg_hmac_sha512(void); -void crypto_test_check_alg_hmac_sha512(void); -void crypto_test_gen_alg_aes_gmac(void); -void crypto_test_check_alg_aes_gmac(void); - -/* test arrays: */ -extern odp_testinfo_t crypto_suite[]; - -/* test array init/term functions: */ -int crypto_suite_sync_init(void); -int crypto_suite_async_init(void); - -/* test registry: */ -extern odp_suiteinfo_t crypto_suites[]; - -/* executable init/term functions: */ -int crypto_init(odp_instance_t *inst); -int crypto_term(odp_instance_t inst); - -/* main test program: */ -int crypto_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/crypto/crypto_main.c b/test/validation/api/crypto/crypto_main.c deleted file mode 100644 index 2d5c6c7e..00000000 --- a/test/validation/api/crypto/crypto_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "crypto.h" - -int main(int argc, char *argv[]) -{ - return crypto_main(argc, argv); -} diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index df1c7b6f..ec477535 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -10,11 +10,12 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include "test_vectors.h" -#include "odp_crypto_test_inp.h" -#include "crypto.h" #define MAX_ALG_CAPA 32 +#define PKT_POOL_NUM 64 +#define PKT_POOL_LEN (1 * 1024) + struct suite_context_s { odp_bool_t packet; odp_crypto_op_mode_t op_mode; @@ -686,7 +687,7 @@ static int check_alg_null(void) } #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -void crypto_test_enc_alg_null(void) +static void crypto_test_enc_alg_null(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -696,7 +697,7 @@ void crypto_test_enc_alg_null(void) false); } -void crypto_test_dec_alg_null(void) +static void crypto_test_dec_alg_null(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -715,7 +716,7 @@ static int check_alg_3des_cbc(void) * operation for 3DES_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_3des_cbc(void) +static void crypto_test_enc_alg_3des_cbc(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_3DES_CBC, @@ -728,7 +729,7 @@ void crypto_test_enc_alg_3des_cbc(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for 3DES_CBC algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_3des_cbc_ovr_iv(void) +static void crypto_test_enc_alg_3des_cbc_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_3DES_CBC, @@ -743,7 +744,7 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_3des_cbc(void) +static void crypto_test_dec_alg_3des_cbc(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_3DES_CBC, @@ -758,7 +759,7 @@ void crypto_test_dec_alg_3des_cbc(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_3des_cbc_ovr_iv(void) +static void crypto_test_dec_alg_3des_cbc_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_3DES_CBC, @@ -777,7 +778,7 @@ static int check_alg_aes_gcm(void) * operation for AES128_GCM algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_gcm(void) +static void crypto_test_enc_alg_aes_gcm(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, @@ -791,7 +792,7 @@ void crypto_test_enc_alg_aes_gcm(void) * operation for AES128_GCM algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_gcm_ovr_iv(void) +static void crypto_test_enc_alg_aes_gcm_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, @@ -806,7 +807,7 @@ void crypto_test_enc_alg_aes_gcm_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_gcm(void) +static void crypto_test_dec_alg_aes_gcm(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, @@ -821,7 +822,7 @@ void crypto_test_dec_alg_aes_gcm(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_gcm_ovr_iv(void) +static void crypto_test_dec_alg_aes_gcm_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, @@ -840,7 +841,7 @@ static int check_alg_aes_cbc(void) * operation for AES128_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_cbc(void) +static void crypto_test_enc_alg_aes_cbc(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CBC, @@ -853,7 +854,7 @@ void crypto_test_enc_alg_aes_cbc(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_CBC algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_aes_cbc_ovr_iv(void) +static void crypto_test_enc_alg_aes_cbc_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CBC, @@ -868,7 +869,7 @@ void crypto_test_enc_alg_aes_cbc_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_cbc(void) +static void crypto_test_dec_alg_aes_cbc(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CBC, @@ -883,7 +884,7 @@ void crypto_test_dec_alg_aes_cbc(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_cbc_ovr_iv(void) +static void crypto_test_dec_alg_aes_cbc_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CBC, @@ -902,7 +903,7 @@ static int check_alg_aes_ctr(void) * operation for AES128_CTR algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_ctr(void) +static void crypto_test_enc_alg_aes_ctr(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CTR, @@ -915,7 +916,7 @@ void crypto_test_enc_alg_aes_ctr(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_CTR algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_aes_ctr_ovr_iv(void) +static void crypto_test_enc_alg_aes_ctr_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CTR, @@ -930,7 +931,7 @@ void crypto_test_enc_alg_aes_ctr_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_ctr(void) +static void crypto_test_dec_alg_aes_ctr(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CTR, @@ -945,7 +946,7 @@ void crypto_test_dec_alg_aes_ctr(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_ctr_ovr_iv(void) +static void crypto_test_dec_alg_aes_ctr_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CTR, @@ -967,7 +968,7 @@ static int check_alg_hmac_md5(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_md5(void) +static void crypto_test_gen_alg_hmac_md5(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -977,7 +978,7 @@ void crypto_test_gen_alg_hmac_md5(void) false); } -void crypto_test_check_alg_hmac_md5(void) +static void crypto_test_check_alg_hmac_md5(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -999,7 +1000,7 @@ static int check_alg_hmac_sha1(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha1(void) +static void crypto_test_gen_alg_hmac_sha1(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -1009,7 +1010,7 @@ void crypto_test_gen_alg_hmac_sha1(void) false); } -void crypto_test_check_alg_hmac_sha1(void) +static void crypto_test_check_alg_hmac_sha1(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -1031,7 +1032,7 @@ static int check_alg_hmac_sha256(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha256(void) +static void crypto_test_gen_alg_hmac_sha256(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -1041,7 +1042,7 @@ void crypto_test_gen_alg_hmac_sha256(void) false); } -void crypto_test_check_alg_hmac_sha256(void) +static void crypto_test_check_alg_hmac_sha256(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -1063,7 +1064,7 @@ static int check_alg_hmac_sha512(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha512(void) +static void crypto_test_gen_alg_hmac_sha512(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -1073,7 +1074,7 @@ void crypto_test_gen_alg_hmac_sha512(void) false); } -void crypto_test_check_alg_hmac_sha512(void) +static void crypto_test_check_alg_hmac_sha512(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -1088,7 +1089,7 @@ static int check_alg_aes_gmac(void) return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_GMAC); } -void crypto_test_gen_alg_aes_gmac(void) +static void crypto_test_gen_alg_aes_gmac(void) { unsigned int test_vec_num = (sizeof(aes_gmac_reference) / sizeof(aes_gmac_reference[0])); @@ -1103,7 +1104,7 @@ void crypto_test_gen_alg_aes_gmac(void) false); } -void crypto_test_check_alg_aes_gmac(void) +static void crypto_test_check_alg_aes_gmac(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -1113,7 +1114,7 @@ void crypto_test_check_alg_aes_gmac(void) false); } -int crypto_suite_sync_init(void) +static int crypto_suite_sync_init(void) { suite_context.pool = odp_pool_lookup("packet_pool"); if (suite_context.pool == ODP_POOL_INVALID) @@ -1124,7 +1125,7 @@ int crypto_suite_sync_init(void) return 0; } -int crypto_suite_async_init(void) +static int crypto_suite_async_init(void) { suite_context.pool = odp_pool_lookup("packet_pool"); if (suite_context.pool == ODP_POOL_INVALID) @@ -1137,7 +1138,7 @@ int crypto_suite_async_init(void) return 0; } -int crypto_suite_packet_sync_init(void) +static int crypto_suite_packet_sync_init(void) { suite_context.packet = true; suite_context.op_mode = ODP_CRYPTO_SYNC; @@ -1150,7 +1151,7 @@ int crypto_suite_packet_sync_init(void) return 0; } -int crypto_suite_packet_async_init(void) +static int crypto_suite_packet_async_init(void) { suite_context.packet = true; suite_context.op_mode = ODP_CRYPTO_ASYNC; @@ -1225,7 +1226,7 @@ odp_testinfo_t crypto_suite[] = { ODP_TEST_INFO_NULL, }; -int crypto_suite_term(void) +static int crypto_suite_term(void) { int i; int first = 1; @@ -1242,3 +1243,129 @@ int crypto_suite_term(void) } return 0; } + +/* Suite names */ +#define ODP_CRYPTO_SYNC_INP "odp_crypto_sync_inp" +#define ODP_CRYPTO_ASYNC_INP "odp_crypto_async_inp" +#define ODP_CRYPTO_PACKET_SYNC_INP "odp_crypto_packet_sync_inp" +#define ODP_CRYPTO_PACKET_ASYNC_INP "odp_crypto_packet_async_inp" + +odp_suiteinfo_t crypto_suites[] = { + {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, + crypto_suite_term, crypto_suite}, + {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, + crypto_suite_term, crypto_suite}, + {ODP_CRYPTO_PACKET_SYNC_INP, crypto_suite_packet_sync_init, + crypto_suite_term, crypto_suite}, + {ODP_CRYPTO_PACKET_ASYNC_INP, crypto_suite_packet_async_init, + crypto_suite_term, crypto_suite}, + ODP_SUITE_INFO_NULL, +}; + +static int crypto_init(odp_instance_t *inst) +{ + odp_pool_param_t params; + odp_pool_t pool; + odp_queue_t out_queue; + odp_pool_capability_t pool_capa; + + if (0 != odp_init_global(inst, NULL, NULL)) { + fprintf(stderr, "error: odp_init_global() failed.\n"); + return -1; + } + + if (0 != odp_init_local(*inst, ODP_THREAD_CONTROL)) { + fprintf(stderr, "error: odp_init_local() failed.\n"); + return -1; + } + + if (odp_pool_capability(&pool_capa) < 0) { + fprintf(stderr, "error: odp_pool_capability() failed.\n"); + return -1; + } + + odp_pool_param_init(&params); + params.pkt.seg_len = PKT_POOL_LEN; + params.pkt.len = PKT_POOL_LEN; + params.pkt.num = PKT_POOL_NUM; + params.type = ODP_POOL_PACKET; + + if (pool_capa.pkt.max_seg_len && + PKT_POOL_LEN > pool_capa.pkt.max_seg_len) { + fprintf(stderr, "Warning: small packet segment length\n"); + params.pkt.seg_len = pool_capa.pkt.max_seg_len; + } + + if (pool_capa.pkt.max_len && + PKT_POOL_LEN > pool_capa.pkt.max_len) { + fprintf(stderr, "Pool max packet length too small\n"); + return -1; + } + + pool = odp_pool_create("packet_pool", &params); + + if (ODP_POOL_INVALID == pool) { + fprintf(stderr, "Packet pool creation failed.\n"); + return -1; + } + out_queue = odp_queue_create("crypto-out", NULL); + if (ODP_QUEUE_INVALID == out_queue) { + fprintf(stderr, "Crypto outq creation failed.\n"); + return -1; + } + + return 0; +} + +static int crypto_term(odp_instance_t inst) +{ + odp_pool_t pool; + odp_queue_t out_queue; + + out_queue = odp_queue_lookup("crypto-out"); + if (ODP_QUEUE_INVALID != out_queue) { + if (odp_queue_destroy(out_queue)) + fprintf(stderr, "Crypto outq destroy failed.\n"); + } else { + fprintf(stderr, "Crypto outq not found.\n"); + } + + pool = odp_pool_lookup("packet_pool"); + if (ODP_POOL_INVALID != pool) { + if (odp_pool_destroy(pool)) + fprintf(stderr, "Packet pool destroy failed.\n"); + } else { + fprintf(stderr, "Packet pool not found.\n"); + } + + if (0 != odp_term_local()) { + fprintf(stderr, "error: odp_term_local() failed.\n"); + return -1; + } + + if (0 != odp_term_global(inst)) { + fprintf(stderr, "error: odp_term_global() failed.\n"); + return -1; + } + + return 0; +} + +int main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + odp_cunit_register_global_init(crypto_init); + odp_cunit_register_global_term(crypto_term); + + ret = odp_cunit_register(crypto_suites); + + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/validation/api/crypto/odp_crypto_test_inp.h b/test/validation/api/crypto/odp_crypto_test_inp.h deleted file mode 100644 index c50b8493..00000000 --- a/test/validation/api/crypto/odp_crypto_test_inp.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#ifndef ODP_CRYPTO_TEST_ASYNC_INP_ -#define ODP_CRYPTO_TEST_ASYNC_INP_ - -#include <odp_cunit_common.h> - -/* Suite names */ -#define ODP_CRYPTO_SYNC_INP "odp_crypto_sync_inp" -#define ODP_CRYPTO_ASYNC_INP "odp_crypto_async_inp" -#define ODP_CRYPTO_PACKET_SYNC_INP "odp_crypto_packet_sync_inp" -#define ODP_CRYPTO_PACKET_ASYNC_INP "odp_crypto_packet_async_inp" - -/* Suite test array */ -extern odp_testinfo_t crypto_suite[]; - -int crypto_suite_sync_init(void); -int crypto_suite_async_init(void); -int crypto_suite_packet_sync_init(void); -int crypto_suite_packet_async_init(void); -int crypto_suite_term(void); - -#endif commit c2837dee41364443bc95aa97611e3d721ef16813 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: traffic_mngr: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index 82996afe..1f49d4cb 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -8,7 +8,7 @@ TEST_EXTENSIONS = .sh TESTS = $(TESTSCRIPTS) test_PROGRAMS = traffic_mngr_main -traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h +traffic_mngr_main_SOURCES = traffic_mngr.c LDADD += -lm dist_check_SCRIPTS = $(TESTSCRIPTS) diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index fb7bb461..7bcd8e5f 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -19,7 +19,6 @@ #include <odp/helper/odph_api.h> #include <test_debug.h> #include "odp_cunit_common.h" -#include "traffic_mngr.h" #define TM_DEBUG 0 @@ -2044,7 +2043,7 @@ static int destroy_tm_systems(void) return 0; } -int traffic_mngr_suite_init(void) +static int traffic_mngr_suite_init(void) { uint32_t payload_len, copy_len; @@ -2088,7 +2087,7 @@ int traffic_mngr_suite_init(void) return 0; } -int traffic_mngr_suite_term(void) +static int traffic_mngr_suite_term(void) { uint32_t iface; @@ -2133,7 +2132,7 @@ static void check_shaper_profile(char *shaper_name, uint32_t shaper_idx) CU_ASSERT(shaper_params.dual_rate == 0); } -void traffic_mngr_test_shaper_profile(void) +static void traffic_mngr_test_shaper_profile(void) { odp_tm_shaper_params_t shaper_params; odp_tm_shaper_t profile; @@ -2197,7 +2196,7 @@ static void check_sched_profile(char *sched_name, uint32_t sched_idx) } } -void traffic_mngr_test_sched_profile(void) +static void traffic_mngr_test_sched_profile(void) { odp_tm_sched_params_t sched_params; odp_tm_sched_t profile; @@ -2261,7 +2260,7 @@ static void check_threshold_profile(char *threshold_name, CU_ASSERT(threshold_params.enable_max_bytes == 1); } -void traffic_mngr_test_threshold_profile(void) +static void traffic_mngr_test_threshold_profile(void) { odp_tm_threshold_params_t threshold_params; odp_tm_threshold_t profile; @@ -2325,7 +2324,7 @@ static void check_wred_profile(char *wred_name, CU_ASSERT(wred_params.use_byte_fullness == 0); } -void traffic_mngr_test_wred_profile(void) +static void traffic_mngr_test_wred_profile(void) { odp_tm_wred_params_t wred_params; odp_tm_wred_t profile; @@ -2416,7 +2415,7 @@ static int set_shaper(const char *node_name, return odp_tm_node_shaper_config(tm_node, shaper_profile); } -int traffic_mngr_check_shaper(void) +static int traffic_mngr_check_shaper(void) { odp_cpumask_t cpumask; int cpucount = odp_cpumask_all_available(&cpumask); @@ -2431,7 +2430,7 @@ int traffic_mngr_check_shaper(void) return ODP_TEST_ACTIVE; } -int traffic_mngr_check_scheduler(void) +static int traffic_mngr_check_scheduler(void) { odp_cpumask_t cpumask; int cpucount = odp_cpumask_all_available(&cpumask); @@ -3808,19 +3807,19 @@ static int test_fanin_info(const char *node_name) return walk_tree_backwards(node_desc->node); } -void traffic_mngr_test_capabilities(void) +static void traffic_mngr_test_capabilities(void) { CU_ASSERT(test_overall_capabilities() == 0); } -void traffic_mngr_test_tm_create(void) +static void traffic_mngr_test_tm_create(void) { /* Create the first/primary TM system. */ CU_ASSERT_FATAL(create_tm_system() == 0); dump_tm_tree(0); } -void traffic_mngr_test_shaper(void) +static void traffic_mngr_test_shaper(void) { CU_ASSERT(test_shaper_bw("bw1", "node_1_1_1", 0, 1 * MBPS) == 0); CU_ASSERT(test_shaper_bw("bw4", "node_1_1_1", 1, 4 * MBPS) == 0); @@ -3829,7 +3828,7 @@ void traffic_mngr_test_shaper(void) CU_ASSERT(test_shaper_bw("bw100", "node_1_1_2", 0, 100 * MBPS) == 0); } -void traffic_mngr_test_scheduler(void) +static void traffic_mngr_test_scheduler(void) { CU_ASSERT(test_sched_queue_priority("que_prio", "node_1_1_3", 10) == 0); return; @@ -3848,7 +3847,7 @@ void traffic_mngr_test_scheduler(void) INCREASING_WEIGHTS) == 0); } -void traffic_mngr_test_thresholds(void) +static void traffic_mngr_test_thresholds(void) { CU_ASSERT(test_threshold("thresh_A", "shaper_A", "node_1_2_1", 0, 16, 0) == 0); @@ -3856,7 +3855,7 @@ void traffic_mngr_test_thresholds(void) 0, 6400) == 0); } -void traffic_mngr_test_byte_wred(void) +static void traffic_mngr_test_byte_wred(void) { if (!tm_capabilities.tm_queue_wred_supported) { LOG_DBG("\nwas not run because tm_capabilities indicates" @@ -3879,7 +3878,7 @@ void traffic_mngr_test_byte_wred(void) ODP_PACKET_GREEN, TM_PERCENT(30), false) == 0); } -void traffic_mngr_test_pkt_wred(void) +static void traffic_mngr_test_pkt_wred(void) { int rc; @@ -3912,13 +3911,13 @@ void traffic_mngr_test_pkt_wred(void) ODP_PACKET_RED, TM_PERCENT(70), true) == 0); } -void traffic_mngr_test_query(void) +static void traffic_mngr_test_query(void) { CU_ASSERT(test_query_functions("query_shaper", "node_1_3_3", 3, 10) == 0); } -void traffic_mngr_test_marking(void) +static void traffic_mngr_test_marking(void) { odp_packet_color_t color; odp_bool_t test_ecn, test_drop_prec; @@ -3967,14 +3966,14 @@ void traffic_mngr_test_marking(void) } } -void traffic_mngr_test_fanin_info(void) +static void traffic_mngr_test_fanin_info(void) { CU_ASSERT(test_fanin_info("node_1") == 0); CU_ASSERT(test_fanin_info("node_1_2") == 0); CU_ASSERT(test_fanin_info("node_1_3_7") == 0); } -void traffic_mngr_test_destroy(void) +static void traffic_mngr_test_destroy(void) { CU_ASSERT(destroy_tm_systems() == 0); } @@ -4006,7 +4005,7 @@ odp_suiteinfo_t traffic_mngr_suites[] = { ODP_SUITE_INFO_NULL }; -int traffic_mngr_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { /* parse common options: */ if (odp_cunit_parse_options(argc, argv)) diff --git a/test/validation/api/traffic_mngr/traffic_mngr.h b/test/validation/api/traffic_mngr/traffic_mngr.h deleted file mode 100644 index af115fef..00000000 --- a/test/validation/api/traffic_mngr/traffic_mngr.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_TRAFFIC_MNGR_H_ -#define _ODP_TEST_TRAFFIC_MNGR_H_ - -#include <odp_cunit_common.h> - -int traffic_mngr_check_shaper(void); -int traffic_mngr_check_scheduler(void); - -/* test functions: */ -void traffic_mngr_test_capabilities(void); -void traffic_mngr_test_tm_create(void); -void traffic_mngr_test_shaper_profile(void); -void traffic_mngr_test_sched_profile(void); -void traffic_mngr_test_threshold_profile(void); -void traffic_mngr_test_wred_profile(void); -void traffic_mngr_test_shaper(void); -void traffic_mngr_test_scheduler(void); -void traffic_mngr_test_thresholds(void); -void traffic_mngr_test_byte_wred(void); -void traffic_mngr_test_pkt_wred(void); -void traffic_mngr_test_query(void); -void traffic_mngr_test_marking(void); -void traffic_mngr_test_fanin_info(void); -void traffic_mngr_test_destroy(void); - -/* test arrays: */ -extern odp_testinfo_t traffic_mngr_suite[]; - -/* test suite init/term functions: */ -int traffic_mngr_suite_init(void); -int traffic_mngr_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t traffic_mngr_suites[]; - -/* main test program: */ -int traffic_mngr_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/traffic_mngr/traffic_mngr_main.c b/test/validation/api/traffic_mngr/traffic_mngr_main.c deleted file mode 100644 index ec4555e6..00000000 --- a/test/validation/api/traffic_mngr/traffic_mngr_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "traffic_mngr.h" - -int main(int argc, char *argv[]) -{ - return traffic_mngr_main(argc, argv); -} commit eba4477a5cd5300d608ddfc53ff00cd3e51805a6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: timer: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am index 57617440..bc33e731 100644 --- a/test/validation/api/timer/Makefile.am +++ b/test/validation/api/timer/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = timer_main -timer_main_SOURCES = timer_main.c timer.c timer.h +timer_main_SOURCES = timer.c diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 7ea508aa..26a5b608 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -20,7 +20,6 @@ #include <odp/helper/odph_api.h> #include "odp_cunit_common.h" #include "test_debug.h" -#include "timer.h" #define MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -56,7 +55,7 @@ struct test_timer { #define TICK_INVALID (~(uint64_t)0) -void timer_test_timeout_pool_alloc(void) +static void timer_test_timeout_pool_alloc(void) { odp_pool_t pool; const int num = 3; @@ -110,7 +109,7 @@ void timer_test_timeout_pool_alloc(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void timer_test_timeout_pool_free(void) +static void timer_test_timeout_pool_free(void) { odp_pool_t pool; odp_timeout_t tmo; @@ -141,7 +140,7 @@ void timer_test_timeout_pool_free(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void timer_test_odp_timer_cancel(void) +static void timer_test_odp_timer_cancel(void) { odp_pool_t pool; odp_pool_param_t params; @@ -504,7 +503,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) } /* @private Timer test case entrypoint */ -void timer_test_odp_timer_all(void) +static void timer_test_odp_timer_all(void) { int rc; odp_pool_param_t params; @@ -630,7 +629,7 @@ odp_suiteinfo_t timer_suites[] = { ODP_SUITE_INFO_NULL, }; -int timer_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { /* parse common options: */ if (odp_cunit_parse_options(argc, argv)) diff --git a/test/validation/api/timer/timer.h b/test/validation/api/timer/timer.h deleted file mode 100644 index bd304fff..00000000 --- a/test/validation/api/timer/timer.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_TIMER_H_ -#define _ODP_TEST_TIMER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void timer_test_timeout_pool_alloc(void); -void timer_test_timeout_pool_free(void); -void timer_test_odp_timer_cancel(void); -void timer_test_odp_timer_all(void); - -/* test arrays: */ -extern odp_testinfo_t timer_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t timer_suites[]; - -/* main test program: */ -int timer_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/timer/timer_main.c b/test/validation/api/timer/timer_main.c deleted file mode 100644 index f65c1e3a..00000000 --- a/test/validation/api/timer/timer_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "timer.h" - -int main(int argc, char *argv[]) -{ - return timer_main(argc, argv); -} commit 3e90ecc0bfa4487a29fbdff7ccc1cf5a2a1e8bc0 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: time: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index bedbfa37..9b0392eb 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = time_main -time_main_SOURCES = time_main.c time.c time_test.h +time_main_SOURCES = time.c diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index d7d5b790..2be9914b 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "time_test.h" #include <time.h> #define BUSY_LOOP_CNT 30000000 /* used for t > min resolution */ @@ -25,7 +24,7 @@ typedef odp_time_t time_cb(void); typedef uint64_t time_res_cb(void); typedef odp_time_t time_from_ns_cb(uint64_t ns); -void time_test_constants(void) +static void time_test_constants(void) { uint64_t ns; @@ -48,12 +47,12 @@ static void time_test_res(time_res_cb time_res, uint64_t *res) (*res)++; } -void time_test_local_res(void) +static void time_test_local_res(void) { time_test_res(odp_time_local_res, &local_res); } -void time_test_global_res(void) +static void time_test_global_res(void) { time_test_res(odp_time_global_res, &global_res); } @@ -92,17 +91,17 @@ static void time_test_conversion(time_from_ns_cb time_from_ns, uint64_t res) CU_ASSERT(ns1 == 0); } -void time_test_local_conversion(void) +static void time_test_local_conversion(void) { time_test_conversion(odp_time_local_from_ns, local_res); } -void time_test_global_conversion(void) +static void time_test_global_conversion(void) { time_test_conversion(odp_time_global_from_ns, global_res); } -void time_test_monotony(void) +static void time_test_monotony(void) { volatile uint64_t count = 0; odp_time_t l_t1, l_t2, l_t3; @@ -183,12 +182,12 @@ static void time_test_cmp(time_cb time_cur, time_from_ns_cb time_from_ns) CU_ASSERT(odp_time_cmp(t1, ODP_TIME_NULL) == 0); } -void time_test_local_cmp(void) +static void time_test_local_cmp(void) { time_test_cmp(odp_time_local, odp_time_local_from_ns); } -void time_test_global_cmp(void) +static void time_test_global_cmp(void) { time_test_cmp(odp_time_global, odp_time_global_from_ns); } @@ -278,12 +277,12 @@ static void time_test_diff(time_cb time_cur, CU_ASSERT(diff_ns == 0); } -void time_test_local_diff(void) +static void time_test_local_diff(void) { time_test_diff(odp_time_local, odp_time_local_from_ns, local_res); } -void time_test_global_diff(void) +static void time_test_global_diff(void) { time_test_diff(odp_time_global, odp_time_global_from_ns, global_res); } @@ -330,12 +329,12 @@ static void time_test_sum(time_cb time_cur, CU_ASSERT(odp_time_cmp(t2, sum) == 0); } -void time_test_local_sum(void) +static void time_test_local_sum(void) { time_test_sum(odp_time_local, odp_time_local_from_ns, local_res); } -void time_test_global_sum(void) +static void time_test_global_sum(void) { time_test_sum(odp_time_global, odp_time_global_from_ns, global_res); } @@ -376,17 +375,17 @@ static void time_test_wait_until(time_cb time_cur, time_from_ns_cb time_from_ns) } } -void time_test_local_wait_until(void) +static void time_test_local_wait_until(void) { time_test_wait_until(odp_time_local, odp_time_local_from_ns); } -void time_test_global_wait_until(void) +static void time_test_global_wait_until(void) { time_test_wait_until(odp_time_global, odp_time_global_from_ns); } -void time_test_wait_ns(void) +static void time_test_wait_ns(void) { int i; odp_time_t lower_limit, upper_limit; @@ -494,7 +493,7 @@ odp_suiteinfo_t time_suites[] = { ODP_SUITE_INFO_NULL }; -int time_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/time/time_main.c b/test/validation/api/time/time_main.c deleted file mode 100644 index c39a0ea1..00000000 --- a/test/validation/api/time/time_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "time_test.h" - -int main(int argc, char *argv[]) -{ - return time_main(argc, argv); -} diff --git a/test/validation/api/time/time_test.h b/test/validation/api/time/time_test.h deleted file mode 100644 index 10956294..00000000 --- a/test/validation/api/time/time_test.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_TIME_H_ -#define _ODP_TEST_TIME_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void time_test_constants(void); -void time_test_local_res(void); -void time_test_global_res(void); -void time_test_local_conversion(void); -void time_test_global_conversion(void); -void time_test_local_cmp(void); -void time_test_global_cmp(void); -void time_test_local_diff(void); -void time_test_global_diff(void); -void time_test_local_sum(void); -void time_test_global_sum(void); -void time_test_local_wait_until(void); -void time_test_global_wait_until(void); -void time_test_wait_ns(void); -void time_test_monotony(void); - -/* test arrays: */ -extern odp_testinfo_t time_suite_time[]; - -/* test registry: */ -extern odp_suiteinfo_t time_suites[]; - -/* main test program: */ -int time_main(int argc, char *argv[]); - -#endif commit dfa1ee94dae761166126445739be0dd6843f6792 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: thread: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am index 2282169b..cbd8b2a7 100644 --- a/test/validation/api/thread/Makefile.am +++ b/test/validation/api/thread/Makefile.am @@ -2,5 +2,5 @@ include ../Makefile.inc test_PROGRAMS = thread_main thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK -thread_main_SOURCES = thread_main.c thread.c thread.h +thread_main_SOURCES = thread.c LDADD += $(LIBTHRMASK_COMMON) diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread/thread.c index ada4affc..fe504e88 100644 --- a/test/validation/api/thread/thread.c +++ b/test/validation/api/thread/thread.c @@ -10,25 +10,24 @@ #include <odp_cunit_common.h> #include <mask_common.h> #include <test_debug.h> -#include "thread.h" /* Test thread entry and exit synchronization barriers */ odp_barrier_t bar_entry; odp_barrier_t bar_exit; -void thread_test_odp_cpu_id(void) +static void thread_test_odp_cpu_id(void) { (void)odp_cpu_id(); CU_PASS(); } -void thread_test_odp_thread_id(void) +static void thread_test_odp_thread_id(void) { (void)odp_thread_id(); CU_PASS(); } -void thread_test_odp_thread_count(void) +static void thread_test_odp_thread_count(void) { (void)odp_thread_count(); CU_PASS(); @@ -47,7 +46,7 @@ static int thread_func(void *arg TEST_UNUSED) return CU_get_number_of_failures(); } -void thread_test_odp_thrmask_worker(void) +static void thread_test_odp_thrmask_worker(void) { odp_thrmask_t mask; int ret; @@ -84,7 +83,7 @@ void thread_test_odp_thrmask_worker(void) odp_cunit_thread_exit(&args); } -void thread_test_odp_thrmask_control(void) +static void thread_test_odp_thrmask_control(void) { odp_thrmask_t mask; int ret; @@ -125,7 +124,7 @@ odp_suiteinfo_t thread_suites[] = { ODP_SUITE_INFO_NULL, }; -int thread_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/thread/thread.h b/test/validation/api/thread/thread.h deleted file mode 100644 index d511c925..00000000 --- a/test/validation/api/thread/thread.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_THREAD_H_ -#define _ODP_TEST_THREAD_H_ - -#include <odp_api.h> -#include <odp_cunit_common.h> - -/* test functions: */ -#ifndef TEST_THRMASK -#define TEST_THRMASK -#endif -#include "mask_common.h" -void thread_test_odp_cpu_id(void); -void thread_test_odp_thread_id(void); -void thread_test_odp_thread_count(void); -void thread_test_odp_thrmask_control(void); -void thread_test_odp_thrmask_worker(void); - -/* test arrays: */ -extern odp_testinfo_t thread_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t thread_suites[]; - -/* main test program: */ -int thread_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/thread/thread_main.c b/test/validation/api/thread/thread_main.c deleted file mode 100644 index 2e832836..00000000 --- a/test/validation/api/thread/thread_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "thread.h" - -int main(int argc, char *argv[]) -{ - return thread_main(argc, argv); -} commit 01014bb374153d7bc879b3e1d26e79a6dfe5c329 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: system: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am index e6fbb0ea..8090b0b5 100644 --- a/test/validation/api/system/Makefile.am +++ b/test/validation/api/system/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = system_main -system_main_SOURCES = system_main.c system.c system.h +system_main_SOURCES = system.c diff --git a/test/validation/api/system/system.c b/test/validation/api/system/system.c index a2749003..71d48480 100644 --- a/test/validation/api/system/system.c +++ b/test/validation/api/system/system.c @@ -11,13 +11,15 @@ #include <odp/api/cpumask.h> #include "odp_cunit_common.h" #include "test_debug.h" -#include "system.h" #define DIFF_TRY_NUM 160 #define RES_TRY_NUM 10 #define PAGESZ_NUM 10 -void system_test_odp_version_numbers(void) +#define GIGA_HZ 1000000000ULL +#define KILO_HZ 1000ULL + +static void system_test_odp_version_numbers(void) { int char_ok = 0; char version_string[128]; @@ -39,7 +41,7 @@ void system_test_odp_version_numbers(void) CU_ASSERT(char_ok); } -void system_test_odp_cpu_count(void) +static void system_test_odp_cpu_count(void) { int cpus; @@ -47,7 +49,7 @@ void system_test_odp_cpu_count(void) CU_ASSERT(0 < cpus); } -void system_test_odp_cpu_cycles(void) +static void system_test_odp_cpu_cycles(void) { uint64_t c2, c1; @@ -58,7 +60,7 @@ void system_test_odp_cpu_cycles(void) CU_ASSERT(c2 != c1); } -void system_test_odp_cpu_cycles_max(void) +static void system_test_odp_cpu_cycles_max(void) { uint64_t c2, c1; uint64_t max1, max2; @@ -77,7 +79,7 @@ void system_test_odp_cpu_cycles_max(void) CU_ASSERT(c1 <= max1 && c2 <= max1); } -void system_test_odp_cpu_cycles_resolution(void) +static void system_test_odp_cpu_cycles_resolution(void) { int i; uint64_t res; @@ -99,7 +101,7 @@ void system_test_odp_cpu_cycles_resolution(void) } } -void system_test_odp_cpu_cycles_diff(void) +static void system_test_odp_cpu_cycles_diff(void) { int i; uint64_t c2, c1, c3, max; @@ -165,7 +167,7 @@ void system_test_odp_cpu_cycles_diff(void) printf("wrap was not detected..."); } -void system_test_odp_sys_cache_line_size(void) +static void system_test_odp_sys_cache_line_size(void) { uint64_t cache_size; @@ -174,7 +176,7 @@ void system_test_odp_sys_cache_line_size(void) CU_ASSERT(ODP_CACHE_LINE_SIZE == cache_size); } -void system_test_odp_cpu_model_str(void) +static void system_test_odp_cpu_model_str(void) { char model[128]; @@ -183,7 +185,7 @@ void system_test_odp_cpu_model_str(void) CU_ASSERT(strlen(model) < 127); } -void system_test_odp_cpu_model_str_id(void) +static void system_test_odp_cpu_model_str_id(void) { char model[128]; odp_cpumask_t mask; @@ -200,7 +202,7 @@ void system_test_odp_cpu_model_str_id(void) } } -void system_test_odp_sys_page_size(void) +static void system_test_odp_sys_page_size(void) { uint64_t page; @@ -209,7 +211,7 @@ void system_test_odp_sys_page_size(void) CU_ASSERT(ODP_PAGE_SIZE == page); } -void system_test_odp_sys_huge_page_size(void) +static void system_test_odp_sys_huge_page_size(void) { uint64_t page; @@ -217,7 +219,7 @@ void system_test_odp_sys_huge_page_size(void) CU_ASSERT(0 < page); } -void system_test_odp_sys_huge_page_size_all(void) +static void system_test_odp_sys_huge_page_size_all(void) { uint64_t pagesz_tbs[PAGESZ_NUM]; uint64_t prev_pagesz = 0; @@ -236,7 +238,7 @@ void system_test_odp_sys_huge_page_size_all(void) } } -int system_check_odp_cpu_hz(void) +static int system_check_odp_cpu_hz(void) { if (odp_cpu_hz() == 0) { fprintf(stderr, "odp_cpu_hz is not supported, skipping\n"); @@ -246,7 +248,7 @@ int system_check_odp_cpu_hz(void) return ODP_TEST_ACTIVE; } -void system_test_odp_cpu_hz(void) +static void system_test_odp_cpu_hz(void) { uint64_t hz = odp_cpu_hz(); @@ -257,7 +259,7 @@ void system_test_odp_cpu_hz(void) CU_ASSERT(hz > 1 * KILO_HZ); } -int system_check_odp_cpu_hz_id(void) +static int system_check_odp_cpu_hz_id(void) { uint64_t hz; odp_cpumask_t mask; @@ -280,7 +282,7 @@ int system_check_odp_cpu_hz_id(void) return ODP_TEST_ACTIVE; } -void system_test_odp_cpu_hz_id(void) +static void system_test_odp_cpu_hz_id(void) { uint64_t hz; odp_cpumask_t mask; @@ -299,7 +301,7 @@ void system_test_odp_cpu_hz_id(void) } } -void system_test_odp_cpu_hz_max(void) +static void system_test_odp_cpu_hz_max(void) { uint64_t hz; @@ -307,7 +309,7 @@ void system_test_odp_cpu_hz_max(void) CU_ASSERT(0 < hz); } -void system_test_odp_cpu_hz_max_id(void) +static void system_test_odp_cpu_hz_max_id(void) { uint64_t hz; odp_cpumask_t mask; @@ -323,7 +325,7 @@ void system_test_odp_cpu_hz_max_id(void) } } -void system_test_info_print(void) +static void system_test_info_print(void) { printf("\n\nCalling system info print...\n"); odp_sys_info_print(); @@ -358,7 +360,7 @@ odp_suiteinfo_t system_suites[] = { ODP_SUITE_INFO_NULL, }; -int system_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/system/system.h b/test/validation/api/system/system.h deleted file mode 100644 index 0ea72dcd..00000000 --- a/test/validation/api/system/system.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_SYSTEM_H_ -#define _ODP_TEST_SYSTEM_H_ - -#include <odp_cunit_common.h> - -#define GIGA_HZ 1000000000ULL -#define KILO_HZ 1000ULL - -/* test functions: */ -void system_test_odp_version_numbers(void); -void system_test_odp_cpu_count(void); -void system_test_odp_sys_cache_line_size(void); -void system_test_odp_cpu_model_str(void); -void system_test_odp_cpu_model_str_id(void); -void system_test_odp_sys_page_size(void); -void system_test_odp_sys_huge_page_size(void); -void system_test_odp_sys_huge_page_size_all(void); -int system_check_odp_cpu_hz(void); -void system_test_odp_cpu_hz(void); -int system_check_odp_cpu_hz_id(void); -void system_test_odp_cpu_hz_id(void); -void system_test_odp_cpu_hz_max(void); -void system_test_odp_cpu_hz_max_id(void); -void system_test_odp_cpu_cycles_max(void); -void system_test_odp_cpu_cycles(void); -void system_test_odp_cpu_cycles_diff(void); -void system_test_odp_cpu_cycles_resolution(void); -void system_test_info_print(void); - -/* test arrays: */ -extern odp_testinfo_t system_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t system_suites[]; - -/* main test program: */ -int system_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/system/system_main.c b/test/validation/api/system/system_main.c deleted file mode 100644 index 01720c6a..00000000 --- a/test/validation/api/system/system_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "system.h" - -int main(int argc, char *argv[]) -{ - return system_main(argc, argv); -} commit d7f9a326839de8d731d95ba3a1c45114198887d1 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: std_clib: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am index 34b888bb..9d3b32d3 100644 --- a/test/validation/api/std_clib/Makefile.am +++ b/test/validation/api/std_clib/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = std_clib_main -std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h +std_clib_main_SOURCES = std_clib.c diff --git a/test/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib/std_clib.c index 33128eef..3ef5aab7 100644 --- a/test/validation/api/std_clib/std_clib.c +++ b/test/validation/api/std_clib/std_clib.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "std_clib.h" #include <string.h> @@ -95,7 +94,7 @@ odp_suiteinfo_t std_clib_suites[] = { ODP_SUITE_INFO_NULL }; -int std_clib_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/std_clib/std_clib.h b/test/validation/api/std_clib/std_clib.h deleted file mode 100644 index 2804f27e..00000000 --- a/test/validation/api/std_clib/std_clib.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_STD_CLIB_H_ -#define _ODP_TEST_STD_CLIB_H_ - -#include <odp_cunit_common.h> - -/* test arrays: */ -extern odp_testinfo_t std_clib_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t std_clib_suites[]; - -/* main test program: */ -int std_clib_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/std_clib/std_clib_main.c b/test/validation/api/std_clib/std_clib_main.c deleted file mode 100644 index dc63bb5b..00000000 --- a/test/validation/api/std_clib/std_clib_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "std_clib.h" - -int main(int argc, char *argv[]) -{ - return std_clib_main(argc, argv); -} commit b07985be674cef618fabeb7111ffa4dbb3e74fef Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: shmem: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am index 9a10668f..52e33fdc 100644 --- a/test/validation/api/shmem/Makefile.am +++ b/test/validation/api/shmem/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = shmem_main -shmem_main_SOURCES = shmem_main.c shmem.c shmem.h +shmem_main_SOURCES = shmem.c diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c index 4e0e327c..fb1898eb 100644 --- a/test/validation/api/shmem/shmem.c +++ b/test/validation/api/shmem/shmem.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "shmem.h" #include <stdlib.h> #define ALIGN_SIZE (128) @@ -131,7 +130,7 @@ static int run_test_basic_thread(void *arg ODP_UNUSED) /* * test basic things: shmem creation, info, share, and free */ -void shmem_test_basic(void) +static void shmem_test_basic(void) { pthrd_arg thrdarg; odp_shm_t shm; @@ -342,7 +341,7 @@ static int run_test_reserve_after_fork(void *arg ODP_UNUSED) /* * test sharing memory reserved after odp_thread creation (e.g. fork()): */ -void shmem_test_reserve_after_fork(void) +static void shmem_test_reserve_after_fork(void) { pthrd_arg thrdarg; odp_shm_t shm; @@ -531,7 +530,7 @@ static int run_test_singleva_after_fork(void *arg ODP_UNUSED) * test sharing memory reserved after odp_thread creation (e.g. fork()): * with single VA flag. */ -void shmem_test_singleva_after_fork(void) +static void shmem_test_singleva_after_fork(void) { pthrd_arg thrdarg; odp_shm_t shm; @@ -771,7 +770,7 @@ static int run_test_stress(void *arg ODP_UNUSED) /* * stress tests */ -void shmem_test_stress(void) +static void shmem_test_stress(void) { pthrd_arg thrdarg; odp_shm_t shm; @@ -834,7 +833,7 @@ odp_suiteinfo_t shmem_suites[] = { ODP_SUITE_INFO_NULL, }; -int shmem_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/shmem/shmem.h b/test/validation/api/shmem/shmem.h deleted file mode 100644 index 092aa800..00000000 --- a/test/validation/api/shmem/shmem.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_SHMEM_H_ -#define _ODP_TEST_SHMEM_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void shmem_test_basic(void); -void shmem_test_reserve_after_fork(void); -void shmem_test_singleva_after_fork(void); -void shmem_test_stress(void); - -/* test arrays: */ -extern odp_testinfo_t shmem_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t shmem_suites[]; - -/* main test program: */ -int shmem_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/shmem/shmem_main.c b/test/validation/api/shmem/shmem_main.c deleted file mode 100644 index d51d4d83..00000000 --- a/test/validation/api/shmem/shmem_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "shmem.h" - -int main(int argc, char *argv[]) -{ - return shmem_main(argc, argv); -} commit 74948cab5525f59e016dc984d95cb51f2ce2f963 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: scheduler: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am index 3673ad7c..050f2230 100644 --- a/test/validation/api/scheduler/Makefile.am +++ b/test/validation/api/scheduler/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = scheduler_main -scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h +scheduler_main_SOURCES = scheduler.c diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 0be6ce3f..9d1e08ca 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "scheduler.h" #define MAX_WORKERS_THREADS 32 #define MAX_ORDERED_LOCKS 2 @@ -139,7 +138,7 @@ static void release_context(odp_schedule_sync_t sync) odp_schedule_release_ordered(); } -void scheduler_test_wait_time(void) +static void scheduler_test_wait_time(void) { int i; odp_queue_t queue; @@ -193,7 +192,7 @@ void scheduler_test_wait_time(void) CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); } -void scheduler_test_num_prio(void) +static void scheduler_test_num_prio(void) { int prio; @@ -203,7 +202,7 @@ void scheduler_test_num_prio(void) CU_ASSERT(prio == odp_schedule_num_prio()); } -void scheduler_test_queue_destroy(void) +static void scheduler_test_queue_destroy(void) { odp_pool_t p; odp_pool_param_t params; @@ -268,7 +267,7 @@ void scheduler_test_queue_destroy(void) CU_ASSERT_FATAL(odp_pool_destroy(p) == 0); } -void scheduler_test_groups(void) +static void scheduler_test_groups(void) { odp_pool_t p; odp_pool_param_t params; @@ -662,22 +661,22 @@ static void chaos_run(unsigned int qtype) CU_ASSERT(rc == 0); } -void scheduler_test_parallel(void) +static void scheduler_test_parallel(void) { chaos_run(0); } -void scheduler_test_atomic(void) +static void scheduler_test_atomic(void) { chaos_run(1); } -void scheduler_test_ordered(void) +static void scheduler_test_ordered(void) { chaos_run(2); } -void scheduler_test_chaos(void) +static void scheduler_test_chaos(void) { chaos_run(3); } @@ -1083,25 +1082,25 @@ static void parallel_execute(odp_schedule_sync_t sync, int num_queues, } /* 1 queue 1 thread ODP_SCHED_SYNC_PARALLEL */ -void scheduler_test_1q_1t_n(void) +static void scheduler_test_1q_1t_n(void) { schedule_common(ODP_SCHED_SYNC_PARALLEL, ONE_Q, ONE_PRIO, SCHD_ONE); } /* 1 queue 1 thread ODP_SCHED_SYNC_ATOMIC */ -void scheduler_test_1q_1t_a(void) +static void scheduler_test_1q_1t_a(void) { schedule_common(ODP_SCHED_SYNC_ATOMIC, ONE_Q, ONE_PRIO, SCHD_ONE); } /* 1 queue 1 thread ODP_SCHED_SYNC_ORDERED */ -void scheduler_test_1q_1t_o(void) +static void scheduler_test_1q_1t_o(void) { schedule_common(ODP_SCHED_SYNC_ORDERED, ONE_Q, ONE_PRIO, SCHD_ONE); } /* Many queues 1 thread ODP_SCHED_SYNC_PARALLEL */ -void scheduler_test_mq_1t_n(void) +static void scheduler_test_mq_1t_n(void) { /* Only one priority involved in these tests, but use the same number of queues the more general case uses */ @@ -1109,19 +1108,19 @@ void scheduler_test_mq_1t_n(void) } /* Many queues 1 thread ODP_SCHED_SYNC_ATOMIC */ -void scheduler_test_mq_1t_a(void) +static void scheduler_test_mq_1t_a(void) { schedule_common(ODP_SCHED_SYNC_ATOMIC, MANY_QS, ONE_PRIO, SCHD_ONE); } /* Many queues 1 thread ODP_SCHED_SYNC_ORDERED */ -void scheduler_test_mq_1t_o(void) +static void scheduler_test_mq_1t_o(void) { schedule_common(ODP_SCHED_SYNC_ORDERED, MANY_QS, ONE_PRIO, SCHD_ONE); } /* Many queues 1 thread check priority ODP_SCHED_SYNC_PARALLEL */ -void scheduler_test_mq_1t_prio_n(void) +static void scheduler_test_mq_1t_prio_n(void) { int prio = odp_schedule_num_prio(); @@ -1129,7 +1128,7 @@ void scheduler_test_mq_1t_prio_n(void) } /* Many queues 1 thread check priority ODP_SCHED_SYNC_ATOMIC */ -void scheduler_test_mq_1t_prio_a(void) +static void scheduler_test_mq_1t_prio_a(void) { int prio = odp_schedule_num_prio(); @@ -1137,7 +1136,7 @@ void scheduler_test_mq_1t_prio_a(void) } /* Many queues 1 thread check priority ODP_SCHED_SYNC_ORDERED */ -void scheduler_test_mq_1t_prio_o(void) +static void scheduler_test_mq_1t_prio_o(void) { int prio = odp_schedule_num_prio(); @@ -1145,7 +1144,7 @@ void scheduler_test_mq_1t_prio_o(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_PARALLEL */ -void scheduler_test_mq_mt_prio_n(void) +static void scheduler_test_mq_mt_prio_n(void) { int prio = odp_schedule_num_prio(); @@ -1154,7 +1153,7 @@ void scheduler_test_mq_mt_prio_n(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_ATOMIC */ -void scheduler_test_mq_mt_prio_a(void) +static void scheduler_test_mq_mt_prio_a(void) { int prio = odp_schedule_num_prio(); @@ -1163,7 +1162,7 @@ void scheduler_test_mq_mt_prio_a(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_ORDERED */ -void scheduler_test_mq_mt_prio_o(void) +static void scheduler_test_mq_mt_prio_o(void) { int prio = odp_schedule_num_prio(); @@ -1172,32 +1171,32 @@ void scheduler_test_mq_mt_prio_o(void) } /* 1 queue many threads check exclusive access on ATOMIC queues */ -void scheduler_test_1q_mt_a_excl(void) +static void scheduler_test_1q_mt_a_excl(void) { parallel_execute(ODP_SCHED_SYNC_ATOMIC, ONE_Q, ONE_PRIO, SCHD_ONE, ENABLE_EXCL_ATOMIC); } /* 1 queue 1 thread ODP_SCHED_SYNC_PARALLEL multi */ -void scheduler_test_multi_1q_1t_n(void) +static void scheduler_test_multi_1q_1t_n(void) { schedule_common(ODP_SCHED_SYNC_PARALLEL, ONE_Q, ONE_PRIO, SCHD_MULTI); } /* 1 queue 1 thread ODP_SCHED_SYNC_ATOMIC multi */ -void scheduler_test_multi_1q_1t_a(void) +static void scheduler_test_multi_1q_1t_a(void) { schedule_common(ODP_SCHED_SYNC_ATOMIC, ONE_Q, ONE_PRIO, SCHD_MULTI); } /* 1 queue 1 thread ODP_SCHED_SYNC_ORDERED multi */ -void scheduler_test_multi_1q_1t_o(void) +static void scheduler_test_multi_1q_1t_o(void) { schedule_common(ODP_SCHED_SYNC_ORDERED, ONE_Q, ONE_PRIO, SCHD_MULTI); } /* Many queues 1 thread ODP_SCHED_SYNC_PARALLEL multi */ -void scheduler_test_multi_mq_1t_n(void) +static void scheduler_test_multi_mq_1t_n(void) { /* Only one priority involved in these tests, but use the same number of queues the more general case uses */ @@ -1205,19 +1204,19 @@ void scheduler_test_multi_mq_1t_n(void) } /* Many queues 1 thread ODP_SCHED_SYNC_ATOMIC multi */ -void scheduler_test_multi_mq_1t_a(void) +static void scheduler_test_multi_mq_1t_a(void) { schedule_common(ODP_SCHED_SYNC_ATOMIC, MANY_QS, ONE_PRIO, SCHD_MULTI); } /* Many queues 1 thread ODP_SCHED_SYNC_ORDERED multi */ -void scheduler_test_multi_mq_1t_o(void) +static void scheduler_test_multi_mq_1t_o(void) { schedule_common(ODP_SCHED_SYNC_ORDERED, MANY_QS, ONE_PRIO, SCHD_MULTI); } /* Many queues 1 thread check priority ODP_SCHED_SYNC_PARALLEL multi */ -void scheduler_test_multi_mq_1t_prio_n(void) +static void scheduler_test_multi_mq_1t_prio_n(void) { int prio = odp_schedule_num_prio(); @@ -1225,7 +1224,7 @@ void scheduler_test_multi_mq_1t_prio_n(void) } /* Many queues 1 thread check priority ODP_SCHED_SYNC_ATOMIC multi */ -void scheduler_test_multi_mq_1t_prio_a(void) +static void scheduler_test_multi_mq_1t_prio_a(void) { int prio = odp_schedule_num_prio(); @@ -1233,7 +1232,7 @@ void scheduler_test_multi_mq_1t_prio_a(void) } /* Many queues 1 thread check priority ODP_SCHED_SYNC_ORDERED multi */ -void scheduler_test_multi_mq_1t_prio_o(void) +static void scheduler_test_multi_mq_1t_prio_o(void) { int prio = odp_schedule_num_prio(); @@ -1241,7 +1240,7 @@ void scheduler_test_multi_mq_1t_prio_o(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_PARALLEL multi */ -void scheduler_test_multi_mq_mt_prio_n(void) +static void scheduler_test_multi_mq_mt_prio_n(void) { int prio = odp_schedule_num_prio(); @@ -1249,7 +1248,7 @@ void scheduler_test_multi_mq_mt_prio_n(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_ATOMIC multi */ -void scheduler_test_multi_mq_mt_prio_a(void) +static void scheduler_test_multi_mq_mt_prio_a(void) { int prio = odp_schedule_num_prio(); @@ -1257,7 +1256,7 @@ void scheduler_test_multi_mq_mt_prio_a(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_ORDERED multi */ -void scheduler_test_multi_mq_mt_prio_o(void) +static void scheduler_test_multi_mq_mt_prio_o(void) { int prio = odp_schedule_num_prio(); @@ -1265,13 +1264,13 @@ void scheduler_test_multi_mq_mt_prio_o(void) } /* 1 queue many threads check exclusive access on ATOMIC queues multi */ -void scheduler_test_multi_1q_mt_a_excl(void) +static void scheduler_test_multi_1q_mt_a_excl(void) { parallel_execute(ODP_SCHED_SYNC_ATOMIC, ONE_Q, ONE_PRIO, SCHD_MULTI, ENABLE_EXCL_ATOMIC); } -void scheduler_test_pause_resume(void) +static void scheduler_test_pause_resume(void) { odp_queue_t queue; odp_buffer_t buf; @@ -1545,7 +1544,7 @@ static int create_queues(void) return 0; } -int scheduler_suite_init(void) +static int scheduler_suite_init(void) { odp_cpumask_t mask; odp_shm_t shm; @@ -1657,7 +1656,7 @@ static int destroy_queues(void) return 0; } -int scheduler_suite_term(void) +static int scheduler_suite_term(void) { odp_pool_t pool; odp_shm_t shm; @@ -1729,7 +1728,7 @@ odp_suiteinfo_t scheduler_suites[] = { ODP_SUITE_INFO_NULL, }; -int scheduler_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/scheduler/scheduler.h b/test/validation/api/scheduler/scheduler.h deleted file mode 100644 index a619d89b..00000000 --- a/test/validation/api/scheduler/scheduler.h +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_SCHEDULER_H_ -#define _ODP_TEST_SCHEDULER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void scheduler_test_wait_time(void); -void scheduler_test_num_prio(void); -void scheduler_test_queue_destroy(void); -void scheduler_test_groups(void); -void scheduler_test_chaos(void); -void scheduler_test_parallel(void); -void scheduler_test_atomic(void); -void scheduler_test_ordered(void); -void scheduler_test_1q_1t_n(void); -void scheduler_test_1q_1t_a(void); -void scheduler_test_1q_1t_o(void); -void scheduler_test_mq_1t_n(void); -void scheduler_test_mq_1t_a(void); -void scheduler_test_mq_1t_o(void); -void scheduler_test_mq_1t_prio_n(void); -void scheduler_test_mq_1t_prio_a(void); -void scheduler_test_mq_1t_prio_o(void); -void scheduler_test_mq_mt_prio_n(void); -void scheduler_test_mq_mt_prio_a(void); -void scheduler_test_mq_mt_prio_o(void); -void scheduler_test_1q_mt_a_excl(void); -void scheduler_test_multi_1q_1t_n(void); -void scheduler_test_multi_1q_1t_a(void); -void scheduler_test_multi_1q_1t_o(void); -void scheduler_test_multi_mq_1t_n(void); -void scheduler_test_multi_mq_1t_a(void); -void scheduler_test_multi_mq_1t_o(void); -void scheduler_test_multi_mq_1t_prio_n(void); -void scheduler_test_multi_mq_1t_prio_a(void); -void scheduler_test_multi_mq_1t_prio_o(void); -void scheduler_test_multi_mq_mt_prio_n(void); -void scheduler_test_multi_mq_mt_prio_a(void); -void scheduler_test_multi_mq_mt_prio_o(void); -void scheduler_test_multi_1q_mt_a_excl(void); -void scheduler_test_pause_resume(void); - -/* test arrays: */ -extern odp_testinfo_t scheduler_suite[]; - -/* test array init/term functions: */ -int scheduler_suite_init(void); -int scheduler_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t scheduler_suites[]; - -/* main test program: */ -int scheduler_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/scheduler/scheduler_main.c b/test/validation/api/scheduler/scheduler_main.c deleted file mode 100644 index 73f3cedd..00000000 --- a/test/validation/api/scheduler/scheduler_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "scheduler.h" - -int main(int argc, char *argv[]) -{ - return scheduler_main(argc, argv); -} commit 4ffba79dfc573070f61da8894877783601e3aff4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: random: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am index 8f1ba9fe..e24ce0af 100644 --- a/test/validation/api/random/Makefile.am +++ b/test/validation/api/random/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = random_main -random_main_SOURCES = random_main.c random.c random.h +random_main_SOURCES = random.c diff --git a/test/validation/api/random/random.c b/test/validation/api/random/random.c index 071c265f..9a583e34 100644 --- a/test/validation/api/random/random.c +++ b/test/validation/api/random/random.c @@ -8,9 +8,8 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "random.h" -void random_test_get_size(void) +static void random_test_get_size(void) { int32_t ret; uint8_t buf[32]; @@ -19,7 +18,7 @@ void random_test_get_size(void) CU_ASSERT(ret == sizeof(buf)); } -void random_test_kind(void) +static void random_test_kind(void) { int32_t rc; uint8_t buf[4096]; @@ -45,7 +44,7 @@ void random_test_kind(void) } } -void random_test_repeat(void) +static void random_test_repeat(void) { uint8_t buf1[1024]; uint8_t buf2[1024]; @@ -75,7 +74,7 @@ odp_suiteinfo_t random_suites[] = { ODP_SUITE_INFO_NULL, }; -int random_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/random/random.h b/test/validation/api/random/random.h deleted file mode 100644 index c4bca782..00000000 --- a/test/validation/api/random/random.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_RANDOM_H_ -#define _ODP_TEST_RANDOM_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void random_test_get_size(void); -void random_test_kind(void); -void random_test_repeat(void); - -/* test arrays: */ -extern odp_testinfo_t random_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t random_suites[]; - -/* main test program: */ -int random_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/random/random_main.c b/test/validation/api/random/random_main.c deleted file mode 100644 index ca9f5262..00000000 --- a/test/validation/api/random/random_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "random.h" - -int main(int argc, char *argv[]) -{ - return random_main(argc, argv); -} commit 4fc0e934df0bbd0779c6051595add213f752272a Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: queue: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am index 5ed4638b..94a6b28a 100644 --- a/test/validation/api/queue/Makefile.am +++ b/test/validation/api/queue/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = queue_main -queue_main_SOURCES = queue_main.c queue.c queue.h +queue_main_SOURCES = queue.c diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 3c6db33a..8746f506 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "queue.h" #define MAX_BUFFER_QUEUE (8) #define MSG_POOL_SIZE (4 * 1024 * 1024) @@ -29,7 +28,7 @@ static void generate_name(char *name, uint32_t index) name[5] = 'A' + (index % 26); } -int queue_suite_init(void) +static int queue_suite_init(void) { odp_pool_param_t params; @@ -47,12 +46,12 @@ int queue_suite_init(void) return 0; } -int queue_suite_term(void) +static int queue_suite_term(void) { return odp_pool_destroy(pool); } -void queue_test_capa(void) +static void queue_test_capa(void) { odp_queue_capability_t capa; odp_queue_param_t qparams; @@ -115,7 +114,7 @@ void queue_test_capa(void) } } -void queue_test_mode(void) +static void queue_test_mode(void) { odp_queue_param_t qparams; odp_queue_t queue; @@ -155,7 +154,7 @@ void queue_test_mode(void) } } -void queue_test_param(void) +static void queue_test_param(void) { odp_queue_t queue, null_queue; odp_event_t enev[MAX_BUFFER_QUEUE]; @@ -260,7 +259,7 @@ void queue_test_param(void) CU_ASSERT(odp_queue_destroy(queue) == 0); } -void queue_test_info(void) +static void queue_test_info(void) { odp_queue_t q_plain, q_order; const char *const nq_plain = "test_q_plain"; @@ -338,7 +337,7 @@ odp_suiteinfo_t queue_suites[] = { ODP_SUITE_INFO_NULL, }; -int queue_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/queue/queue.h b/test/validation/api/queue/queue.h deleted file mode 100644 index 6b787b1d..00000000 --- a/test/validation/api/queue/queue.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_QUEUE_H_ -#define _ODP_TEST_QUEUE_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void queue_test_capa(void); -void queue_test_mode(void); -void queue_test_param(void); -void queue_test_info(void); - -/* test arrays: */ -extern odp_testinfo_t queue_suite[]; - -/* test array init/term functions: */ -int queue_suite_init(void); -int queue_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t queue_suites[]; - -/* main test program: */ -int queue_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/queue/queue_main.c b/test/validation/api/queue/queue_main.c deleted file mode 100644 index 7ed05411..00000000 --- a/test/validation/api/queue/queue_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "queue.h" - -int main(int argc, char *argv[]) -{ - return queue_main(argc, argv); -} commit 69367466a8c3e30509b1f86c4751285aab37efb8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: pool: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am index 7951d048..1b0d5934 100644 --- a/test/validation/api/pool/Makefile.am +++ b/test/validation/api/pool/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = pool_main -pool_main_SOURCES = pool_main.c pool.c pool.h +pool_main_SOURCES = pool.c diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c index 3a2c7412..34f97357 100644 --- a/test/validation/api/pool/pool.c +++ b/test/validation/api/pool/pool.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "pool.h" #define PKT_LEN 400 #define PKT_NUM 500 @@ -27,7 +26,7 @@ static void pool_create_destroy(odp_pool_param_t *param) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void pool_test_create_destroy_buffer(void) +static void pool_test_create_destroy_buffer(void) { odp_pool_param_t param; @@ -41,7 +40,7 @@ void pool_test_create_destroy_buffer(void) pool_create_destroy(&param); } -void pool_test_create_destroy_packet(void) +static void pool_test_create_destroy_packet(void) { odp_pool_param_t param; @@ -54,7 +53,7 @@ void pool_test_create_destroy_packet(void) pool_create_destroy(&param); } -void pool_test_create_destroy_timeout(void) +static void pool_test_create_destroy_timeout(void) { odp_pool_param_t param; @@ -66,7 +65,7 @@ void pool_test_create_destroy_timeout(void) pool_create_destroy(&param); } -void pool_test_lookup_info_print(void) +static void pool_test_lookup_info_print(void) { odp_pool_t pool; const char pool_name[] = "pool_for_lookup_test"; @@ -98,7 +97,7 @@ void pool_test_lookup_info_print(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void pool_test_alloc_packet(void) +static void pool_test_alloc_packet(void) { odp_pool_t pool; odp_pool_param_t param; @@ -131,7 +130,7 @@ void pool_test_alloc_packet(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void pool_test_alloc_packet_subparam(void) +static void pool_test_alloc_packet_subparam(void) { odp_pool_t pool; odp_pool_capability_t capa; @@ -191,7 +190,7 @@ void pool_test_alloc_packet_subparam(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void pool_test_info_packet(void) +static void pool_test_info_packet(void) { odp_pool_t pool; odp_pool_info_t info; @@ -236,7 +235,7 @@ odp_suiteinfo_t pool_suites[] = { ODP_SUITE_INFO_NULL, }; -int pool_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/pool/pool.h b/test/validation/api/pool/pool.h deleted file mode 100644 index b284524e..00000000 --- a/test/validation/api/pool/pool.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_POOL_H_ -#define _ODP_TEST_POOL_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void pool_test_create_destroy_buffer(void); -void pool_test_create_destroy_packet(void); -void pool_test_create_destroy_timeout(void); -void pool_test_lookup_info_print(void); -void pool_test_alloc_packet(void); -void pool_test_alloc_packet_subparam(void); -void pool_test_info_packet(void); - -/* test arrays: */ -extern odp_testinfo_t pool_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t pool_suites[]; - -/* main test program: */ -int pool_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/pool/pool_main.c b/test/validation/api/pool/pool_main.c deleted file mode 100644 index c1eb7b7c..00000000 --- a/test/validation/api/pool/pool_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "pool.h" - -int main(int argc, char *argv[]) -{ - return pool_main(argc, argv); -} commit d1da7104eb4875287c816aec7e145a7504239156 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: packet: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am index d33cdadb..ad5775d7 100644 --- a/test/validation/api/packet/Makefile.am +++ b/test/validation/api/packet/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = packet_main -packet_main_SOURCES = packet_main.c packet.c packet.h +packet_main_SOURCES = packet.c diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 054a0d4e..bda8d7c7 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -11,7 +11,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> #include <test_packet_parser.h> -#include "packet.h" /* Reserve some tailroom for tests */ #define PACKET_TAILROOM_RESERVE 4 @@ -143,7 +142,7 @@ static int fill_data_backward(odp_packet_t pkt, uint32_t offset, uint32_t len, return odp_packet_copy_from_mem(pkt, offset, len, buf); } -int packet_suite_init(void) +static int packet_suite_init(void) { odp_pool_param_t params; odp_pool_capability_t capa; @@ -276,7 +275,7 @@ int packet_suite_init(void) return 0; } -int packet_suite_term(void) +static int packet_suite_term(void) { odp_packet_free(test_packet); odp_packet_free(segmented_test_packet); @@ -289,7 +288,7 @@ int packet_suite_term(void) return 0; } -void packet_test_alloc_free(void) +static void packet_test_alloc_free(void) { odp_pool_t pool; odp_packet_t packet; @@ -356,7 +355,7 @@ static int packet_alloc_multi(odp_pool_t pool, uint32_t pkt_len, return total; } -void packet_test_alloc_free_multi(void) +static void packet_test_alloc_free_multi(void) { const int num_pkt = 2; odp_pool_t pool[2]; @@ -429,7 +428,7 @@ void packet_test_alloc_free_multi(void) CU_ASSERT(odp_pool_destroy(pool[1]) == 0); } -void packet_test_free_sp(void) +static void packet_test_free_sp(void) { const int num_pkt = 10; odp_pool_t pool; @@ -473,7 +472,7 @@ void packet_test_free_sp(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_alloc_segmented(void) +static void packet_test_alloc_segmented(void) { const int num = 5; odp_packet_t pkts[num]; @@ -556,7 +555,7 @@ void packet_test_alloc_segmented(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_event_conversion(void) +static void packet_test_event_conversion(void) { odp_packet_t pkt0 = test_packet; odp_packet_t pkt1 = segmented_test_packet; @@ -595,7 +594,7 @@ void packet_test_event_conversion(void) packet_compare_data(pkt[1], pkt1); } -void packet_test_basic_metadata(void) +static void packet_test_basic_metadata(void) { odp_packet_t pkt = test_packet; odp_time_t ts; @@ -628,7 +627,7 @@ void packet_test_basic_metadata(void) CU_ASSERT(!odp_packet_has_ts(pkt)); } -void packet_test_length(void) +static void packet_test_length(void) { odp_packet_t pkt = test_packet; uint32_t buf_len, headroom, tailroom; @@ -647,13 +646,13 @@ void packet_test_length(void) CU_ASSERT(buf_len >= packet_len + headroom + tailroom); } -void packet_test_prefetch(void) +static void packet_test_prefetch(void) { odp_packet_prefetch(test_packet, 0, odp_packet_len(test_packet)); CU_PASS(); } -void packet_test_debug(void) +static void packet_test_debug(void) { CU_ASSERT(odp_packet_is_valid(test_packet) == 1); printf("\n\n"); @@ -662,7 +661,7 @@ void packet_test_debug(void) odp_packet_print_data(test_packet, 14, 20); } -void packet_test_context(void) +static void packet_test_context(void) { odp_packet_t pkt = test_packet; char ptr_test_value = 2; @@ -684,7 +683,7 @@ void packet_test_context(void) odp_packet_reset(pkt, packet_len); } -void packet_test_layer_offsets(void) +static void packet_test_layer_offsets(void) { odp_packet_t pkt = test_packet; uint8_t *l2_addr, *l3_addr, *l4_addr; @@ -787,7 +786,7 @@ static void _verify_headroom_shift(odp_packet_t *pkt, CU_ASSERT(odp_packet_data(*pkt) == data); } -void packet_test_headroom(void) +static void packet_test_headroom(void) { odp_packet_t pkt = odp_packet_copy(test_packet, odp_packet_pool(test_packet)); @@ -907,7 +906,7 @@ static void _verify_tailroom_shift(odp_packet_t *pkt, } } -void packet_test_tailroom(void) +static void packet_test_tailroom(void) { odp_packet_t pkt = odp_packet_copy(test_packet, odp_packet_pool(test_packet)); @@ -948,7 +947,7 @@ void packet_test_tailroom(void) odp_packet_free(pkt); } -void packet_test_segments(void) +static void packet_test_segments(void) { int num_segs, seg_index; uint32_t data_len; @@ -1033,7 +1032,7 @@ void packet_test_segments(void) CU_ASSERT(seg == ODP_PACKET_SEG_INVALID); } -void packet_test_segment_last(void) +static void packet_test_segment_last(void) { odp_packet_t pkt = test_packet; odp_packet_seg_t seg; @@ -1053,7 +1052,7 @@ do { \ CU_ASSERT(odp_packet_has_##flag(packet) != 0); \ } while (0) -void packet_test_in_flags(void) +static void packet_test_in_flags(void) { odp_packet_t pkt = test_packet; @@ -1080,7 +1079,7 @@ void packet_test_in_flags(void) TEST_INFLAG(pkt, icmp); } -void packet_test_error_flags(void) +static void packet_test_error_flags(void) { odp_packet_t pkt = test_packet; int err; @@ -1110,7 +1109,7 @@ struct packet_metadata { uint64_t usr_u64; }; -void packet_test_add_rem_data(void) +static void packet_test_add_rem_data(void) { odp_packet_t pkt, new_pkt; uint32_t pkt_len, offset, add_len; @@ -1275,7 +1274,7 @@ static void _packet_compare_offset(odp_packet_t pkt1, uint32_t off1, } } -void packet_test_copy(void) +static void packet_test_copy(void) { odp_packet_t pkt; odp_packet_t pkt_copy, pkt_part; @@ -1377,7 +1376,7 @@ void packet_test_copy(void) odp_packet_free(pkt); } -void packet_test_copydata(void) +static void packet_test_copydata(void) { odp_packet_t pkt = test_packet; uint32_t pkt_len = odp_packet_len(pkt); @@ -1436,7 +1435,7 @@ void packet_test_copydata(void) odp_packet_free(pkt); } -void packet_test_concatsplit(void) +static void packet_test_concatsplit(void) { odp_packet_t pkt, pkt2; uint32_t pkt_len; @@ -1509,7 +1508,7 @@ void packet_test_concatsplit(void) odp_packet_free(pkt); } -void packet_test_concat_small(void) +static void packet_test_concat_small(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1572,7 +1571,7 @@ void packet_test_concat_small(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_concat_extend_trunc(void) +static void packet_test_concat_extend_trunc(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1660,7 +1659,7 @@ void packet_test_concat_extend_trunc(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_extend_small(void) +static void packet_test_extend_small(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1752,7 +1751,7 @@ void packet_test_extend_small(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_extend_large(void) +static void packet_test_extend_large(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1872,7 +1871,7 @@ void packet_test_extend_large(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_extend_mix(void) +static void packet_test_extend_mix(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1986,7 +1985,7 @@ void packet_test_extend_mix(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_extend_ref(void) +static void packet_test_extend_ref(void) { odp_packet_t max_pkt, ref; uint32_t hr, tr, max_len; @@ -2060,7 +2059,7 @@ void packet_test_extend_ref(void) odp_packet_free(max_pkt); } -void packet_test_align(void) +static void packet_test_align(void) { odp_packet_t pkt; uint32_t pkt_len, seg_len, offset, aligned_seglen; @@ -2118,7 +2117,7 @@ void packet_test_align(void) odp_packet_free(pkt); } -void packet_test_offset(void) +static void packet_test_offset(void) { odp_packet_t pkt = test_packet; uint32_t seg_len, full_seg_len; @@ -2164,7 +2163,7 @@ void packet_test_offset(void) CU_ASSERT_PTR_NOT_NULL(ptr); } -void packet_test_ref(void) +static void packet_test_ref(void) { odp_packet_t base_pkt, segmented_base_pkt, hdr_pkt[4], ref_pkt[4], refhdr_pkt[4], hdr_cpy; @@ -3331,7 +3330,7 @@ odp_suiteinfo_t packet_suites[] = { ODP_SUITE_INFO_NULL, }; -int packet_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/packet/packet.h b/test/validation/api/packet/packet.h deleted file mode 100644 index 798b272b..00000000 --- a/test/validation/api/packet/packet.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_PACKET_H_ -#define _ODP_TEST_PACKET_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void packet_test_alloc_free(void); -void packet_test_alloc_free_multi(void); -void packet_test_free_sp(void); -void packet_test_alloc_segmented(void); -void packet_test_event_conversion(void); -void packet_test_basic_metadata(void); -void packet_test_length(void); -void packet_test_prefetch(void); -void packet_test_debug(void); -void packet_test_context(void); -void packet_test_layer_offsets(void); -void packet_test_headroom(void); -void packet_test_tailroom(void); -void packet_test_segments(void); -void packet_test_segment_last(void); -void packet_test_in_flags(void); -void packet_test_error_flags(void); -void packet_test_add_rem_data(void); -void packet_test_copy(void); -void packet_test_copydata(void); -void packet_test_concatsplit(void); -void packet_test_concat_small(void); -void packet_test_concat_extend_trunc(void); -void packet_test_extend_small(void); -void packet_test_extend_large(void); -void packet_test_extend_mix(void); -void packet_test_extend_ref(void); -void packet_test_align(void); -void packet_test_offset(void); -void packet_test_ref(void); - -/* test arrays: */ -extern odp_testinfo_t packet_suite[]; - -/* test array init/term functions: */ -int packet_suite_init(void); -int packet_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t packet_suites[]; - -/* main test program: */ -int packet_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/packet/packet_main.c b/test/validation/api/packet/packet_main.c deleted file mode 100644 index a80e29a2..00000000 --- a/test/validation/api/packet/packet_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "packet.h" - -int main(int argc, char *argv[]) -{ - return packet_main(argc, argv); -} commit 409d87e542b9f018467c2c62bb07a8e4f2a15993 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: lock: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am index c5518b3a..ad75e185 100644 --- a/test/validation/api/lock/Makefile.am +++ b/test/validation/api/lock/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = lock_main -lock_main_SOURCES = lock_main.c lock.c lock.h +lock_main_SOURCES = lock.c diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock/lock.c index 48a659e8..4ed1f8d8 100644 --- a/test/validation/api/lock/lock.c +++ b/test/validation/api/lock/lock.c @@ -11,7 +11,6 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> -#include "lock.h" #define VERBOSE 0 @@ -1004,7 +1003,7 @@ static int rwlock_recursive_functional_test(void *arg UNUSED) } /* Thread-unsafe tests */ -void lock_test_no_lock_functional(void) +static void lock_test_no_lock_functional(void) { pthrd_arg arg; @@ -1019,7 +1018,7 @@ odp_testinfo_t lock_suite_no_locking[] = { }; /* Spin lock tests */ -void lock_test_spinlock_api(void) +static void lock_test_spinlock_api(void) { pthrd_arg arg; @@ -1028,7 +1027,7 @@ void lock_test_spinlock_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_spinlock_functional(void) +static void lock_test_spinlock_functional(void) { pthrd_arg arg; @@ -1038,7 +1037,7 @@ void lock_test_spinlock_functional(void) odp_cunit_thread_exit(&arg); } -void lock_test_spinlock_recursive_api(void) +static void lock_test_spinlock_recursive_api(void) { pthrd_arg arg; @@ -1047,7 +1046,7 @@ void lock_test_spinlock_recursive_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_spinlock_recursive_functional(void) +static void lock_test_spinlock_recursive_functional(void) { pthrd_arg arg; @@ -1070,7 +1069,7 @@ odp_testinfo_t lock_suite_spinlock_recursive[] = { }; /* Ticket lock tests */ -void lock_test_ticketlock_api(void) +static void lock_test_ticketlock_api(void) { pthrd_arg arg; @@ -1079,7 +1078,7 @@ void lock_test_ticketlock_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_ticketlock_functional(void) +static void lock_test_ticketlock_functional(void) { pthrd_arg arg; @@ -1097,7 +1096,7 @@ odp_testinfo_t lock_suite_ticketlock[] = { }; /* RW lock tests */ -void lock_test_rwlock_api(void) +static void lock_test_rwlock_api(void) { pthrd_arg arg; @@ -1106,7 +1105,7 @@ void lock_test_rwlock_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_rwlock_functional(void) +static void lock_test_rwlock_functional(void) { pthrd_arg arg; @@ -1122,7 +1121,7 @@ odp_testinfo_t lock_suite_rwlock[] = { ODP_TEST_INFO_NULL }; -void lock_test_rwlock_recursive_api(void) +static void lock_test_rwlock_recursive_api(void) { pthrd_arg arg; @@ -1131,7 +1130,7 @@ void lock_test_rwlock_recursive_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_rwlock_recursive_functional(void) +static void lock_test_rwlock_recursive_functional(void) { pthrd_arg arg; @@ -1147,7 +1146,7 @@ odp_testinfo_t lock_suite_rwlock_recursive[] = { ODP_TEST_INFO_NULL }; -int lock_suite_init(void) +static int lock_suite_init(void) { uint32_t num_threads, idx; @@ -1159,7 +1158,7 @@ int lock_suite_init(void) return 0; } -int lock_init(odp_instance_t *inst) +static int lock_init(odp_instance_t *inst) { uint32_t workers_count, max_threads; int ret = 0; @@ -1208,7 +1207,7 @@ int lock_init(odp_instance_t *inst) return ret; } -int lock_term(odp_instance_t inst) +static int lock_term(odp_instance_t inst) { odp_shm_t shm; @@ -1247,7 +1246,7 @@ odp_suiteinfo_t lock_suites[] = { ODP_SUITE_INFO_NULL }; -int lock_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/lock/lock.h b/test/validation/api/lock/lock.h deleted file mode 100644 index e0f49728..00000000 --- a/test/validation/api/lock/lock.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_LOCK_H_ -#define _ODP_TEST_LOCK_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void lock_test_no_lock_functional(void); -void lock_test_spinlock_api(void); -void lock_test_spinlock_functional(void); -void lock_test_spinlock_recursive_api(void); -void lock_test_spinlock_recursive_functional(void); -void lock_test_ticketlock_api(void); -void lock_test_ticketlock_functional(void); -void lock_test_rwlock_api(void); -void lock_test_rwlock_functional(void); -void lock_test_rwlock_recursive_api(void); -void lock_test_rwlock_recursive_functional(void); - -/* test arrays: */ -extern odp_testinfo_t lock_suite_no_locking[]; -extern odp_testinfo_t lock_suite_spinlock[]; -extern odp_testinfo_t lock_suite_spinlock_recursive[]; -extern odp_testinfo_t lock_suite_ticketlock[]; -extern odp_testinfo_t lock_suite_rwlock[]; -extern odp_testinfo_t lock_suite_rwlock_recursive[]; - -/* test array init/term functions: */ -int lock_suite_init(void); - -/* test registry: */ -extern odp_suiteinfo_t lock_suites[]; - -/* executable init/term functions: */ -int lock_init(odp_instance_t *inst); -int lock_term(odp_instance_t inst); - -/* main test program: */ -int lock_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/lock/lock_main.c b/test/validation/api/lock/lock_main.c deleted file mode 100644 index e182f77a..00000000 --- a/test/validation/api/lock/lock_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "lock.h" - -int main(int argc, char *argv[]) -{ - return lock_main(argc, argv); -} commit f4d395f2a80646c0609b62fbe37cd14465df74ac Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: hash: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am index 8f005778..0d843ea7 100644 --- a/test/validation/api/hash/Makefile.am +++ b/test/validation/api/hash/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = hash_main -hash_main_SOURCES = hash_main.c hash.c hash.h +hash_main_SOURCES = hash.c diff --git a/test/validation/api/hash/hash.c b/test/validation/api/hash/hash.c index 886df502..2216dff8 100644 --- a/test/validation/api/hash/hash.c +++ b/test/validation/api/hash/hash.c @@ -8,9 +8,8 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "hash.h" -void hash_test_crc32c(void) +static void hash_test_crc32c(void) { uint32_t test_value = 0x12345678; uint32_t ret = odp_hash_crc32c(&test_value, 4, 0); @@ -39,7 +38,7 @@ odp_suiteinfo_t hash_suites[] = { ODP_SUITE_INFO_NULL }; -int hash_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/hash/hash.h b/test/validation/api/hash/hash.h deleted file mode 100644 index 936571e6..00000000 --- a/test/validation/api/hash/hash.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_HASH_H_ -#define _ODP_TEST_HASH_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void hash_test_crc32c(void); - -/* test arrays: */ -extern odp_testinfo_t hash_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t hash_suites[]; - -/* main test program: */ -int hash_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/hash/hash_main.c b/test/validation/api/hash/hash_main.c deleted file mode 100644 index 089b1f95..00000000 --- a/test/validation/api/hash/hash_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "hash.h" - -int main(int argc, char *argv[]) -{ - return hash_main(argc, argv); -} commit dab09417bf432da56aeddb2feaef9e6a11b739d7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: event: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/event/Makefile.am b/test/validation/api/event/Makefile.am index 762f9356..0d26035e 100644 --- a/test/validation/api/event/Makefile.am +++ b/test/validation/api/event/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = event_main -event_main_SOURCES = event_main.c event.c event.h +event_main_SOURCES = event.c diff --git a/test/validation/api/event/event.c b/test/validation/api/event/event.c index 5add99c3..ec0fec2d 100644 --- a/test/validation/api/event/event.c +++ b/test/validation/api/event/event.c @@ -7,7 +7,6 @@ #include "config.h" #include <odp_api.h> #include <odp_cunit_common.h> -#include "event.h" #define NUM_EVENTS 100 #define EVENT_SIZE 100 @@ -400,7 +399,7 @@ odp_suiteinfo_t event_suites[] = { ODP_SUITE_INFO_NULL, }; -int event_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/event/event.h b/test/validation/api/event/event.h deleted file mode 100644 index 1d2b6e69..00000000 --- a/test/validation/api/event/event.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_EVENT_H_ -#define _ODP_TEST_EVENT_H_ - -int event_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/event/event_main.c b/test/validation/api/event/event_main.c deleted file mode 100644 index 3fbefdb8..00000000 --- a/test/validation/api/event/event_main.c +++ /dev/null @@ -1,13 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" -#include "event.h" - -int main(int argc, char *argv[]) -{ - return event_main(argc, argv); -} commit f7938ef11ede6ed6843bb7608a98ab3d15cf8e1c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: errno: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am index ad5c7ded..de13afbf 100644 --- a/test/validation/api/errno/Makefile.am +++ b/test/validation/api/errno/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = errno_main -errno_main_SOURCES = errno_main.c errno.c errno.h +errno_main_SOURCES = errno.c diff --git a/test/validation/api/errno/errno.c b/test/validation/api/errno/errno.c index 929e0f40..95468a3f 100644 --- a/test/validation/api/errno/errno.c +++ b/test/validation/api/errno/errno.c @@ -8,9 +8,8 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "errno.h" -void errno_test_odp_errno_sunny_day(void) +static void errno_test_odp_errno_sunny_day(void) { int my_errno; @@ -31,7 +30,7 @@ odp_suiteinfo_t errno_suites[] = { ODP_SUITE_INFO_NULL, }; -int errno_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/errno/errno.h b/test/validation/api/errno/errno.h deleted file mode 100644 index 72038519..00000000 --- a/test/validation/api/errno/errno.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_ERRNO_H_ -#define _ODP_TEST_ERRNO_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void errno_test_odp_errno_sunny_day(void); - -/* test arrays: */ -extern odp_testinfo_t errno_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t errno_suites[]; - -/* main test program: */ -int errno_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/errno/errno_main.c b/test/validation/api/errno/errno_main.c deleted file mode 100644 index 2f2e3155..00000000 --- a/test/validation/api/errno/errno_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "errno.h" - -int main(int argc, char *argv[]) -{ - return errno_main(argc, argv); -} commit 9e40c760b95077a4ca4e652e4d39a4304e5828f6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: cpumask: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am index e5c78d92..3872c1bd 100644 --- a/test/validation/api/cpumask/Makefile.am +++ b/test/validation/api/cpumask/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc test_PROGRAMS = cpumask_main -cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h +cpumask_main_SOURCES = cpumask.c LDADD += $(LIBCPUMASK_COMMON) diff --git a/test/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c index e6ac8394..9da68a76 100644 --- a/test/validation/api/cpumask/cpumask.c +++ b/test/validation/api/cpumask/cpumask.c @@ -9,13 +9,12 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "cpumask.h" #include "mask_common.h" /* default worker parameter to get all that may be available */ #define ALL_AVAILABLE 0 -void cpumask_test_odp_cpumask_def_control(void) +static void cpumask_test_odp_cpumask_def_control(void) { unsigned num; unsigned mask_count; @@ -30,7 +29,7 @@ void cpumask_test_odp_cpumask_def_control(void) CU_ASSERT(num <= max_cpus); } -void cpumask_test_odp_cpumask_def_worker(void) +static void cpumask_test_odp_cpumask_def_worker(void) { unsigned num; unsigned mask_count; @@ -45,7 +44,7 @@ void cpumask_test_odp_cpumask_def_worker(void) CU_ASSERT(num <= max_cpus); } -void cpumask_test_odp_cpumask_def(void) +static void cpumask_test_odp_cpumask_def(void) { unsigned mask_count; unsigned num_worker; @@ -101,7 +100,7 @@ odp_suiteinfo_t cpumask_suites[] = { ODP_SUITE_INFO_NULL, }; -int cpumask_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/cpumask/cpumask.h b/test/validation/api/cpumask/cpumask.h deleted file mode 100644 index 87a4512b..00000000 --- a/test/validation/api/cpumask/cpumask.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_CPUMASK_H_ -#define _ODP_TEST_CPUMASK_H_ - -#include <odp_api.h> -#include <odp_cunit_common.h> - -/* test functions: */ -#include "mask_common.h" -void cpumask_test_odp_cpumask_def_control(void); -void cpumask_test_odp_cpumask_def_worker(void); -void cpumask_test_odp_cpumask_def(void); - -/* test arrays: */ -extern odp_testinfo_t cpumask_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t cpumask_suites[]; - -/* main test program: */ -int cpumask_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/cpumask/cpumask_main.c b/test/validation/api/cpumask/cpumask_main.c deleted file mode 100644 index 77fdd228..00000000 --- a/test/validation/api/cpumask/cpumask_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "cpumask.h" - -int main(int argc, char *argv[]) -{ - return cpumask_main(argc, argv); -} commit 7c733ea2be5898660a3d02cdd2cf1f0a64a50e0c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: chksum: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/chksum/Makefile.am b/test/validation/api/chksum/Makefile.am index 9bd44385..349fdd64 100644 --- a/test/validation/api/chksum/Makefile.am +++ b/test/validation/api/chksum/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = chksum_main -chksum_main_SOURCES = chksum_main.c chksum.c chksum.h +chksum_main_SOURCES = chksum.c diff --git a/test/validation/api/chksum/chksum.c b/test/validation/api/chksum/chksum.c index f8687955..42bda779 100644 --- a/test/validation/api/chksum/chksum.c +++ b/test/validation/api/chksum/chksum.c @@ -6,7 +6,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "chksum.h" #define NUM_IP_HDR 5 #define IP_HDR_LEN 20 @@ -244,7 +243,7 @@ static uint8_t ODP_ALIGNED(4) udp_test_vect_long[] = { }; /* Test ones complement sum with IPv4 headers */ -void chksum_ones_complement_ip(void) +static void chksum_ones_complement_ip(void) { int i; uint16_t sum, res; @@ -258,7 +257,7 @@ void chksum_ones_complement_ip(void) } /* Test ones complement sum with various length pseudo UDP packets */ -void chksum_ones_complement_udp(void) +static void chksum_ones_complement_udp(void) { int i; uint16_t sum, res; @@ -273,7 +272,7 @@ void chksum_ones_complement_udp(void) } /* Test ones complement sum with a long pseudo UDP packet */ -void chksum_ones_complement_udp_long(void) +static void chksum_ones_complement_udp_long(void) { int i; uint16_t sum, res; @@ -326,7 +325,7 @@ odp_suiteinfo_t chksum_suites[] = { ODP_SUITE_INFO_NULL }; -int chksum_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/chksum/chksum.h b/test/validation/api/chksum/chksum.h deleted file mode 100644 index 50ed66ee..00000000 --- a/test/validation/api/chksum/chksum.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_CHKSUM_H_ -#define _ODP_TEST_CHKSUM_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void chksum_ones_complement_ip(void); -void chksum_ones_complement_udp(void); -void chksum_ones_complement_udp_long(void); - -/* test arrays: */ -extern odp_testinfo_t chksum_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t chksum_suites[]; - -/* main test program: */ -int chksum_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/chksum/chksum_main.c b/test/validation/api/chksum/chksum_main.c deleted file mode 100644 index bec10ddd..00000000 --- a/test/validation/api/chksum/chksum_main.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "chksum.h" - -int main(int argc, char *argv[]) -{ - return chksum_main(argc, argv); -} commit e8d209cc33a34c7ee92053e3f240c542068816dd Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: buffer: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am index 901fdadc..f459010c 100644 --- a/test/validation/api/buffer/Makefile.am +++ b/test/validation/api/buffer/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = buffer_main -buffer_main_SOURCES = buffer_main.c buffer.c buffer.h +buffer_main_SOURCES = buffer.c diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c index 91353a7c..7d13bc18 100644 --- a/test/validation/api/buffer/buffer.c +++ b/test/validation/api/buffer/buffer.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "buffer.h" #define BUF_ALIGN ODP_CACHE_LINE_SIZE #define BUF_SIZE 1500 @@ -16,7 +15,7 @@ static odp_pool_t raw_pool; static odp_buffer_t raw_buffer = ODP_BUFFER_INVALID; -int buffer_suite_init(void) +static int buffer_suite_init(void) { odp_pool_param_t params; @@ -35,7 +34,7 @@ int buffer_suite_init(void) return 0; } -int buffer_suite_term(void) +static int buffer_suite_term(void) { odp_buffer_free(raw_buffer); if (odp_pool_destroy(raw_pool) != 0) @@ -43,7 +42,7 @@ int buffer_suite_term(void) return 0; } -void buffer_test_pool_alloc(void) +static void buffer_test_pool_alloc(void) { odp_pool_t pool; const int num = 3; @@ -127,7 +126,7 @@ static int buffer_alloc_multi(odp_pool_t pool, odp_buffer_t buffer[], int num) return total; } -void buffer_test_pool_alloc_multi(void) +static void buffer_test_pool_alloc_multi(void) { odp_pool_t pool; const int num = 3; @@ -192,7 +191,7 @@ void buffer_test_pool_alloc_multi(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void buffer_test_pool_free(void) +static void buffer_test_pool_free(void) { odp_pool_t pool; odp_buffer_t buffer; @@ -223,7 +222,7 @@ void buffer_test_pool_free(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void buffer_test_pool_free_multi(void) +static void buffer_test_pool_free_multi(void) { odp_pool_t pool[2]; odp_buffer_t buffer[4]; @@ -261,7 +260,7 @@ void buffer_test_pool_free_multi(void) CU_ASSERT(odp_pool_destroy(pool[1]) == 0); } -void buffer_test_management_basic(void) +static void buffer_test_management_basic(void) { odp_event_t ev = odp_buffer_to_event(raw_buffer); odp_event_subtype_t subtype; @@ -294,7 +293,7 @@ odp_suiteinfo_t buffer_suites[] = { ODP_SUITE_INFO_NULL, }; -int buffer_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/buffer/buffer.h b/test/validation/api/buffer/buffer.h deleted file mode 100644 index 48331e3f..00000000 --- a/test/validation/api/buffer/buffer.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_BUFFER_H_ -#define _ODP_TEST_BUFFER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void buffer_test_pool_alloc(void); -void buffer_test_pool_free(void); -void buffer_test_pool_alloc_multi(void); -void buffer_test_pool_free_multi(void); -void buffer_test_management_basic(void); - -/* test arrays: */ -extern odp_testinfo_t buffer_suite[]; - -/* test array init/term functions: */ -int buffer_suite_init(void); -int buffer_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t buffer_suites[]; - -/* main test program: */ -int buffer_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/buffer/buffer_main.c b/test/validation/api/buffer/buffer_main.c deleted file mode 100644 index 8642560d..00000000 --- a/test/validation/api/buffer/buffer_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "buffer.h" - -int main(int argc, char *argv[]) -{ - return buffer_main(argc, argv); -} commit 157737a4629a569f453762f92be2e3d174dfe1e5 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: barrier: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am index aad5ddd6..f5f751b8 100644 --- a/test/validation/api/barrier/Makefile.am +++ b/test/validation/api/barrier/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = barrier_main -barrier_main_SOURCES = barrier_main.c barrier.c barrier.h +barrier_main_SOURCES = barrier.c diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c index b75d6204..7201cca3 100644 --- a/test/validation/api/barrier/barrier.c +++ b/test/validation/api/barrier/barrier.c @@ -11,7 +11,6 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> -#include "barrier.h" #define VERBOSE 0 #define MAX_ITERATIONS 1000 @@ -278,7 +277,7 @@ static void barrier_test_init(void) } /* Barrier tests */ -void barrier_test_memory_barrier(void) +static void barrier_test_memory_barrier(void) { volatile int a = 0; volatile int b = 0; @@ -298,7 +297,7 @@ void barrier_test_memory_barrier(void) temp_result = a + b + c + d; } -void barrier_test_no_barrier_functional(void) +static void barrier_test_no_barrier_functional(void) { pthrd_arg arg; @@ -308,7 +307,7 @@ void barrier_test_no_barrier_functional(void) odp_cunit_thread_exit(&arg); } -void barrier_test_barrier_functional(void) +static void barrier_test_barrier_functional(void) { pthrd_arg arg; @@ -325,7 +324,7 @@ odp_testinfo_t barrier_suite_barrier[] = { ODP_TEST_INFO_NULL }; -int barrier_init(odp_instance_t *inst) +static int barrier_init(odp_instance_t *inst) { uint32_t workers_count, max_threads; int ret = 0; @@ -374,7 +373,7 @@ int barrier_init(odp_instance_t *inst) return ret; } -int barrier_term(odp_instance_t inst) +static int barrier_term(odp_instance_t inst) { odp_shm_t shm; @@ -403,7 +402,7 @@ odp_suiteinfo_t barrier_suites[] = { ODP_SUITE_INFO_NULL }; -int barrier_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/barrier/barrier.h b/test/validation/api/barrier/barrier.h deleted file mode 100644 index 188bcb8f..00000000 --- a/test/validation/api/barrier/barrier.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_BARRIER_H_ -#define _ODP_TEST_BARRIER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void barrier_test_memory_barrier(void); -void barrier_test_no_barrier_functional(void); -void barrier_test_barrier_functional(void); - -/* test arrays: */ -extern odp_testinfo_t barrier_suite_barrier[]; - -/* test registry: */ -extern odp_suiteinfo_t barrier_suites[]; - -/* executable init/term functions: */ -int barrier_init(odp_instance_t *inst); -int barrier_term(odp_instance_t inst); - -/* main test program: */ -int barrier_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/barrier/barrier_main.c b/test/validation/api/barrier/barrier_main.c deleted file mode 100644 index 28df6afa..00000000 --- a/test/validation/api/barrier/barrier_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "barrier.h" - -int main(int argc, char *argv[]) -{ - return barrier_main(argc, argv); -} commit e4fec7da3e89c20cfe3c4d96c5fbe02ebbea57b3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: atomic: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am index 4de45970..41ad2e6b 100644 --- a/test/validation/api/atomic/Makefile.am +++ b/test/validation/api/atomic/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = atomic_main -atomic_main_SOURCES = atomic_main.c atomic.c atomic.h +atomic_main_SOURCES = atomic.c diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c index 5bf2fe87..17d5743d 100644 --- a/test/validation/api/atomic/atomic.c +++ b/test/validation/api/atomic/atomic.c @@ -11,7 +11,6 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> -#include "atomic.h" #define VERBOSE 0 #define MAX_ITERATIONS 1000 @@ -536,7 +535,7 @@ static void test_atomic_validate(int check) } } -int atomic_init(odp_instance_t *inst) +static int atomic_init(odp_instance_t *inst) { uint32_t workers_count, max_threads; int ret = 0; @@ -585,7 +584,7 @@ int atomic_init(odp_instance_t *inst) return ret; } -int atomic_term(odp_instance_t inst) +static int atomic_term(odp_instance_t inst) { odp_shm_t shm; @@ -725,48 +724,48 @@ static void test_atomic_functional(int func_ptr(void *), int check) test_atomic_validate(check); } -void atomic_test_atomic_inc_dec(void) +static void atomic_test_atomic_inc_dec(void) { test_atomic_functional(test_atomic_inc_dec_thread, 0); } -void atomic_test_atomic_add_sub(void) +static void atomic_test_atomic_add_sub(void) { test_atomic_functional(test_atomic_add_sub_thread, 0); } -void atomic_test_atomic_fetch_inc_dec(void) +static void atomic_test_atomic_fetch_inc_dec(void) { test_atomic_functional(test_atomic_fetch_inc_dec_thread, 0); } -void atomic_test_atomic_fetch_add_sub(void) +static void atomic_test_atomic_fetch_add_sub(void) { test_atomic_functional(test_atomic_fetch_add_sub_thread, 0); } -void atomic_test_atomic_max_min(void) +static void atomic_test_atomic_max_min(void) { test_atomic_functional(test_atomic_max_min_thread, CHECK_MAX_MIN); } -void atomic_test_atomic_cas_inc_dec(void) +static void atomic_test_atomic_cas_inc_dec(void) { test_atomic_functional(test_atomic_cas_inc_dec_thread, 0); } -void atomic_test_atomic_xchg(void) +static void atomic_test_atomic_xchg(void) { test_atomic_functional(test_atomic_xchg_thread, CHECK_XCHG); } -void atomic_test_atomic_non_relaxed(void) +static void atomic_test_atomic_non_relaxed(void) { test_atomic_functional(test_atomic_non_relaxed_thread, CHECK_MAX_MIN | CHECK_XCHG); } -void atomic_test_atomic_op_lock_free(void) +static void atomic_test_atomic_op_lock_free(void) { odp_atomic_op_t atomic_op; int ret_null, ret; @@ -891,7 +890,7 @@ odp_suiteinfo_t atomic_suites[] = { ODP_SUITE_INFO_NULL }; -int atomic_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/atomic/atomic.h b/test/validation/api/atomic/atomic.h deleted file mode 100644 index 66796c8e..00000000 --- a/test/validation/api/atomic/atomic.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_ATOMIC_H_ -#define _ODP_TEST_ATOMIC_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void atomic_test_atomic_inc_dec(void); -void atomic_test_atomic_add_sub(void); -void atomic_test_atomic_fetch_inc_dec(void); -void atomic_test_atomic_fetch_add_sub(void); -void atomic_test_atomic_max_min(void); -void atomic_test_atomic_cas_inc_dec(void); -void atomic_test_atomic_xchg(void); -void atomic_test_atomic_non_relaxed(void); -void atomic_test_atomic_op_lock_free(void); - -/* test arrays: */ -extern odp_testinfo_t atomic_suite_atomic[]; - -/* test array init/term functions: */ -int atomic_suite_init(void); - -/* test registry: */ -extern odp_suiteinfo_t atomic_suites[]; - -/* executable init/term functions: */ -int atomic_init(odp_instance_t *inst); -int atomic_term(odp_instance_t inst); - -/* main test program: */ -int atomic_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/atomic/atomic_main.c b/test/validation/api/atomic/atomic_main.c deleted file mode 100644 index b6028393..00000000 --- a/test/validation/api/atomic/atomic_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "atomic.h" - -int main(int argc, char *argv[]) -{ - return atomic_main(argc, argv); -} ----------------------------------------------------------------------- Summary of changes: .../test/validation/api/pktio/pktio_run_pcap.sh | 1 + test/validation/api/atomic/Makefile.am | 2 +- test/validation/api/atomic/atomic.c | 25 ++- test/validation/api/atomic/atomic.h | 39 ---- test/validation/api/atomic/atomic_main.c | 14 -- test/validation/api/barrier/Makefile.am | 2 +- test/validation/api/barrier/barrier.c | 13 +- test/validation/api/barrier/barrier.h | 30 ---- test/validation/api/barrier/barrier_main.c | 14 -- test/validation/api/buffer/Makefile.am | 2 +- test/validation/api/buffer/buffer.c | 17 +- test/validation/api/buffer/buffer.h | 32 ---- test/validation/api/buffer/buffer_main.c | 14 -- test/validation/api/chksum/Makefile.am | 2 +- test/validation/api/chksum/chksum.c | 9 +- test/validation/api/chksum/chksum.h | 26 --- test/validation/api/chksum/chksum_main.c | 12 -- test/validation/api/classification/Makefile.am | 2 +- .../validation/api/classification/classification.c | 2 +- .../validation/api/classification/classification.h | 42 ----- .../api/classification/classification_main.c | 14 -- .../api/classification/odp_classification_basic.c | 14 +- .../classification/odp_classification_test_pmr.c | 24 +-- .../api/classification/odp_classification_tests.c | 8 +- test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/cpumask/cpumask.c | 9 +- test/validation/api/cpumask/cpumask.h | 28 --- test/validation/api/cpumask/cpumask_main.c | 14 -- test/validation/api/crypto/Makefile.am | 5 +- test/validation/api/crypto/crypto.c | 135 -------------- test/validation/api/crypto/crypto.h | 59 ------ test/validation/api/crypto/crypto_main.c | 14 -- test/validation/api/crypto/odp_crypto_test_inp.c | 197 +++++++++++++++++---- test/validation/api/crypto/odp_crypto_test_inp.h | 26 --- test/validation/api/errno/Makefile.am | 2 +- test/validation/api/errno/errno.c | 5 +- test/validation/api/errno/errno.h | 24 --- test/validation/api/errno/errno_main.c | 14 -- test/validation/api/event/Makefile.am | 2 +- test/validation/api/event/event.c | 3 +- test/validation/api/event/event.h | 12 -- test/validation/api/event/event_main.c | 13 -- test/validation/api/hash/Makefile.am | 2 +- test/validation/api/hash/hash.c | 5 +- test/validation/api/hash/hash.h | 24 --- test/validation/api/hash/hash_main.c | 14 -- test/validation/api/lock/Makefile.am | 2 +- test/validation/api/lock/lock.c | 31 ++-- test/validation/api/lock/lock.h | 46 ----- test/validation/api/lock/lock_main.c | 14 -- test/validation/api/packet/Makefile.am | 2 +- test/validation/api/packet/packet.c | 67 ++++--- test/validation/api/packet/packet.h | 57 ------ test/validation/api/packet/packet_main.c | 14 -- test/validation/api/pktio/Makefile.am | 2 +- test/validation/api/pktio/parser.c | 36 ++-- test/validation/api/pktio/parser.h | 12 -- test/validation/api/pktio/pktio.c | 79 ++++----- test/validation/api/pktio/pktio.h | 67 ------- test/validation/api/pktio/pktio_main.c | 14 -- test/validation/api/pool/Makefile.am | 2 +- test/validation/api/pool/pool.c | 17 +- test/validation/api/pool/pool.h | 30 ---- test/validation/api/pool/pool_main.c | 14 -- test/validation/api/queue/Makefile.am | 2 +- test/validation/api/queue/queue.c | 15 +- test/validation/api/queue/queue.h | 31 ---- test/validation/api/queue/queue_main.c | 14 -- test/validation/api/random/Makefile.am | 2 +- test/validation/api/random/random.c | 9 +- test/validation/api/random/random.h | 26 --- test/validation/api/random/random_main.c | 14 -- test/validation/api/scheduler/Makefile.am | 2 +- test/validation/api/scheduler/scheduler.c | 77 ++++---- test/validation/api/scheduler/scheduler.h | 62 ------- test/validation/api/scheduler/scheduler_main.c | 14 -- test/validation/api/shmem/Makefile.am | 2 +- test/validation/api/shmem/shmem.c | 11 +- test/validation/api/shmem/shmem.h | 27 --- test/validation/api/shmem/shmem_main.c | 14 -- test/validation/api/std_clib/Makefile.am | 2 +- test/validation/api/std_clib/std_clib.c | 3 +- test/validation/api/std_clib/std_clib.h | 21 --- test/validation/api/std_clib/std_clib_main.c | 14 -- test/validation/api/system/Makefile.am | 2 +- test/validation/api/system/system.c | 44 ++--- test/validation/api/system/system.h | 45 ----- test/validation/api/system/system_main.c | 14 -- test/validation/api/thread/Makefile.am | 2 +- test/validation/api/thread/thread.c | 13 +- test/validation/api/thread/thread.h | 33 ---- test/validation/api/thread/thread_main.c | 14 -- test/validation/api/time/Makefile.am | 2 +- test/validation/api/time/time.c | 33 ++-- test/validation/api/time/time_main.c | 14 -- test/validation/api/time/time_test.h | 38 ---- test/validation/api/timer/Makefile.am | 2 +- test/validation/api/timer/timer.c | 11 +- test/validation/api/timer/timer.h | 27 --- test/validation/api/timer/timer_main.c | 14 -- test/validation/api/traffic_mngr/Makefile.am | 9 +- test/validation/api/traffic_mngr/traffic_mngr.c | 41 +++-- test/validation/api/traffic_mngr/traffic_mngr.h | 45 ----- .../api/traffic_mngr/traffic_mngr_main.c | 14 -- 104 files changed, 496 insertions(+), 1758 deletions(-) delete mode 100644 test/validation/api/atomic/atomic.h delete mode 100644 test/validation/api/atomic/atomic_main.c delete mode 100644 test/validation/api/barrier/barrier.h delete mode 100644 test/validation/api/barrier/barrier_main.c delete mode 100644 test/validation/api/buffer/buffer.h delete mode 100644 test/validation/api/buffer/buffer_main.c delete mode 100644 test/validation/api/chksum/chksum.h delete mode 100644 test/validation/api/chksum/chksum_main.c delete mode 100644 test/validation/api/classification/classification_main.c delete mode 100644 test/validation/api/cpumask/cpumask.h delete mode 100644 test/validation/api/cpumask/cpumask_main.c delete mode 100644 test/validation/api/crypto/crypto.c delete mode 100644 test/validation/api/crypto/crypto.h delete mode 100644 test/validation/api/crypto/crypto_main.c delete mode 100644 test/validation/api/crypto/odp_crypto_test_inp.h delete mode 100644 test/validation/api/errno/errno.h delete mode 100644 test/validation/api/errno/errno_main.c delete mode 100644 test/validation/api/event/event.h delete mode 100644 test/validation/api/event/event_main.c delete mode 100644 test/validation/api/hash/hash.h delete mode 100644 test/validation/api/hash/hash_main.c delete mode 100644 test/validation/api/lock/lock.h delete mode 100644 test/validation/api/lock/lock_main.c delete mode 100644 test/validation/api/packet/packet.h delete mode 100644 test/validation/api/packet/packet_main.c delete mode 100644 test/validation/api/pktio/pktio.h delete mode 100644 test/validation/api/pktio/pktio_main.c delete mode 100644 test/validation/api/pool/pool.h delete mode 100644 test/validation/api/pool/pool_main.c delete mode 100644 test/validation/api/queue/queue.h delete mode 100644 test/validation/api/queue/queue_main.c delete mode 100644 test/validation/api/random/random.h delete mode 100644 test/validation/api/random/random_main.c delete mode 100644 test/validation/api/scheduler/scheduler.h delete mode 100644 test/validation/api/scheduler/scheduler_main.c delete mode 100644 test/validation/api/shmem/shmem.h delete mode 100644 test/validation/api/shmem/shmem_main.c delete mode 100644 test/validation/api/std_clib/std_clib.h delete mode 100644 test/validation/api/std_clib/std_clib_main.c delete mode 100644 test/validation/api/system/system.h delete mode 100644 test/validation/api/system/system_main.c delete mode 100644 test/validation/api/thread/thread.h delete mode 100644 test/validation/api/thread/thread_main.c delete mode 100644 test/validation/api/time/time_main.c delete mode 100644 test/validation/api/time/time_test.h delete mode 100644 test/validation/api/timer/timer.h delete mode 100644 test/validation/api/timer/timer_main.c delete mode 100644 test/validation/api/traffic_mngr/traffic_mngr.h delete mode 100644 test/validation/api/traffic_mngr/traffic_mngr_main.c hooks/post-receive --

7 years, 4 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-252-gea2afab6

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via ea2afab619ae74108a03798bc358fdfcd29fdd88 (commit) via 3c51188fd0b30fdddad377e485b856429a4f2bc8 (commit) from 27328232ed2f01dd70aa431f5fa19bd058014305 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ea2afab619ae74108a03798bc358fdfcd29fdd88 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 7 06:45:01 2018 +0300 validation: api: check l3/l4 proto types after parsing Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 7d19e012..f829d0cb 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -2552,6 +2552,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_udp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV4); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_UDP); } odp_packet_free_multi(pkt, num_pkt); @@ -2582,6 +2586,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_udp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV4); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_UDP); } odp_packet_free_multi(pkt, num_pkt); @@ -2612,6 +2620,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_tcp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); CU_ASSERT(!odp_packet_has_udp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV4); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_TCP); } odp_packet_free_multi(pkt, num_pkt); @@ -2643,6 +2655,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_udp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV6); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_UDP); } odp_packet_free_multi(pkt, num_pkt); @@ -2674,6 +2690,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_tcp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); CU_ASSERT(!odp_packet_has_udp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV6); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_TCP); } odp_packet_free_multi(pkt, num_pkt); commit 3c51188fd0b30fdddad377e485b856429a4f2bc8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 7 06:44:44 2018 +0300 linux-gen: packet: implement packet l3/l4 proto types Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 82001103..46b11cba 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2505,3 +2505,41 @@ int odp_packet_has_ref(odp_packet_t pkt) return 0; } + +odp_proto_l3_type_t odp_packet_l3_type(odp_packet_t pkt) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + if (pkt_hdr->p.input_flags.ipv4) + return ODP_PROTO_L3_TYPE_IPV4; + else if (pkt_hdr->p.input_flags.ipv6) + return ODP_PROTO_L3_TYPE_IPV6; + else if (pkt_hdr->p.input_flags.arp) + return ODP_PROTO_L3_TYPE_ARP; + + return ODP_PROTO_L3_TYPE_NONE; +} + +odp_proto_l4_type_t odp_packet_l4_type(odp_packet_t pkt) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + if (pkt_hdr->p.input_flags.tcp) + return ODP_PROTO_L4_TYPE_TCP; + else if (pkt_hdr->p.input_flags.udp) + return ODP_PROTO_L4_TYPE_UDP; + else if (pkt_hdr->p.input_flags.sctp) + return ODP_PROTO_L4_TYPE_SCTP; + else if (pkt_hdr->p.input_flags.ipsec_ah) + return ODP_PROTO_L4_TYPE_AH; + else if (pkt_hdr->p.input_flags.ipsec_esp) + return ODP_PROTO_L4_TYPE_ESP; + else if (pkt_hdr->p.input_flags.icmp && + pkt_hdr->p.input_flags.ipv4) + return ODP_PROTO_L4_TYPE_ICMPV4; + else if (pkt_hdr->p.input_flags.icmp && + pkt_hdr->p.input_flags.ipv6) + return ODP_PROTO_L4_TYPE_ICMPV6; + + return ODP_PROTO_L4_TYPE_NONE; +} ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_packet.c | 38 +++++++++++++++++++++++++++++++++++++ test/validation/api/packet/packet.c | 20 +++++++++++++++++++ 2 files changed, 58 insertions(+) hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-212-gd5419e88

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via d5419e8857b2bc61d3be17fe53f171550fee426b (commit) from 94665734b42bb11f98bf18205c4df7ad13c6f2a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: m4/odp_dpdk.m4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) hooks/post-receive --

7 years, 4 months

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-212-gd5419e88

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, next has been updated via d5419e8857b2bc61d3be17fe53f171550fee426b (commit) via 94665734b42bb11f98bf18205c4df7ad13c6f2a4 (commit) via c3af3011406a0b5a67c8dbf95b53ef94775d3014 (commit) via c1a00bb2a20b166a329dbd1158400fb27081c66c (commit) via 34dcdce23b1851f910aef53c4f17f3491f95183c (commit) via 7b98d4d5018461db83c3feef696b4470674844de (commit) via ff6fdd70a2b07bee11b708f5fd13350c5740de0e (commit) via b6ac02a13723c372501d21c56c9d73f506cafc3b (commit) via 40e4bafd9122e9531b0b6480b14f3d73d1d14e58 (commit) via ca9bf637fdadca1208fce921e836a58b40237c7b (commit) via e7823af35b340fed70ed5f423f7d04c7d5c62b38 (commit) via 9ee8609b86639606217d2f78c52f28e3fe08c782 (commit) via 569810c52a72c83aced5c5b8adf3eec40f371d90 (commit) via 6e213fbae7f16558e572da39704927f107c01f80 (commit) via cc453ca9fc04f370c3af28d4366c49d5f07bec32 (commit) via 448629199c4b50d5dd22be946b8c0d963479a3f3 (commit) via 1e47fa70c2eeb3d2f3805af28a00476c7284ef24 (commit) via 7599dfb05bf942eaad227462f1a58a78aac9e67d (commit) via c175ae14ed7122dce26e89a4fc464eba7208bb22 (commit) via ea529e1c3312459b6722c8a175d7f03ad0251a0a (commit) via 2f8d049cc5a33933165fdec19c1a8480cd71e984 (commit) via 6ea9400bfcc7497ea8f9d2fd8cc3b77936c71d0b (commit) via 18462171eb83f9b6f867812629f7e89998bc6e1a (commit) via c976a3146724bd0d09bcad2bd83810c300bf8ad5 (commit) via 9805209384a5f40210b5f57c1f7a67e83f07fb99 (commit) via 67b1d6ed0e5a318f6913f96f9d427df5799317e9 (commit) via 22866cc9df76230750b8ce5504d948ed78a727a2 (commit) via ab78f2924a353d4e0e45deea73201e6da10a7664 (commit) via 41b3fa2cd994a7ef68290a07dcde5564e4640847 (commit) via 9f288d8c4d6c2233a8fdf1a7bcd8f63f96157b73 (commit) via 533c57ac5562844636dd83b3b3f80cc007ccf91c (commit) via d3b7a09dbdceec170479760cacdc5898090c90de (commit) via 16702cb5bf170d0d32cfae690176d8da23b0ad64 (commit) via eed69e81f7830269012517691a276c4dac57d6cf (commit) via 0f0d381ce87519fb5451ff93c0f8c5d0d7d57748 (commit) via cf3aaa01b620da6f2bc25df23ad2c129d650ea43 (commit) via a0002111f4f41d8d292400257c2ccf2707659bb4 (commit) via 16c2b11d02f5c76ff2b5735b8387771a1c5094d4 (commit) via d905533519ffe68ec05d07d09f1f70d6d1b491a6 (commit) via 4fbb34a163a6b4aba4935e1fbd2d31b11c30198a (commit) via bde4740691276d71ef50653350a67823229bacc6 (commit) via f78fe4715f39df3aef59d13a1d2e31d62f4da9cc (commit) via 7f77562ed4969cb793fb38f0a174c89df41ca6e7 (commit) via 74ff9da52c9acee25e0aeae417e44d483f645e91 (commit) via 994e9549e9bf0b92c6a046685c9622e7f279b574 (commit) via dc5540a0ac7a0fb9f923abde540546628f6fb082 (commit) via d912f56b1d87560c0712310ca1978217ac9757c8 (commit) via addebaf68180c001973a9f43b157d202a309b394 (commit) via 96a0e78c553dabb933d9263bbc78ad05731545a3 (commit) via 06db20e7ea4d18bc9b7ae347625bfd284509ed85 (commit) via 6f07a40cc29b4b9ebc69a3badc31de7497ae6253 (commit) via 257b08b35ceea41bad5a7f1c626496cf111e657a (commit) via 27a7923236030fed0272cc9072f0cde62496e91d (commit) via bfa24c0b7f035a84dd30e161673e97df244a926f (commit) via 7f80bdf3a851c1b37e5826327ab5415ac5abe7a4 (commit) via f74f2facaa16b35618c220f5652dbdb295c527e1 (commit) via eeb098456bc51314cd6520d05f82f92353ba4a02 (commit) via 379d527e891e1ad246b0bb796e6fc938618758c4 (commit) via 637a332968967672395f1d41d809d0eba8d8dbd1 (commit) via 24847c049d1a3ead549f0ccb5c7da5fbdedaa794 (commit) via 70217ce609bd28e1982ec9caae2b4d91fca4074d (commit) via e2023d4f1767d2358c97bc4aab4b21086dba1421 (commit) via 72aa3ae9e181a90718b42da85561638cf7f3d480 (commit) via 5865787680be13b47b777e8b0b64646755be41e0 (commit) via c90cbf70a08d8d7124af226086e0525bcf4a9e50 (commit) via 70f5c00a0713856daae879ebe3652d44c5d783f2 (commit) via b72a57524cd02abc873c15a451c40e9cb2dd6ee5 (commit) via c0bf89cf3c36c7f0504e78fe6b337e50e7dc17d4 (commit) via 9c0c41b80fa0f7f7316115fd2228eec57dde5814 (commit) via 2596adf51485f1d996e1e084e6f63dbe68b582a3 (commit) via 545a65fc7064c13deda58fb86b1863365c318500 (commit) via 84c37a0fa947f1a81eef5aff225ecdf73ad3387c (commit) via b95ccd3db6eeb7358a877541747e06354429acdd (commit) via 9a46e749c6da2d4a4aef7337ab8247b0cd0c2be9 (commit) via 8e826373dcbe52eca0036deab60b4fb83917e237 (commit) via ae02d6ca65ef5f484258c8ce4d477a06151713b6 (commit) via 716b3335f9e3003dcb2d79404c91b21551c2077b (commit) via 01ec93bbfffe740b1a12213ac201c89dd9f2ef71 (commit) via 7c458a44a785ab664f2f92ed14845fa8ece6e0ec (commit) via bbdc120cdca0ceb37cb20baa6e85796733083221 (commit) via c3c110cb114012c22796eb96f17facb3c1f021b8 (commit) via fdae7a0f9b597289579463c5464877c307d9c318 (commit) via e98c15a9d2ee9d1dd21e3d6c3d9829581d8328c0 (commit) via 1f4a5f79557186df79c2091dcc73b6e783c95f74 (commit) via 6c4ecdb73aa869e4733b9b323d9dc4c625a63e58 (commit) via 6be7adab1a16a62e871bc4ed4f3c926645b2ecd0 (commit) via f7e4949e65f29f043115df1a171e0e49a4830ef6 (commit) via 984686b0763495c6dd97d2094f292fc7e01937d0 (commit) via e678e44fe99ada59b80097f97e22b0546bcdadc8 (commit) via 27480d82bd93a881ae683a3c314c11042a68ce29 (commit) via fbcf3e60c699c5f450fd6a4e7a5c78980b3512c5 (commit) via 4a6bae575eb67aa5a484d70d765f6283ea76c183 (commit) via b63e52ee345ae1d69435deded1391167d311bff3 (commit) via 9cb360c18f3948c14bb902351a0ace971479c336 (commit) via 99300f9db4c368e7519c52af93c93d702790b2b4 (commit) via 9ea61da809269644ac6332a1b0f53be68a7e26d7 (commit) via 91b127d61530bcf0e8c5399b3d4117ef2389ca12 (commit) via b122176ee59494dd957f0f5ff41d4b55a1477e13 (commit) via 22193a06524fa8dc43dfd106cf7eab46745b86f4 (commit) via 6582992616b1d95844d41ba93aeb0bb6c7dd6bd7 (commit) via 5911355121d94a192c9336b036cebb3734a78db2 (commit) via d48d55d846c3e711c2632a66db485f9079a768cf (commit) via 3c2b4804a2c3bca57febe2aea8a56b586c44f035 (commit) via a4767f0cbe844cd7f61f43557f0f90eaa2969192 (commit) via 7915f861ea56bbb0f5a0c22d93a7b4ff6b3c76e2 (commit) via 741bdb906e946d22194ab5676c9ea06e3debb2a1 (commit) via ac8b5f2a26edfa6249e134572a151dbd36c8dce6 (commit) via 89b0cbaa9cf4b8d6e93258f4dc2fd5084f3287b3 (commit) via f4e4b30454d6d961d0401717a11c6da06a889a7b (commit) via beb496bad99c91f639ea0aefaed7d4d30ec1368c (commit) via 3f069804f73c39e3bf98a998bbccd169f6c948f7 (commit) via 9836cf55fa6a5177f95fed5f10c01af0254303ce (commit) via a841f6b5448b4190230047dc7307f80ff77d01f5 (commit) via 3ce9d6ab16d064b0f83508e2f0b2e476d64b15e1 (commit) via d7ec85bbba32e9747307bd1cd76a061a39e7c731 (commit) via a001621520f769f835ce963d1e7ef8c1af74ad66 (commit) via 33afa2d1d4f6df342214dd9d9e4aab4433da3d7d (commit) via 29e5037571610ee49830dd64a43a47a8ccbadb87 (commit) via 988ae5930a9db1ceb88e46a84a116e67b0108307 (commit) via 5a4502fc6bc53e6503169da3028f456b64811a0b (commit) via ccb6eb85729ad0657b5c852cb2a6ddb519d60898 (commit) via f3b6be23045a924b8d8034a9a490b4fe5928684e (commit) via d4ad3409a51f94df403e0ae27e25baab2b0a1bf4 (commit) via 2bbecec83bc1d8ca1b45f98214d2dbbe13950e25 (commit) via db250be8b7363b24708ebc9476aa26fe1754d3c0 (commit) via 39730f7e46405a44abee01532547fed530c6f906 (commit) via 2c92ee7ef4198ba7b7ab67cf079c2262e70414d2 (commit) via d35f27a2c613e5fa66a6d854b662b435f0e4f402 (commit) via db2587a9a5ade3e9ad3f4e3355db2d4639e100b0 (commit) via 0f628d448a0055cfff6ea759790c60520bbff6b8 (commit) via 42e8e9ac8bf029fb94c4b0d79dba115ba7450958 (commit) via 8d3786410c269d5e9838bacb9dd0a4b0524824ef (commit) via be3696f3617fb05bf55347a724e422814b1be19b (commit) via e3f0ac3bb039d95af55176828539ebfd2697f932 (commit) via ffee6ee63f437bab54151da5f31d54385c3247af (commit) via 22e7c58bf12540c95168f079f6b39375c96f6e94 (commit) via aa698a07e99416663b9b829926efefde1c4e0abb (commit) via 34ba6c32491c9b18f78f49855d76c5e60555dd6e (commit) via 0c8009e48f6bcb254ba06a85e9226d1a0459a36e (commit) via d70c5f1ce3e98c3a7409312ccfdc3ce0087a2d49 (commit) via 47932d20fdf72f73e5de4961569fda760200edc6 (commit) via 585af294de9194f2e5e0bd53b4d5e12eba8ba1ba (commit) via 9fd7bf5ec2096b65248d9be983130396de1c32eb (commit) via 539b6fb552d171d202880c3f5ee6e7ca509db98a (commit) via faa8498d122fcce6321140d9f1c062ebc2bc3d79 (commit) via 94bcafaaccc3aba545cc112da8ff9fd828a25a98 (commit) via 84d5cf917d301d91246f013c3e51da35fa26b903 (commit) via 0689cde60fa90e5ddd24d07fec08ea95251d6db5 (commit) via a8ce5f13b5cbf1583fef04d687cef94d18357520 (commit) via e93535eed4262b76597c193a169fbc94fd91bb25 (commit) via b4b6cdaa390cef0e5a42e6c8fc0f605d7879bee5 (commit) via 96ad2312bfc2d1d0d1d23e61113da55d31b7fbc1 (commit) via 55f928652f0b6accc8ba82fc68eeaebb2fd1426d (commit) via 3c5a55ba323f36a255615983afdb21b17f8b1597 (commit) via 3dc3b1fbfb71b0c81e6ce047f48f51d4e13e81dc (commit) via 4cbcb2d11673fdde483753db67343018aa09e3ad (commit) via 14156f2feae2aa5a2835cf6ff0a3b4a2d7dae4df (commit) via 5399f2f78624599910c574e3c7247378118a8af4 (commit) via cd2dfa966f8c08c99feda2d0622ecc27c0361245 (commit) via f831c691a20ca2d0ffbbf707f43eee7600bca6b6 (commit) via e1883c9e050a5cc3ad838c02f943113f3b1e2383 (commit) via 627c9f51e2de51c3bb20f59161ac8ea1b6c2703f (commit) via edf998617f1744a9a92ed0ebb4905149f5731ed5 (commit) via bece10957f7d85107a71662e308dba8fc1d6c578 (commit) via 08d0c1658cd13bb174cc9c01f132bc98d004efa7 (commit) via 60feb6af342d581f798308563b975974986d9a3c (commit) via 503bc79ee960ea4caa72d639cbc5a42c7524a790 (commit) via cfeb9fa2519ede1f34e3a814079a62095f23e64e (commit) via bd9ab1c7a6ba3ecf4532e36b7d431a6c2df2c72b (commit) via 4d2c80472c0623b406f25c07fcca42849f41d847 (commit) via 3d10b69994b9a4629ae5858c4f13b8fc73137fc3 (commit) via 96874082fe02560068588af59817fa2152982638 (commit) via ad317cdf97c0f19d27bca380d06617937a0e548d (commit) via 7f1ea3704569c50a48f1029c0bd8f3f0bf84f43e (commit) via c99bed8f3a710d25d824cdcb1d109f974650906d (commit) via cd46d6263073efb18c69a621d9cc6c50da76359d (commit) via 3768a6331899a4b17dcd89ec82b0295fb1ef667a (commit) via 6a7c5313178504d4c0d211de231c52b795e26c5f (commit) via c9528e9576a391ee865f7efb3df5fb9a69602c40 (commit) via 77ff03881d844a9d6a4bc773086bd8aaecace541 (commit) via 53b114eac3815099760186f90b64a201d7fac69b (commit) via 1bb6291e4e9050d476fefb02f11024898847e2b7 (commit) via 5e064cd9fa626b8fe7cc6d695b5bbf5065e0e54e (commit) via e3cef11dd0161d49dddc09d8e6263722825953f7 (commit) via 520c170d758f2d37554631bf1467ec50e027cd3e (commit) via f73cd6de167b16bae0256fee65c77d11ee18699e (commit) via 1e2435a49ca5380143546f33aebc32e0b935bc54 (commit) via 2237981c5e20dd4efb2e181ad59785e6f9f099bb (commit) via 6c0942658b564835e200def502c053f63d55c400 (commit) via 4b06ab1aadb653958dd49b62899929e2720b5c9f (commit) via ea2c187b7ba3ca3b9e21624b139c871c2bd8f11c (commit) via fdcaa6d73a4c577ea92d69d95d851c1b2de86c61 (commit) via fac80a8a4b26b863a85266cd62fb07a5e2cd84e4 (commit) via 13171a0c3f83e905a99250fdfca925231dcaa7e2 (commit) via 4b5776e8e8bbec6340392af74b7ee7a18c191b52 (commit) via 76b9155ed01abcd3287b659d35b9217f77b81cc2 (commit) via d59a6b8a1b049ab3e978accbd420eb25993a5997 (commit) via 8609d2eba06d8e964daff5cb8ecb81bb802ea585 (commit) via cd793bfd9667e25db7cb1dbd9c276374e0ee879b (commit) via 09188114d855456920113c8d6889c5c1e2451d75 (commit) via 8296d0e9a91e2a435ec780052e22095563dfbf12 (commit) via d831814b8d0a1d7817f014aae91031dafd1ceeb6 (commit) via ee5d0385064f4bacb511cfd497abcd014930ffaa (commit) via 5d44e562a5c0c1252dbfd11b49c87084767da2e2 (commit) via 634b380b63de53c65b92c214d91aaf03785d69db (commit) via b1749baf2590f402ba3cbd23385b9056c99f3839 (commit) via a37fda78cb7c7d4804c0d9ae1c67801977ce1de5 (commit) via 0fe531c4ec9d49f562f91056eab29f81b98f63f6 (commit) via 8bd76909bea5d4d3a7917d00269a493628c96d5e (commit) via 4c23114ed39db175beaa317f63b782fad02b2c6f (commit) via 88fd84e7e613ce93fc078320b312d2aa8c388a8c (commit) via 2503425036ca2ee48003ef20fcb87003e5d1e956 (commit) from 49ebafae0edebbc750742d8874ad0a7588286dea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 29 +- .travis.yml | 235 ++++-- Makefile.inc | 18 + configure.ac | 179 +++-- doc/implementers-guide/Makefile.am | 6 +- doc/implementers-guide/implementers-guide.adoc | 2 +- doc/platform-api-guide/Makefile.am | 3 +- doc/process-guide/release-guide.adoc | 2 +- doc/users-guide/Makefile.am | 6 + example/Makefile.inc | 24 +- example/generator/Makefile.am | 5 + example/generator/generator_run.sh | 17 + example/generator/odp_generator.c | 332 ++++++--- example/ipfragreass/Makefile.am | 2 + example/ipfragreass/odp_ipfragreass.c | 4 +- example/ipsec/Makefile.am | 1 + example/ipsec/odp_ipsec_stream.c | 6 +- example/ipsec_api/.gitignore | 2 +- example/ipsec_api/Makefile.am | 30 +- ...sec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} | 2 +- ...c_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} | 2 +- ...ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} | 2 +- ..._tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} | 2 +- ...c_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} | 2 +- ...run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} | 2 +- ...p_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} | 2 +- ...tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} | 2 +- ...ipsec_run_live.sh => odp_ipsec_api_run_live.sh} | 2 +- ...c_run_router.sh => odp_ipsec_api_run_router.sh} | 2 +- ...c_run_simple.sh => odp_ipsec_api_run_simple.sh} | 2 +- example/l2fwd_simple/l2fwd_simple_run.sh | 13 + example/l2fwd_simple/odp_l2fwd_simple.c | 22 +- example/l3fwd/odp_l3fwd_db.h | 4 +- example/switch/odp_switch.c | 4 +- example/traffic_mgmt/odp_traffic_mgmt.c | 1 + helper/Makefile.am | 15 +- helper/cuckootable.c | 8 +- helper/include/odp/helper/ip.h | 4 +- helper/include/odp/helper/strong_types.h | 4 +- helper/iplookuptable.c | 4 +- helper/m4/configure.m4 | 11 +- helper/test/Makefile.am | 24 +- helper/test/linux/process.c | 2 + helper/test/linux/pthread.c | 2 + helper/threads.c | 1 + include/Makefile.am | 329 ++++++++- include/README | 79 ++ .../api => include/odp/api/abi-default}/align.h | 14 +- include/odp/api/abi-default/atomic.h | 70 ++ .../odp/api/abi-default/barrier.h | 4 +- .../default/api/abi => api/abi-default}/buffer.h | 2 +- .../odp/api/abi-default/byteorder.h | 41 +- .../api/abi => api/abi-default}/classification.h | 0 .../odp/api/abi-default/cpu.h | 10 +- .../odp/api/abi-default/cpumask.h | 9 +- .../default/api/abi => api/abi-default}/crypto.h | 0 include/odp/api/abi-default/debug.h | 35 + .../default/api/abi => api/abi-default}/event.h | 2 +- .../odp/api/abi-default/init.h | 6 +- .../odp/api/abi-default/ipsec.h | 12 +- .../default/api/abi => api/abi-default}/packet.h | 2 +- .../odp/api/abi-default/packet_flags.h | 11 +- .../odp/api/abi-default/packet_io.h | 19 +- .../default/api/abi => api/abi-default}/pool.h | 0 .../default/api/abi => api/abi-default}/queue.h | 0 .../odp/api/abi-default/rwlock.h | 11 +- .../odp/api/abi-default/rwlock_recursive.h | 10 +- .../odp/api/abi-default/schedule.h | 23 +- .../odp/api/abi-default}/schedule_types.h | 12 +- .../api/abi => api/abi-default}/shared_memory.h | 0 .../odp/api/abi-default/spinlock.h | 13 +- .../odp/api/abi-default/spinlock_recursive.h | 10 +- .../odp/api/abi-default/std_clib.h | 10 +- .../odp/api/abi-default}/std_types.h | 9 +- .../cpu.h => include/odp/api/abi-default/sync.h | 10 +- .../odp/api/abi-default/thread.h | 4 +- .../odp/api/abi-default/thrmask.h | 4 +- .../odp/api/abi-default/ticketlock.h | 11 +- .../odp/api/abi-default/time.h | 4 +- include/odp/api/abi-default/timer.h | 54 ++ .../odp/api/abi-default/traffic_mngr.h | 11 +- .../odp/api/abi-default/version.h | 4 +- .../odp/api/errno.h => include/odp/api/align.h | 11 +- .../odp/api/thread.h => include/odp/api/atomic.h | 10 +- .../include => include}/odp/api/barrier.h | 8 +- .../include => include}/odp/api/buffer.h | 18 +- .../api/compiler.h => include/odp/api/byteorder.h | 16 +- .../include => include}/odp/api/chksum.h | 12 +- include/odp/api/classification.h | 33 + .../include => include}/odp/api/cpu.h | 8 +- .../include => include}/odp/api/cpumask.h | 6 +- .../include => include}/odp/api/crypto.h | 12 +- .../odp/api/thread.h => include/odp/api/debug.h | 10 +- .../include => include}/odp/api/deprecated.h | 4 +- .../include => include}/odp/api/errno.h | 5 +- .../include => include}/odp/api/event.h | 14 +- .../include => include}/odp/api/feature.h | 12 +- .../include => include}/odp/api/hash.h | 12 +- .../include => include}/odp/api/hints.h | 12 +- .../include => include}/odp/api/init.h | 14 +- .../include => include}/odp/api/ipsec.h | 14 +- include/odp/api/packet.h | 33 + .../include => include}/odp/api/packet_flags.h | 9 +- .../include => include}/odp/api/packet_io.h | 14 +- .../include => include}/odp/api/packet_io_stats.h | 4 +- .../include => include}/odp/api/pool.h | 17 +- .../api/system_info.h => include/odp/api/queue.h | 13 +- .../include => include}/odp/api/random.h | 12 +- .../include => include}/odp/api/rwlock.h | 6 +- .../include => include}/odp/api/rwlock_recursive.h | 6 +- .../include => include}/odp/api/schedule.h | 15 +- .../include => include}/odp/api/schedule_types.h | 6 +- .../include => include}/odp/api/shared_memory.h | 14 +- include/odp/api/spec/align.h | 4 +- include/odp/api/spec/atomic.h | 4 +- include/odp/api/spec/barrier.h | 4 +- include/odp/api/spec/buffer.h | 4 +- include/odp/api/spec/byteorder.h | 4 +- include/odp/api/spec/chksum.h | 4 +- include/odp/api/spec/classification.h | 15 +- include/odp/api/spec/compiler.h | 53 -- include/odp/api/spec/cpu.h | 7 +- include/odp/api/spec/cpumask.h | 4 +- include/odp/api/spec/crypto.h | 4 +- include/odp/api/spec/debug.h | 4 +- include/odp/api/spec/deprecated.h.in | 4 +- include/odp/api/spec/errno.h | 4 +- include/odp/api/spec/event.h | 4 +- include/odp/api/spec/feature.h | 4 +- include/odp/api/spec/hash.h | 4 +- include/odp/api/spec/hints.h | 4 +- include/odp/api/spec/init.h | 37 +- include/odp/api/spec/ipsec.h | 4 +- include/odp/api/spec/packet.h | 4 +- include/odp/api/spec/packet_flags.h | 4 +- include/odp/api/spec/packet_io.h | 4 +- include/odp/api/spec/packet_io_stats.h | 4 +- include/odp/api/spec/pool.h | 4 +- include/odp/api/spec/queue.h | 9 +- include/odp/api/spec/random.h | 4 +- include/odp/api/spec/rwlock.h | 4 +- include/odp/api/spec/rwlock_recursive.h | 4 +- include/odp/api/spec/schedule.h | 24 +- include/odp/api/spec/schedule_types.h | 14 +- include/odp/api/spec/shared_memory.h | 4 +- include/odp/api/spec/spinlock.h | 4 +- include/odp/api/spec/spinlock_recursive.h | 4 +- include/odp/api/spec/std_clib.h | 4 +- include/odp/api/spec/std_types.h | 4 +- include/odp/api/spec/support.h | 4 +- include/odp/api/spec/sync.h | 4 +- include/odp/api/spec/system_info.h | 4 +- include/odp/api/spec/thread.h | 32 +- include/odp/api/spec/thread_types.h | 59 ++ include/odp/api/spec/threshold.h | 5 +- include/odp/api/spec/thrmask.h | 4 +- include/odp/api/spec/ticketlock.h | 4 +- include/odp/api/spec/time.h | 4 +- include/odp/api/spec/timer.h | 4 +- include/odp/api/spec/traffic_mngr.h | 4 +- include/odp/api/spec/version.h.in | 4 +- .../include => include}/odp/api/spinlock.h | 6 +- .../odp/api/spinlock_recursive.h | 6 +- .../include => include}/odp/api/std_clib.h | 13 +- .../include => include}/odp/api/std_types.h | 19 +- .../include => include}/odp/api/support.h | 12 +- .../odp/api/thread.h => include/odp/api/sync.h | 10 +- .../include => include}/odp/api/system_info.h | 5 +- .../include => include}/odp/api/thread.h | 8 +- .../include => include}/odp/api/threshold.h | 12 +- .../include => include}/odp/api/thrmask.h | 14 +- .../include => include}/odp/api/ticketlock.h | 10 +- .../include => include}/odp/api/time.h | 8 +- .../include => include}/odp/api/timer.h | 20 +- .../include => include}/odp/api/traffic_mngr.h | 13 +- .../include => include}/odp/api/version.h | 7 +- .../arm32-linux/odp/api/abi/{pool.h => align.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => atomic.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => barrier.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/buffer.h | 2 +- .../odp/api/abi/{pool.h => byteorder.h} | 2 +- .../arch/arm32-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/cpu.h | 6 +- .../arm32-linux/odp/api/abi/{pool.h => cpumask.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/crypto.h | 2 +- .../arm32-linux/odp/api/abi/{pool.h => debug.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/event.h | 2 +- .../arm32-linux/odp/api/abi/{pool.h => init.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => ipsec.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/packet.h | 2 +- .../odp/api/abi/{packet.h => packet_flags.h} | 2 +- .../odp/api/abi/{pool.h => packet_io.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/queue.h | 2 +- .../arm32-linux/odp/api/abi/{pool.h => rwlock.h} | 2 +- .../odp/api/abi/{packet.h => rwlock_recursive.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => schedule.h} | 2 +- .../odp/api/abi/{packet.h => schedule_types.h} | 2 +- .../arch/arm32-linux/odp/api/abi/shared_memory.h | 2 +- .../arm32-linux/odp/api/abi/{pool.h => spinlock.h} | 2 +- .../odp/api/abi/{packet.h => spinlock_recursive.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => std_clib.h} | 2 +- .../odp/api/abi/{pool.h => std_types.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => sync.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => thread.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => thrmask.h} | 2 +- .../odp/api/abi/{pool.h => ticketlock.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => time.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => timer.h} | 2 +- .../odp/api/abi/{packet.h => traffic_mngr.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => version.h} | 2 +- .../abi/pool.h => arm64-linux/odp/api/abi/align.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/atomic.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/barrier.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/buffer.h | 2 +- .../pool.h => arm64-linux/odp/api/abi/byteorder.h} | 2 +- .../arch/arm64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/cpu.h | 6 +- .../pool.h => arm64-linux/odp/api/abi/cpumask.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/crypto.h | 2 +- .../abi/pool.h => arm64-linux/odp/api/abi/debug.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/event.h | 2 +- .../abi/pool.h => arm64-linux/odp/api/abi/init.h} | 2 +- .../abi/pool.h => arm64-linux/odp/api/abi/ipsec.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/packet_io.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/queue.h | 2 +- .../pool.h => arm64-linux/odp/api/abi/rwlock.h} | 2 +- .../odp/api/abi/rwlock_recursive.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/schedule.h} | 2 +- .../odp/api/abi/schedule_types.h} | 2 +- .../arch/arm64-linux/odp/api/abi/shared_memory.h | 2 +- .../pool.h => arm64-linux/odp/api/abi/spinlock.h} | 2 +- .../odp/api/abi/spinlock_recursive.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/std_clib.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/std_types.h} | 2 +- .../abi/pool.h => arm64-linux/odp/api/abi/sync.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/thread.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/thrmask.h} | 2 +- .../odp/api/abi/ticketlock.h} | 2 +- .../abi/pool.h => arm64-linux/odp/api/abi/time.h} | 2 +- .../abi/pool.h => arm64-linux/odp/api/abi/timer.h} | 2 +- .../odp/api/abi/traffic_mngr.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/version.h} | 2 +- include/odp/arch/default-linux/odp/api/abi/align.h | 7 + .../odp/arch/default-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/default-linux/odp/api/abi/barrier.h | 7 + .../odp/arch/default-linux/odp/api/abi/buffer.h | 7 + .../odp/arch/default-linux/odp/api/abi/byteorder.h | 7 + .../default-linux/odp/api/abi/classification.h | 7 + .../odp/arch/default-linux/odp/api/abi/cpu.h | 8 +- .../odp/arch/default-linux/odp/api/abi/cpumask.h | 7 + .../odp/arch/default-linux/odp/api/abi/crypto.h | 7 + include/odp/arch/default-linux/odp/api/abi/debug.h | 7 + include/odp/arch/default-linux/odp/api/abi/event.h | 7 + include/odp/arch/default-linux/odp/api/abi/init.h | 7 + include/odp/arch/default-linux/odp/api/abi/ipsec.h | 7 + .../odp/arch/default-linux/odp/api/abi/packet.h | 7 + .../arch/default-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/default-linux/odp/api/abi/packet_io.h | 7 + include/odp/arch/default-linux/odp/api/abi/pool.h | 7 + include/odp/arch/default-linux/odp/api/abi/queue.h | 7 + .../odp/arch/default-linux/odp/api/abi/rwlock.h | 7 + .../default-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/default-linux/odp/api/abi/schedule.h | 7 + .../default-linux/odp/api/abi/schedule_types.h | 7 + .../arch/default-linux/odp/api/abi/shared_memory.h | 7 + .../odp/arch/default-linux/odp/api/abi/spinlock.h | 7 + .../default-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/default-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/default-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/default-linux/odp/api/abi/sync.h | 7 + .../odp/arch/default-linux/odp/api/abi/thread.h | 7 + .../odp/arch/default-linux/odp/api/abi/thrmask.h | 7 + .../arch/default-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/default-linux/odp/api/abi/time.h | 7 + include/odp/arch/default-linux/odp/api/abi/timer.h | 7 + .../arch/default-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/default-linux/odp/api/abi/version.h | 7 + .../pool.h => mips64-linux/odp/api/abi/align.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/atomic.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/barrier.h} | 2 +- include/odp/arch/mips64-linux/odp/api/abi/buffer.h | 2 +- .../odp/api/abi/byteorder.h} | 2 +- .../arch/mips64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/cpu.h | 8 +- .../pool.h => mips64-linux/odp/api/abi/cpumask.h} | 2 +- include/odp/arch/mips64-linux/odp/api/abi/crypto.h | 2 +- .../pool.h => mips64-linux/odp/api/abi/debug.h} | 2 +- include/odp/arch/mips64-linux/odp/api/abi/event.h | 2 +- .../abi/pool.h => mips64-linux/odp/api/abi/init.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/ipsec.h} | 2 +- include/odp/arch/mips64-linux/odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h} | 2 +- .../odp/api/abi/packet_io.h} | 2 +- include/odp/arch/mips64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/queue.h | 2 +- .../pool.h => mips64-linux/odp/api/abi/rwlock.h} | 2 +- .../odp/api/abi/rwlock_recursive.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/schedule.h} | 2 +- .../odp/api/abi/schedule_types.h} | 2 +- .../arch/mips64-linux/odp/api/abi/shared_memory.h | 2 +- .../pool.h => mips64-linux/odp/api/abi/spinlock.h} | 2 +- .../odp/api/abi/spinlock_recursive.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/std_clib.h} | 2 +- .../odp/api/abi/std_types.h} | 2 +- .../abi/pool.h => mips64-linux/odp/api/abi/sync.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/thread.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/thrmask.h} | 2 +- .../odp/api/abi/ticketlock.h} | 2 +- .../abi/pool.h => mips64-linux/odp/api/abi/time.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/timer.h} | 2 +- .../odp/api/abi/traffic_mngr.h} | 2 +- .../pool.h => mips64-linux/odp/api/abi/version.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/align.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/atomic.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/barrier.h} | 2 +- .../odp/arch/power64-linux/odp/api/abi/buffer.h | 2 +- .../odp/api/abi/byteorder.h} | 2 +- .../power64-linux/odp/api/abi/classification.h | 2 +- .../odp/api/abi/cpu.h} | 3 +- .../pool.h => power64-linux/odp/api/abi/cpumask.h} | 2 +- .../odp/arch/power64-linux/odp/api/abi/crypto.h | 2 +- .../pool.h => power64-linux/odp/api/abi/debug.h} | 2 +- include/odp/arch/power64-linux/odp/api/abi/event.h | 2 +- .../pool.h => power64-linux/odp/api/abi/init.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/ipsec.h} | 2 +- .../odp/arch/power64-linux/odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h} | 2 +- .../odp/api/abi/packet_io.h} | 2 +- include/odp/arch/power64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/queue.h | 2 +- .../pool.h => power64-linux/odp/api/abi/rwlock.h} | 2 +- .../odp/api/abi/rwlock_recursive.h} | 2 +- .../odp/api/abi/schedule.h} | 2 +- .../odp/api/abi/schedule_types.h} | 2 +- .../arch/power64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/api/abi/spinlock.h} | 2 +- .../odp/api/abi/spinlock_recursive.h} | 2 +- .../odp/api/abi/std_clib.h} | 2 +- .../odp/api/abi/std_types.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/sync.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/thread.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/thrmask.h} | 2 +- .../odp/api/abi/ticketlock.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/time.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/timer.h} | 2 +- .../odp/api/abi/traffic_mngr.h} | 2 +- .../pool.h => power64-linux/odp/api/abi/version.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/align.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/atomic.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/barrier.h} | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/buffer.h | 2 +- .../odp/api/abi/byteorder.h} | 2 +- .../arch/x86_32-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/cpu.h | 6 +- .../pool.h => x86_32-linux/odp/api/abi/cpumask.h} | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/crypto.h | 2 +- .../pool.h => x86_32-linux/odp/api/abi/debug.h} | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/event.h | 2 +- .../abi/pool.h => x86_32-linux/odp/api/abi/init.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/ipsec.h} | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h} | 2 +- .../odp/api/abi/packet_io.h} | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/queue.h | 2 +- .../pool.h => x86_32-linux/odp/api/abi/rwlock.h} | 2 +- .../odp/api/abi/rwlock_recursive.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/schedule.h} | 2 +- .../odp/api/abi/schedule_types.h} | 2 +- .../arch/x86_32-linux/odp/api/abi/shared_memory.h | 2 +- .../pool.h => x86_32-linux/odp/api/abi/spinlock.h} | 2 +- .../odp/api/abi/spinlock_recursive.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/std_clib.h} | 2 +- .../odp/api/abi/std_types.h} | 2 +- .../abi/pool.h => x86_32-linux/odp/api/abi/sync.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/thread.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/thrmask.h} | 2 +- .../odp/api/abi/ticketlock.h} | 2 +- .../abi/pool.h => x86_32-linux/odp/api/abi/time.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/timer.h} | 2 +- .../odp/api/abi/traffic_mngr.h} | 2 +- .../pool.h => x86_32-linux/odp/api/abi/version.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/align.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/atomic.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/barrier.h} | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/buffer.h | 2 +- .../odp/api/abi/byteorder.h} | 2 +- .../arch/x86_64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/cpu.h | 7 +- .../pool.h => x86_64-linux/odp/api/abi/cpumask.h} | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/crypto.h | 2 +- .../pool.h => x86_64-linux/odp/api/abi/debug.h} | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/event.h | 2 +- .../abi/pool.h => x86_64-linux/odp/api/abi/init.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/ipsec.h} | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h} | 2 +- .../odp/api/abi/packet_io.h} | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/queue.h | 2 +- .../pool.h => x86_64-linux/odp/api/abi/rwlock.h} | 2 +- .../odp/api/abi/rwlock_recursive.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/schedule.h} | 2 +- .../odp/api/abi/schedule_types.h} | 2 +- .../arch/x86_64-linux/odp/api/abi/shared_memory.h | 2 +- .../pool.h => x86_64-linux/odp/api/abi/spinlock.h} | 2 +- .../odp/api/abi/spinlock_recursive.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/std_clib.h} | 2 +- .../odp/api/abi/std_types.h} | 2 +- .../abi/pool.h => x86_64-linux/odp/api/abi/sync.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/thread.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/thrmask.h} | 2 +- .../odp/api/abi/ticketlock.h} | 2 +- .../abi/pool.h => x86_64-linux/odp/api/abi/time.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/timer.h} | 2 +- .../odp/api/abi/traffic_mngr.h} | 2 +- .../pool.h => x86_64-linux/odp/api/abi/version.h} | 2 +- .../include => include}/odp/visibility_begin.h | 0 .../include => include}/odp/visibility_end.h | 0 include/odp_api.h | 1 - m4/odp_check_flag.m4 | 26 + m4/odp_dpdk.m4 | 95 ++- m4/odp_pthread.m4 | 7 + platform/Makefile.inc | 10 +- platform/linux-generic/.gitignore | 1 - platform/linux-generic/Makefile.am | 204 +++--- platform/linux-generic/_ishm.c | 16 +- .../api/cpu_arch.h => aarch64/odp/api/abi/cpu.h} | 6 +- .../arch/arm/odp/api/{cpu_arch.h => abi/cpu.h} | 6 +- .../api/cpu_arch.h => default/odp/api/abi/cpu.h} | 8 +- .../arch/mips64/odp/api/{cpu_arch.h => abi/cpu.h} | 6 +- .../linux-generic/arch/powerpc/odp/api/abi/cpu.h | 3 +- platform/linux-generic/arch/x86/cpu_flags.c | 2 +- .../arch/x86/odp/api/{cpu_arch.h => abi/cpu.h} | 6 +- .../linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +- .../linux-generic/include-abi/odp/api/abi/align.h | 2 +- .../linux-generic/include-abi/odp/api/abi/atomic.h | 76 ++ .../odp/api/abi/barrier.h} | 4 +- .../odp/api/abi/buffer.h} | 13 +- .../odp/api/abi/byteorder.h} | 16 +- .../odp/api/abi/classification.h} | 11 +- .../include-abi/odp/api/abi/cpumask.h | 2 +- .../odp/api/abi/crypto.h} | 11 +- .../odp/api => include-abi/odp/api/abi}/debug.h | 21 +- .../odp/api/abi/event.h} | 14 +- .../linux-generic/include-abi/odp/api/abi/init.h | 2 +- .../odp/api/abi/ipsec.h} | 4 +- .../linux-generic/include-abi/odp/api/abi/packet.h | 71 ++ .../include-abi/odp/api/abi/packet_flags.h | 27 + .../odp/api/abi/packet_io.h} | 14 +- .../odp/api/abi/pool.h} | 26 +- .../odp/api/abi/queue.h} | 11 +- .../linux-generic/include-abi/odp/api/abi/rwlock.h | 2 +- .../include-abi/odp/api/abi/rwlock_recursive.h | 2 +- .../include-abi/odp/api/abi/schedule.h | 2 +- .../include-abi/odp/api/abi/schedule_types.h | 2 +- .../odp/api/abi/shared_memory.h} | 11 +- .../include-abi/odp/api/abi/spinlock.h | 2 +- .../include-abi/odp/api/abi/spinlock_recursive.h | 2 +- .../cpu.h => include-abi/odp/api/abi/std_clib.h} | 11 +- .../include-abi/odp/api/abi/std_types.h | 2 +- .../api/event.h => include-abi/odp/api/abi/sync.h} | 15 +- .../linux-generic/include-abi/odp/api/abi/thread.h | 11 + .../include-abi/odp/api/abi/thrmask.h | 2 +- .../odp/api/abi/ticketlock.h} | 22 +- .../linux-generic/include-abi/odp/api/abi/time.h | 2 +- .../odp/api/abi/timer.h} | 4 +- .../include-abi/odp/api/abi/traffic_mngr.h | 2 +- .../include-abi/odp/api/abi/version.h | 2 +- platform/linux-generic/include/odp/api/atomic.h | 42 -- platform/linux-generic/include/odp/api/byteorder.h | 43 -- .../linux-generic/include/odp/api/classification.h | 46 -- platform/linux-generic/include/odp/api/packet.h | 38 - .../include/odp/api/plat/atomic_inlines.h | 315 ++++---- .../include/odp/api/plat/atomic_types.h | 88 --- .../include/odp/api/plat/byteorder_inlines.h | 46 +- .../include/odp/api/plat/byteorder_inlines_api.h | 88 +++ .../include/odp/api/plat/packet_flag_inlines.h | 24 +- .../plat/{packet_types.h => packet_inline_types.h} | 54 +- .../include/odp/api/plat/packet_inlines.h | 140 ++-- .../include/odp/api/plat/packet_inlines_api.h | 38 + .../include/odp/api/plat/pktio_inlines.h | 27 + .../include/odp/api/plat/pktio_inlines_api.h | 31 + .../include/odp/api/plat/pool_inline_types.h | 37 + .../include/odp/api/plat/static_inline.h.in | 43 -- .../include/odp/api/plat/std_clib_inlines.h | 1 - .../include/odp/api/plat/strong_types.h | 6 +- .../include/odp/api/plat/thread_inlines.h | 46 ++ .../include/odp/api/plat/thread_inlines_api.h | 41 ++ .../include/odp/api/plat/ticketlock_inlines.h | 20 - .../include/odp/api/plat/ticketlock_inlines_api.h | 6 + platform/linux-generic/include/odp/api/queue.h | 44 -- platform/linux-generic/include/odp/api/sync.h | 39 - .../linux-generic/include/odp_atomic_internal.h | 217 ++++-- .../linux-generic/include/odp_bitmap_internal.h | 4 +- .../linux-generic/include/odp_buffer_internal.h | 4 +- .../include/odp_classification_inlines.h | 30 +- .../linux-generic/include/odp_crypto_internal.h | 73 -- platform/linux-generic/include/odp_internal.h | 6 +- .../linux-generic/include/odp_ipsec_internal.h | 6 +- .../linux-generic/include/odp_macros_internal.h | 54 ++ platform/linux-generic/include/odp_packet_dpdk.h | 14 +- .../linux-generic/include/odp_packet_internal.h | 31 +- .../linux-generic/include/odp_packet_io_internal.h | 42 +- .../include/odp_packet_io_ring_internal.h | 10 +- platform/linux-generic/include/odp_packet_netmap.h | 5 +- platform/linux-generic/include/odp_packet_null.h | 16 + platform/linux-generic/include/odp_packet_socket.h | 7 +- platform/linux-generic/include/odp_pool_internal.h | 10 +- .../linux-generic/include/odp_queue_internal.h | 5 +- .../include/odp_queue_scalable_internal.h | 5 +- platform/linux-generic/include/odp_ring_internal.h | 4 +- .../linux-generic/include/odp_schedule_scalable.h | 24 +- .../include/odp_schedule_scalable_ordered.h | 8 +- .../include/odp_traffic_mngr_internal.h | 3 - platform/linux-generic/include/protocols/ip.h | 4 +- platform/linux-generic/include/protocols/thash.h | 8 +- platform/linux-generic/libodp-linux.pc.in | 4 +- platform/linux-generic/m4/configure.m4 | 3 +- platform/linux-generic/m4/odp_dpdk.m4 | 28 +- platform/linux-generic/m4/odp_pthread.m4 | 8 - platform/linux-generic/odp_atomic.c | 3 - platform/linux-generic/odp_atomic_api.c | 13 + platform/linux-generic/odp_byteorder.c | 6 +- platform/linux-generic/odp_classification.c | 79 +- platform/linux-generic/odp_crypto.c | 369 +++++++--- platform/linux-generic/odp_init.c | 15 +- platform/linux-generic/odp_ipsec.c | 82 ++- platform/linux-generic/odp_ipsec_sad.c | 45 +- platform/linux-generic/odp_name_table.c | 23 +- platform/linux-generic/odp_packet.c | 326 ++++----- platform/linux-generic/odp_packet_api.c | 28 + platform/linux-generic/odp_packet_flags.c | 27 +- platform/linux-generic/odp_packet_flags_api.c | 15 + platform/linux-generic/odp_packet_io.c | 93 ++- platform/linux-generic/odp_pkt_queue.c | 17 +- platform/linux-generic/odp_pktio_api.c | 14 + platform/linux-generic/odp_pool.c | 3 +- platform/linux-generic/odp_queue_scalable.c | 1 + platform/linux-generic/odp_rwlock_recursive.c | 11 +- platform/linux-generic/odp_schedule.c | 18 +- platform/linux-generic/odp_schedule_iquery.c | 14 +- platform/linux-generic/odp_schedule_sp.c | 12 +- platform/linux-generic/odp_shared_memory.c | 3 +- platform/linux-generic/odp_spinlock_recursive.c | 7 +- platform/linux-generic/odp_std_clib.c | 5 +- platform/linux-generic/odp_sync.c | 5 +- platform/linux-generic/odp_thread.c | 36 +- platform/linux-generic/odp_thread_api.c | 15 + platform/linux-generic/odp_ticketlock.c | 12 +- platform/linux-generic/odp_timer.c | 12 +- platform/linux-generic/odp_timer_wheel.c | 3 +- platform/linux-generic/odp_traffic_mngr.c | 52 +- platform/linux-generic/pktio/dpdk.c | 64 +- platform/linux-generic/pktio/io_ops.c | 1 + platform/linux-generic/pktio/ipc.c | 38 +- platform/linux-generic/pktio/loop.c | 52 +- platform/linux-generic/pktio/netmap.c | 148 +++- platform/linux-generic/pktio/null.c | 175 +++++ platform/linux-generic/pktio/pcap.c | 15 +- platform/linux-generic/pktio/pktio_common.c | 125 ++++ platform/linux-generic/pktio/socket.c | 115 ++- platform/linux-generic/pktio/socket_mmap.c | 255 +++++-- platform/linux-generic/pktio/tap.c | 19 +- platform/linux-generic/test/.gitignore | 3 +- platform/linux-generic/test/Makefile.am | 3 +- platform/linux-generic/test/Makefile.inc | 22 - platform/linux-generic/test/ring/Makefile.am | 33 +- .../linux-generic/test/validation/Makefile.inc | 1 - .../linux-generic/test/validation/api/Makefile.inc | 2 +- .../test/validation/api/shmem/Makefile.am | 9 +- scripts/Dockerfile | 1 + scripts/checkpatch.pl | 1 + scripts/shippable-post.sh | 9 + test/Makefile.inc | 45 +- test/common/odp_cunit_common.c | 52 +- test/common/odp_cunit_common.h | 12 +- test/common/test_packet_parser.h | 342 ++++++++- test/performance/odp_crypto.c | 73 +- test/performance/odp_l2fwd.c | 54 +- test/performance/odp_pktio_ordered.c | 4 +- test/performance/odp_sched_latency.c | 4 +- test/performance/odp_scheduling.c | 4 +- test/validation/api/Makefile.am | 2 +- test/validation/api/Makefile.inc | 12 +- test/validation/api/atomic/Makefile.am | 1 - test/validation/api/barrier/Makefile.am | 1 - test/validation/api/buffer/Makefile.am | 1 - test/validation/api/chksum/Makefile.am | 1 - test/validation/api/chksum/chksum.c | 6 +- test/validation/api/classification/Makefile.am | 1 - .../validation/api/classification/classification.c | 20 +- .../api/classification/odp_classification_basic.c | 4 + test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 1 - test/validation/api/crypto/odp_crypto_test_inp.c | 730 +++++++++---------- test/validation/api/crypto/test_vectors.h | 251 ++++++- test/validation/api/crypto/test_vectors_len.h | 6 +- test/validation/api/errno/Makefile.am | 1 - test/validation/api/event/Makefile.am | 1 - test/validation/api/hash/Makefile.am | 1 - test/validation/api/init/Makefile.am | 3 - test/validation/api/ipsec/Makefile.am | 5 +- test/validation/api/ipsec/ipsec.c | 4 +- test/validation/api/lock/Makefile.am | 1 - test/validation/api/packet/Makefile.am | 1 - test/validation/api/packet/packet.c | 801 ++++++++++++++++++--- test/validation/api/packet/packet.h | 1 - test/validation/api/pktio/Makefile.am | 1 - test/validation/api/pktio/pktio.c | 4 +- test/validation/api/pool/Makefile.am | 1 - test/validation/api/pool/pool.c | 4 +- test/validation/api/queue/Makefile.am | 1 - test/validation/api/random/Makefile.am | 1 - test/validation/api/scheduler/Makefile.am | 1 - test/validation/api/scheduler/scheduler.c | 71 ++ test/validation/api/shmem/Makefile.am | 1 - test/validation/api/shmem/shmem.c | 56 +- test/validation/api/std_clib/Makefile.am | 1 - test/validation/api/system/Makefile.am | 1 - test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 11 - test/validation/api/time/time.c | 18 +- test/validation/api/time/time.sh | 42 -- test/validation/api/timer/Makefile.am | 1 - test/validation/api/traffic_mngr/Makefile.am | 2 +- test/validation/api/traffic_mngr/traffic_mngr.sh | 4 +- 631 files changed, 7354 insertions(+), 4057 deletions(-) create mode 100644 Makefile.inc create mode 100755 example/generator/generator_run.sh rename example/ipsec_api/{odp_ipsec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_live.sh => odp_ipsec_api_run_live.sh} (94%) rename example/ipsec_api/{odp_ipsec_run_router.sh => odp_ipsec_api_run_router.sh} (85%) rename example/ipsec_api/{odp_ipsec_run_simple.sh => odp_ipsec_api_run_simple.sh} (87%) create mode 100644 include/README rename {platform/linux-generic/include/odp/api => include/odp/api/abi-default}/align.h (73%) create mode 100644 include/odp/api/abi-default/atomic.h copy platform/linux-generic/include/odp/api/plat/barrier_types.h => include/odp/api/abi-default/barrier.h (89%) rename include/odp/{arch/default/api/abi => api/abi-default}/buffer.h (90%) copy platform/linux-generic/include/odp/api/plat/byteorder_types.h => include/odp/api/abi-default/byteorder.h (53%) rename include/odp/{arch/default/api/abi => api/abi-default}/classification.h (100%) copy platform/linux-generic/arch/default/odp/api/cpu_arch.h => include/odp/api/abi-default/cpu.h (60%) rename platform/linux-generic/include/odp/api/plat/cpumask_types.h => include/odp/api/abi-default/cpumask.h (85%) rename include/odp/{arch/default/api/abi => api/abi-default}/crypto.h (100%) create mode 100644 include/odp/api/abi-default/debug.h rename include/odp/{arch/default/api/abi => api/abi-default}/event.h (94%) rename platform/linux-generic/include/odp/api/plat/init_types.h => include/odp/api/abi-default/init.h (79%) copy platform/linux-generic/include/odp/api/plat/ipsec_types.h => include/odp/api/abi-default/ipsec.h (55%) rename include/odp/{arch/default/api/abi => api/abi-default}/packet.h (93%) copy platform/linux-generic/include/odp/api/errno.h => include/odp/api/abi-default/packet_flags.h (53%) copy platform/linux-generic/include/odp/api/plat/packet_io_types.h => include/odp/api/abi-default/packet_io.h (71%) rename include/odp/{arch/default/api/abi => api/abi-default}/pool.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/queue.h (100%) rename platform/linux-generic/include/odp/api/plat/rwlock_types.h => include/odp/api/abi-default/rwlock.h (75%) rename platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h => include/odp/api/abi-default/rwlock_recursive.h (77%) copy platform/linux-generic/include/odp/api/plat/spinlock_types.h => include/odp/api/abi-default/schedule.h (51%) rename {platform/linux-generic/include/odp/api/plat => include/odp/api/abi-default}/schedule_types.h (81%) rename include/odp/{arch/default/api/abi => api/abi-default}/shared_memory.h (100%) rename platform/linux-generic/include/odp/api/plat/spinlock_types.h => include/odp/api/abi-default/spinlock.h (64%) rename platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h => include/odp/api/abi-default/spinlock_recursive.h (71%) copy platform/linux-generic/include/odp/api/cpu.h => include/odp/api/abi-default/std_clib.h (63%) copy {platform/linux-generic/include/odp/api => include/odp/api/abi-default}/std_types.h (82%) copy platform/linux-generic/include/odp/api/cpu.h => include/odp/api/abi-default/sync.h (63%) rename platform/linux-generic/include/odp/api/plat/thread_types.h => include/odp/api/abi-default/thread.h (84%) rename platform/linux-generic/include/odp/api/plat/thrmask_types.h => include/odp/api/abi-default/thrmask.h (91%) copy platform/linux-generic/include/odp/api/plat/ticketlock_types.h => include/odp/api/abi-default/ticketlock.h (72%) rename platform/linux-generic/include/odp/api/plat/time_types.h => include/odp/api/abi-default/time.h (93%) create mode 100644 include/odp/api/abi-default/timer.h rename platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h => include/odp/api/abi-default/traffic_mngr.h (95%) rename platform/linux-generic/include/odp/api/plat/version_types.h => include/odp/api/abi-default/version.h (91%) copy platform/linux-generic/include/odp/api/errno.h => include/odp/api/align.h (50%) copy platform/linux-generic/include/odp/api/thread.h => include/odp/api/atomic.h (59%) rename {platform/linux-generic/include => include}/odp/api/barrier.h (70%) rename {platform/linux-generic/include => include}/odp/api/buffer.h (58%) rename platform/linux-generic/include/odp/api/compiler.h => include/odp/api/byteorder.h (55%) rename {platform/linux-generic/include => include}/odp/api/chksum.h (72%) create mode 100644 include/odp/api/classification.h copy {platform/linux-generic/include => include}/odp/api/cpu.h (62%) rename {platform/linux-generic/include => include}/odp/api/cpumask.h (74%) rename {platform/linux-generic/include => include}/odp/api/crypto.h (64%) copy platform/linux-generic/include/odp/api/thread.h => include/odp/api/debug.h (59%) rename {platform/linux-generic/include => include}/odp/api/deprecated.h (82%) rename {platform/linux-generic/include => include}/odp/api/errno.h (83%) copy {platform/linux-generic/include => include}/odp/api/event.h (65%) rename {platform/linux-generic/include => include}/odp/api/feature.h (71%) rename {platform/linux-generic/include => include}/odp/api/hash.h (72%) rename {platform/linux-generic/include => include}/odp/api/hints.h (70%) rename {platform/linux-generic/include => include}/odp/api/init.h (64%) rename {platform/linux-generic/include => include}/odp/api/ipsec.h (67%) create mode 100644 include/odp/api/packet.h rename {platform/linux-generic/include => include}/odp/api/packet_flags.h (59%) rename {platform/linux-generic/include => include}/odp/api/packet_io.h (57%) rename {platform/linux-generic/include => include}/odp/api/packet_io_stats.h (79%) rename {platform/linux-generic/include => include}/odp/api/pool.h (53%) copy platform/linux-generic/include/odp/api/system_info.h => include/odp/api/queue.h (52%) rename {platform/linux-generic/include => include}/odp/api/random.h (70%) rename {platform/linux-generic/include => include}/odp/api/rwlock.h (75%) rename {platform/linux-generic/include => include}/odp/api/rwlock_recursive.h (70%) rename {platform/linux-generic/include => include}/odp/api/schedule.h (63%) rename {platform/linux-generic/include => include}/odp/api/schedule_types.h (71%) rename {platform/linux-generic/include => include}/odp/api/shared_memory.h (62%) delete mode 100644 include/odp/api/spec/compiler.h create mode 100644 include/odp/api/spec/thread_types.h rename {platform/linux-generic/include => include}/odp/api/spinlock.h (72%) rename {platform/linux-generic/include => include}/odp/api/spinlock_recursive.h (68%) rename {platform/linux-generic/include => include}/odp/api/std_clib.h (50%) rename {platform/linux-generic/include => include}/odp/api/std_types.h (54%) rename {platform/linux-generic/include => include}/odp/api/support.h (73%) copy platform/linux-generic/include/odp/api/thread.h => include/odp/api/sync.h (59%) rename {platform/linux-generic/include => include}/odp/api/system_info.h (82%) rename {platform/linux-generic/include => include}/odp/api/thread.h (68%) rename {platform/linux-generic/include => include}/odp/api/threshold.h (72%) rename {platform/linux-generic/include => include}/odp/api/thrmask.h (64%) rename {platform/linux-generic/include => include}/odp/api/ticketlock.h (59%) rename {platform/linux-generic/include => include}/odp/api/time.h (76%) rename {platform/linux-generic/include => include}/odp/api/timer.h (54%) rename {platform/linux-generic/include => include}/odp/api/traffic_mngr.h (62%) rename {platform/linux-generic/include => include}/odp/api/version.h (73%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => align.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => atomic.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => barrier.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => byteorder.h} (72%) copy platform/linux-generic/arch/arm/odp/api/cpu_arch.h => include/odp/arch/arm32-linux/odp/api/abi/cpu.h (84%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => cpumask.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => debug.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => init.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => ipsec.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{packet.h => packet_flags.h} (71%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => packet_io.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => rwlock.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{packet.h => rwlock_recursive.h} (69%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => schedule.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{packet.h => schedule_types.h} (70%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => spinlock.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{packet.h => spinlock_recursive.h} (68%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => std_clib.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => std_types.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => sync.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => thread.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => thrmask.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => ticketlock.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => time.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => timer.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{packet.h => traffic_mngr.h} (71%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => version.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/byteorder.h} (72%) rename platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h => include/odp/arch/arm64-linux/odp/api/abi/cpu.h (84%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => arm64-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => arm64-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => arm64-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => arm64-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => arm64-linux/odp/api/abi/traffic_mngr.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => arm64-linux/odp/api/abi/version.h} (72%) create mode 100644 include/odp/arch/default-linux/odp/api/abi/align.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/buffer.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/byteorder.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/classification.h rename platform/linux-generic/arch/default/odp/api/cpu_arch.h => include/odp/arch/default-linux/odp/api/abi/cpu.h (60%) create mode 100644 include/odp/arch/default-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/crypto.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/debug.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/event.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/packet.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/pool.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/shared_memory.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/default-linux/odp/api/abi/version.h copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/byteorder.h} (72%) copy platform/linux-generic/arch/mips64/odp/api/cpu_arch.h => include/odp/arch/mips64-linux/odp/api/abi/cpu.h (73%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => mips64-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => mips64-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => mips64-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => mips64-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => mips64-linux/odp/api/abi/traffic_mngr.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/version.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/byteorder.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/classification.h => power64-linux/odp/api/abi/cpu.h} (61%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => power64-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => power64-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => power64-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => power64-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => power64-linux/odp/api/abi/traffic_mngr.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/version.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/byteorder.h} (72%) copy platform/linux-generic/arch/x86/odp/api/cpu_arch.h => include/odp/arch/x86_32-linux/odp/api/abi/cpu.h (78%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_32-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_32-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_32-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_32-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_32-linux/odp/api/abi/traffic_mngr.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/version.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/byteorder.h} (72%) copy platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h => include/odp/arch/x86_64-linux/odp/api/abi/cpu.h (64%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_64-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_64-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_64-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_64-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/packet.h => x86_64-linux/odp/api/abi/traffic_mngr.h} (71%) copy include/odp/arch/{arm32-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/version.h} (72%) rename {platform/linux-generic/include => include}/odp/visibility_begin.h (100%) rename {platform/linux-generic/include => include}/odp/visibility_end.h (100%) create mode 100644 m4/odp_check_flag.m4 create mode 100644 m4/odp_pthread.m4 copy platform/linux-generic/arch/{arm/odp/api/cpu_arch.h => aarch64/odp/api/abi/cpu.h} (84%) rename platform/linux-generic/arch/arm/odp/api/{cpu_arch.h => abi/cpu.h} (84%) rename platform/linux-generic/arch/{powerpc/odp/api/cpu_arch.h => default/odp/api/abi/cpu.h} (60%) rename platform/linux-generic/arch/mips64/odp/api/{cpu_arch.h => abi/cpu.h} (83%) copy include/odp/arch/arm32-linux/odp/api/abi/classification.h => platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h (61%) rename platform/linux-generic/arch/x86/odp/api/{cpu_arch.h => abi/cpu.h} (78%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/align.h (72%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/atomic.h rename platform/linux-generic/{include/odp/api/plat/barrier_types.h => include-abi/odp/api/abi/barrier.h} (89%) rename platform/linux-generic/{include/odp/api/plat/buffer_types.h => include-abi/odp/api/abi/buffer.h} (63%) rename platform/linux-generic/{include/odp/api/plat/byteorder_types.h => include-abi/odp/api/abi/byteorder.h} (83%) rename platform/linux-generic/{include/odp/api/plat/classification_types.h => include-abi/odp/api/abi/classification.h} (74%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/cpumask.h (72%) rename platform/linux-generic/{include/odp/api/plat/crypto_types.h => include-abi/odp/api/abi/crypto.h} (71%) rename platform/linux-generic/{include/odp/api => include-abi/odp/api/abi}/debug.h (72%) rename platform/linux-generic/{include/odp/api/plat/event_types.h => include-abi/odp/api/abi/event.h} (73%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/init.h (72%) rename platform/linux-generic/{include/odp/api/plat/ipsec_types.h => include-abi/odp/api/abi/ipsec.h} (88%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/packet.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/packet_flags.h rename platform/linux-generic/{include/odp/api/plat/packet_io_types.h => include-abi/odp/api/abi/packet_io.h} (83%) rename platform/linux-generic/{include/odp/api/plat/pool_types.h => include-abi/odp/api/abi/pool.h} (52%) rename platform/linux-generic/{include/odp/api/plat/queue_types.h => include-abi/odp/api/abi/queue.h} (74%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/rwlock.h (72%) copy include/odp/arch/arm32-linux/odp/api/abi/packet.h => platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h (69%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/schedule.h (72%) copy include/odp/arch/arm32-linux/odp/api/abi/packet.h => platform/linux-generic/include-abi/odp/api/abi/schedule_types.h (70%) rename platform/linux-generic/{include/odp/api/plat/shared_memory_types.h => include-abi/odp/api/abi/shared_memory.h} (73%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/spinlock.h (72%) copy include/odp/arch/arm32-linux/odp/api/abi/packet.h => platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h (68%) rename platform/linux-generic/{include/odp/api/cpu.h => include-abi/odp/api/abi/std_clib.h} (57%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/std_types.h (72%) rename platform/linux-generic/{include/odp/api/event.h => include-abi/odp/api/abi/sync.h} (58%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/thread.h copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/thrmask.h (72%) rename platform/linux-generic/{include/odp/api/plat/ticketlock_types.h => include-abi/odp/api/abi/ticketlock.h} (52%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/time.h (72%) rename platform/linux-generic/{include/odp/api/plat/timer_types.h => include-abi/odp/api/abi/timer.h} (92%) copy include/odp/arch/arm32-linux/odp/api/abi/packet.h => platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h (71%) copy include/odp/arch/arm32-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/version.h (72%) delete mode 100644 platform/linux-generic/include/odp/api/atomic.h delete mode 100644 platform/linux-generic/include/odp/api/byteorder.h delete mode 100644 platform/linux-generic/include/odp/api/classification.h delete mode 100644 platform/linux-generic/include/odp/api/packet.h delete mode 100644 platform/linux-generic/include/odp/api/plat/atomic_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h rename platform/linux-generic/include/odp/api/plat/{packet_types.h => packet_inline_types.h} (76%) create mode 100644 platform/linux-generic/include/odp/api/plat/pktio_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h create mode 100644 platform/linux-generic/include/odp/api/plat/pool_inline_types.h delete mode 100644 platform/linux-generic/include/odp/api/plat/static_inline.h.in create mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/queue.h delete mode 100644 platform/linux-generic/include/odp/api/sync.h delete mode 100644 platform/linux-generic/include/odp_crypto_internal.h create mode 100644 platform/linux-generic/include/odp_macros_internal.h create mode 100644 platform/linux-generic/include/odp_packet_null.h delete mode 100644 platform/linux-generic/m4/odp_pthread.m4 create mode 100644 platform/linux-generic/odp_atomic_api.c create mode 100644 platform/linux-generic/odp_packet_api.c create mode 100644 platform/linux-generic/odp_packet_flags_api.c create mode 100644 platform/linux-generic/odp_pktio_api.c create mode 100644 platform/linux-generic/odp_thread_api.c create mode 100644 platform/linux-generic/pktio/null.c delete mode 100644 platform/linux-generic/test/Makefile.inc delete mode 100644 platform/linux-generic/test/validation/Makefile.inc create mode 100755 scripts/shippable-post.sh delete mode 100755 test/validation/api/time/time.sh hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-211-g94665734

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 94665734b42bb11f98bf18205c4df7ad13c6f2a4 (commit) via c3af3011406a0b5a67c8dbf95b53ef94775d3014 (commit) via c1a00bb2a20b166a329dbd1158400fb27081c66c (commit) via 34dcdce23b1851f910aef53c4f17f3491f95183c (commit) via 7b98d4d5018461db83c3feef696b4470674844de (commit) via ff6fdd70a2b07bee11b708f5fd13350c5740de0e (commit) via b6ac02a13723c372501d21c56c9d73f506cafc3b (commit) from 40e4bafd9122e9531b0b6480b14f3d73d1d14e58 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 94665734b42bb11f98bf18205c4df7ad13c6f2a4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 17:12:22 2018 +0300 configure: fix enabling -mcx16 flag for i?86 platforms Use correct pattern in case-host construction. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 24a78823..21718f07 100644 --- a/configure.ac +++ b/configure.ac @@ -124,7 +124,7 @@ ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" # Check if compiler supports cmpxchng16 on x86-based architectures ########################################################################## case "${host}" in - i?86? | x86*) + i?86* | x86*) if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then ODP_CHECK_CFLAG([-mcx16]) fi commit c3af3011406a0b5a67c8dbf95b53ef94775d3014 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 03:02:46 2018 +0300 configure: use AS_HELP_STRING for abi-compat option Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 799d0b7b..24a78823 100644 --- a/configure.ac +++ b/configure.ac @@ -211,7 +211,8 @@ AC_SUBST(PKGCONFIG_VERSION) ODP_ABI_COMPAT=1 abi_compat=yes AC_ARG_ENABLE([abi-compat], - [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], + [AS_HELP_STRING([--disable-abi-compat], + [disables ABI compatible mode, enables inline code in header files])], [if test "x$enableval" = "xno"; then ODP_ABI_COMPAT=0 abi_compat=no commit c1a00bb2a20b166a329dbd1158400fb27081c66c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 03:01:55 2018 +0300 travis: enable tests for default host configuration Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 5fbb42c4..d9423adc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,8 @@ env: - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" + - CONF="--disable-host-optimization" + - CONF="--disable-host-optimization --disable-abi-compat" - DPDK_SHARED="y" CONF="--disable-static-applications" - DPDK_VERS="17.11" CONF="" - DPDK_VERS="17.11" DPDK_SHARED="y" CONF="--disable-static-applications" commit 34dcdce23b1851f910aef53c4f17f3491f95183c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 03:01:05 2018 +0300 configure: add flag to build for host=default Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index dd82b66e..799d0b7b 100644 --- a/configure.ac +++ b/configure.ac @@ -163,14 +163,6 @@ AS_CASE([$host], ) AC_SUBST([ARCH_DIR]) -########################################################################## -# Warn on the defaults if arch is undefined -########################################################################## -if test "${ARCH_DIR}" = "default"; -then - AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) -fi - ########################################################################## # Architecture for ABI support ########################################################################## @@ -185,6 +177,23 @@ AS_CASE([$host], ) AC_SUBST([ARCH_ABI]) +AC_ARG_ENABLE([host-optimization], + [AS_HELP_STRING([--disable-host-optimization], + [disables using host-specific ARCH and ABI files])], + [], [enable_host_optimization=yes]) +if test "x$enable_host_optimization" = "xno" ; then + ARCH_DIR=default + ARCH_ABI=default-linux +fi + +########################################################################## +# Warn on the defaults if arch is undefined +########################################################################## +if test "${ARCH_DIR}" = "default"; +then + AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) +fi + if test "${ARCH_ABI}" = "default-linux"; then AC_MSG_WARN([ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}]) commit 7b98d4d5018461db83c3feef696b4470674844de Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 02:55:49 2018 +0300 linux-gen: set DPDK's -msse4.2 flag during configure Use ${host} during configure time to detect if we should enable -msse4.2 flag when building with DPDK. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index bb5bc813..7f212fe5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -13,12 +13,6 @@ AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) -if PKTIO_DPDK -if ARCH_IS_X86 -AM_CFLAGS += -msse4.2 -endif -endif - if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index b2193a16..cb2ed60d 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -34,6 +34,12 @@ then ODP_DPDK([$DPDK_PATH], [], [AC_MSG_FAILURE([can't find DPDK])]) + case "${host}" in + i?86* | x86*) + DPDK_CPPFLAGS="${DPDK_CPPFLAGS} -msse4.2" + ;; + esac + AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], commit ff6fdd70a2b07bee11b708f5fd13350c5740de0e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 02:55:09 2018 +0300 build: add default-linux ABI dir, supporting generic arch Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 97f0af40..dd82b66e 100644 --- a/configure.ac +++ b/configure.ac @@ -181,14 +181,13 @@ AS_CASE([$host], [powerpc*], [ARCH_ABI=power64-linux], [aarch64*], [ARCH_ABI=arm64-linux], [arm*], [ARCH_ABI=arm32-linux], - [ARCH_ABI=undefined] + [ARCH_ABI=default-linux] ) AC_SUBST([ARCH_ABI]) -if test "${ARCH_ABI}" = "undefined"; +if test "${ARCH_ABI}" = "default-linux"; then - echo "ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}" - exit 1 + AC_MSG_WARN([ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}]) fi ########################################################################## diff --git a/include/Makefile.am b/include/Makefile.am index aa330b8d..512002f8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -226,6 +226,44 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif +if ARCH_IS_DEFAULT +odpapiabiarchinclude_HEADERS = \ + odp/arch/default-linux/odp/api/abi/align.h \ + odp/arch/default-linux/odp/api/abi/atomic.h \ + odp/arch/default-linux/odp/api/abi/barrier.h \ + odp/arch/default-linux/odp/api/abi/buffer.h \ + odp/arch/default-linux/odp/api/abi/byteorder.h \ + odp/arch/default-linux/odp/api/abi/classification.h \ + odp/arch/default-linux/odp/api/abi/cpu.h \ + odp/arch/default-linux/odp/api/abi/cpumask.h \ + odp/arch/default-linux/odp/api/abi/crypto.h \ + odp/arch/default-linux/odp/api/abi/debug.h \ + odp/arch/default-linux/odp/api/abi/event.h \ + odp/arch/default-linux/odp/api/abi/init.h \ + odp/arch/default-linux/odp/api/abi/ipsec.h \ + odp/arch/default-linux/odp/api/abi/packet.h \ + odp/arch/default-linux/odp/api/abi/packet_flags.h \ + odp/arch/default-linux/odp/api/abi/packet_io.h \ + odp/arch/default-linux/odp/api/abi/pool.h \ + odp/arch/default-linux/odp/api/abi/queue.h \ + odp/arch/default-linux/odp/api/abi/rwlock.h \ + odp/arch/default-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/default-linux/odp/api/abi/schedule.h \ + odp/arch/default-linux/odp/api/abi/schedule_types.h \ + odp/arch/default-linux/odp/api/abi/shared_memory.h \ + odp/arch/default-linux/odp/api/abi/spinlock.h \ + odp/arch/default-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/default-linux/odp/api/abi/std_clib.h \ + odp/arch/default-linux/odp/api/abi/std_types.h \ + odp/arch/default-linux/odp/api/abi/sync.h \ + odp/arch/default-linux/odp/api/abi/thread.h \ + odp/arch/default-linux/odp/api/abi/thrmask.h \ + odp/arch/default-linux/odp/api/abi/ticketlock.h \ + odp/arch/default-linux/odp/api/abi/time.h \ + odp/arch/default-linux/odp/api/abi/timer.h \ + odp/arch/default-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/default-linux/odp/api/abi/version.h +endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/align.h \ diff --git a/include/odp/arch/default-linux/odp/api/abi/align.h b/include/odp/arch/default-linux/odp/api/abi/align.h new file mode 100644 index 00000000..a4692f5d --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/atomic.h b/include/odp/arch/default-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..df1c2cd9 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/barrier.h b/include/odp/arch/default-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..5ccdf017 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/buffer.h b/include/odp/arch/default-linux/odp/api/abi/buffer.h new file mode 100644 index 00000000..e030559a --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/buffer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/byteorder.h b/include/odp/arch/default-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..27219f94 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/classification.h b/include/odp/arch/default-linux/odp/api/abi/classification.h new file mode 100644 index 00000000..4c3ba327 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/classification.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/cpu.h b/include/odp/arch/default-linux/odp/api/abi/cpu.h new file mode 100644 index 00000000..0765339b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/cpu.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define ODP_CACHE_LINE_SIZE 64 + +static inline void odp_cpu_pause(void) +{ +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default-linux/odp/api/abi/cpumask.h b/include/odp/arch/default-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..b4e7a5df --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/crypto.h b/include/odp/arch/default-linux/odp/api/abi/crypto.h new file mode 100644 index 00000000..4f4b4368 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/crypto.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/debug.h b/include/odp/arch/default-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..1bc03109 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/event.h b/include/odp/arch/default-linux/odp/api/abi/event.h new file mode 100644 index 00000000..f87d6195 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/event.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/init.h b/include/odp/arch/default-linux/odp/api/abi/init.h new file mode 100644 index 00000000..bd64cf14 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/ipsec.h b/include/odp/arch/default-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..5073680b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet.h b/include/odp/arch/default-linux/odp/api/abi/packet.h new file mode 100644 index 00000000..a1e9b1a8 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_flags.h b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..fd3e10d0 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet_flags.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_io.h b/include/odp/arch/default-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..e4220c63 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet_io.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/pool.h b/include/odp/arch/default-linux/odp/api/abi/pool.h new file mode 100644 index 00000000..72055635 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/pool.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/queue.h b/include/odp/arch/default-linux/odp/api/abi/queue.h new file mode 100644 index 00000000..04f0c6eb --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock.h b/include/odp/arch/default-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..a6aa377d --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..a78a2181 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock_recursive.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule.h b/include/odp/arch/default-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..027265c1 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule_types.h b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..f9aa2005 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule_types.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/shared_memory.h b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h new file mode 100644 index 00000000..51e35e90 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/shared_memory.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock.h b/include/odp/arch/default-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..46da3024 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..e75e753e --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock_recursive.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/std_clib.h b/include/odp/arch/default-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..048c9fc2 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_clib.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/std_types.h b/include/odp/arch/default-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..fa360e01 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_types.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/sync.h b/include/odp/arch/default-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..cdab3a94 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/thread.h b/include/odp/arch/default-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..e34b7c7b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/thrmask.h b/include/odp/arch/default-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..14ff7770 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/ticketlock.h b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..268b8094 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/time.h b/include/odp/arch/default-linux/odp/api/abi/time.h new file mode 100644 index 00000000..85c7dd03 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/timer.h b/include/odp/arch/default-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..b1664959 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..fcd83801 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/traffic_mngr.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/version.h b/include/odp/arch/default-linux/odp/api/abi/version.h new file mode 100644 index 00000000..36559ec8 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> commit b6ac02a13723c372501d21c56c9d73f506cafc3b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 9 02:52:49 2018 +0300 build: support building for generic arch Support building ODP for generic architecture, using default ARCH code. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index a44a2ec6..97f0af40 100644 --- a/configure.ac +++ b/configure.ac @@ -159,17 +159,16 @@ AS_CASE([$host], [powerpc*], [ARCH_DIR=powerpc], [aarch64*], [ARCH_DIR=aarch64], [arm*], [ARCH_DIR=arm], - [ARCH_DIR=undefined] + [ARCH_DIR=default] ) AC_SUBST([ARCH_DIR]) ########################################################################## # Warn on the defaults if arch is undefined ########################################################################## -if test "${ARCH_DIR}" = "undefined"; +if test "${ARCH_DIR}" = "default"; then - echo "ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}" - exit 1 + AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) fi ########################################################################## @@ -280,6 +279,7 @@ AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) AM_CONDITIONAL([helper_linux], [test x$helper_linux = xyes ]) AM_CONDITIONAL([ARCH_IS_ARM], [test "x${ARCH_DIR}" = "xarm"]) AM_CONDITIONAL([ARCH_IS_AARCH64], [test "x${ARCH_DIR}" = "xaarch64"]) +AM_CONDITIONAL([ARCH_IS_DEFAULT], [test "x${ARCH_DIR}" = "xdefault"]) AM_CONDITIONAL([ARCH_IS_MIPS64], [test "x${ARCH_DIR}" = "xmips64"]) AM_CONDITIONAL([ARCH_IS_POWERPC], [test "x${ARCH_DIR}" = "xpowerpc"]) AM_CONDITIONAL([ARCH_IS_X86], [test "x${ARCH_DIR}" = "xx86"]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9e82f262..bb5bc813 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -241,6 +241,16 @@ noinst_HEADERS += arch/aarch64/odp_atomic.h \ arch/default/odp_cpu_idling.h \ arch/aarch64/odp_llsc.h endif +if ARCH_IS_DEFAULT +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c +if !ODP_ABI_COMPAT +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu.h +endif +noinst_HEADERS += arch/default/odp_cpu.h \ + arch/default/odp_cpu_idling.h +endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ diff --git a/platform/linux-generic/arch/default/odp/api/abi/cpu.h b/platform/linux-generic/arch/default/odp/api/abi/cpu.h new file mode 100644 index 00000000..0765339b --- /dev/null +++ b/platform/linux-generic/arch/default/odp/api/abi/cpu.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define ODP_CACHE_LINE_SIZE 64 + +static inline void odp_cpu_pause(void) +{ +} + +#ifdef __cplusplus +} +#endif + +#endif ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 ++ configure.ac | 41 +++++++++++++--------- include/Makefile.am | 38 ++++++++++++++++++++ .../odp/api/abi/align.h | 2 +- .../odp/api/abi/atomic.h | 2 +- .../odp/api/abi/barrier.h | 2 +- .../odp/api/abi/buffer.h | 2 +- .../odp/api/abi/byteorder.h | 2 +- .../odp/api/abi/classification.h | 2 +- .../odp/arch/default-linux}/odp/api/abi/cpu.h | 7 +--- .../odp/api/abi/cpumask.h | 2 +- .../odp/api/abi/crypto.h | 2 +- .../odp/api/abi/debug.h | 2 +- .../odp/api/abi/event.h | 2 +- .../odp/api/abi/init.h | 2 +- .../odp/api/abi/ipsec.h | 2 +- .../odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h | 2 +- .../odp/api/abi/packet_io.h | 2 +- .../odp/api/abi/pool.h | 2 +- .../odp/api/abi/queue.h | 2 +- .../odp/api/abi/rwlock.h | 2 +- .../odp/api/abi/rwlock_recursive.h | 2 +- .../odp/api/abi/schedule.h | 2 +- .../odp/api/abi/schedule_types.h | 2 +- .../odp/api/abi/shared_memory.h | 2 +- .../odp/api/abi/spinlock.h | 2 +- .../odp/api/abi/spinlock_recursive.h | 2 +- .../odp/api/abi/std_clib.h | 2 +- .../odp/api/abi/std_types.h | 2 +- .../odp/api/abi/sync.h | 2 +- .../odp/api/abi/thread.h | 2 +- .../odp/api/abi/thrmask.h | 2 +- .../odp/api/abi/ticketlock.h | 2 +- .../odp/api/abi/time.h | 2 +- .../odp/api/abi/timer.h | 2 +- .../odp/api/abi/traffic_mngr.h | 2 +- .../odp/api/abi/version.h | 2 +- platform/linux-generic/Makefile.am | 16 +++++---- .../arch/{x86 => default}/odp/api/abi/cpu.h | 7 +--- platform/linux-generic/m4/odp_dpdk.m4 | 6 ++++ 41 files changed, 117 insertions(+), 68 deletions(-) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/align.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/atomic.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/barrier.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/buffer.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/byteorder.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/classification.h (76%) copy {platform/linux-generic/arch/x86 => include/odp/arch/default-linux}/odp/api/abi/cpu.h (67%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/cpumask.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/crypto.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/debug.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/event.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/init.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/ipsec.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet_flags.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet_io.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/pool.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/queue.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/rwlock.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/rwlock_recursive.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/schedule.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/schedule_types.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/shared_memory.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/spinlock.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/spinlock_recursive.h (77%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/std_clib.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/std_types.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/sync.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/thread.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/thrmask.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/ticketlock.h (76%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/time.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/timer.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/traffic_mngr.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/version.h (75%) copy platform/linux-generic/arch/{x86 => default}/odp/api/abi/cpu.h (67%) hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-204-g40e4bafd

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 40e4bafd9122e9531b0b6480b14f3d73d1d14e58 (commit) via ca9bf637fdadca1208fce921e836a58b40237c7b (commit) from e7823af35b340fed70ed5f423f7d04c7d5c62b38 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 40e4bafd9122e9531b0b6480b14f3d73d1d14e58 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Feb 14 17:04:39 2018 +0200 validation: packet: add IPv4 options Added test case for IPv4 options. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common/test_packet_parser.h b/test/common/test_packet_parser.h index fd1b40ab..09c998c9 100644 --- a/test/common/test_packet_parser.h +++ b/test/common/test_packet_parser.h @@ -424,6 +424,18 @@ static const uint8_t test_packet_ipv4_udp_last_frag[] = { 0x2E }; +/* IPv4 / Record Route + NOP options / ICMP */ +static const uint8_t test_packet_ipv4_rr_nop_icmp[] = { + 0x02, 0x00, 0x00, 0x04, 0x05, 0x06, 0x02, 0x00, + 0x00, 0x01, 0x02, 0x03, 0x08, 0x00, 0x49, 0x00, + 0x00, 0x2C, 0x00, 0x01, 0x00, 0x00, 0x40, 0x01, + 0x8E, 0xE2, 0xC0, 0xA8, 0x00, 0x01, 0xC0, 0xA8, + 0x00, 0x02, 0x07, 0x0F, 0x0C, 0xC0, 0xA8, 0x04, + 0x01, 0xC0, 0xA8, 0x05, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x08, 0x00, 0xF7, 0xFF, 0x00, 0x00, + 0x00, 0x00 +}; + #ifdef __cplusplus } #endif diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 71bf1d86..054a0d4e 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -70,7 +70,8 @@ static uint32_t parse_test_pkt_len[] = { sizeof(test_packet_bcast_eth_ipv4_udp), sizeof(test_packet_mcast_eth_ipv6_udp), sizeof(test_packet_ipv4_udp_first_frag), - sizeof(test_packet_ipv4_udp_last_frag) + sizeof(test_packet_ipv4_udp_last_frag), + sizeof(test_packet_ipv4_rr_nop_icmp) }; #define packet_compare_offset(pkt1, off1, pkt2, off2, len) \ @@ -3223,6 +3224,39 @@ static void parse_eth_ipv4_udp_last_frag(void) odp_packet_free_multi(pkt, num_pkt); } +/* Ethernet/IPv4 + options (Record route, NOP)/ICMP */ +static void parse_eth_ipv4_rr_nop_icmp(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_rr_nop_icmp, + sizeof(test_packet_ipv4_rr_nop_icmp)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ipopt(pkt[i])); + CU_ASSERT(odp_packet_has_icmp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipfrag(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -3279,6 +3313,7 @@ odp_testinfo_t packet_parse_suite[] = { ODP_TEST_INFO(parse_mcast_eth_ipv6_udp), ODP_TEST_INFO(parse_eth_ipv4_udp_first_frag), ODP_TEST_INFO(parse_eth_ipv4_udp_last_frag), + ODP_TEST_INFO(parse_eth_ipv4_rr_nop_icmp), ODP_TEST_INFO_NULL, }; commit ca9bf637fdadca1208fce921e836a58b40237c7b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Feb 13 16:10:40 2018 +0200 validation: packet: add IPv4 fragments Added test cases for IPv4/UDP fragments. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common/test_packet_parser.h b/test/common/test_packet_parser.h index d0a0582a..fd1b40ab 100644 --- a/test/common/test_packet_parser.h +++ b/test/common/test_packet_parser.h @@ -389,6 +389,41 @@ static const uint8_t test_packet_mcast_eth_ipv6_udp[] = { 0x79, 0x74, 0x65, 0x73, 0x2E }; +static const uint8_t test_packet_ipv4_udp_first_frag[] = { + 0x02, 0x00, 0x00, 0x04, 0x05, 0x06, 0x02, 0x00, + 0x00, 0x01, 0x02, 0x03, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x63, 0x00, 0x01, 0x20, 0x00, 0x40, 0x11, + 0xD9, 0x35, 0xC0, 0xA8, 0x00, 0x01, 0xC0, 0xA8, + 0x00, 0x02, 0x04, 0xD2, 0x16, 0x2E, 0x01, 0x17, + 0x54, 0xF3, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, + 0x73, 0x20, 0x6D, 0x79, 0x20, 0x64, 0x75, 0x6D, + 0x6D, 0x79, 0x20, 0x70, 0x61, 0x79, 0x6C, 0x6F, + 0x61, 0x64, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6E, + 0x67, 0x2E, 0x20, 0x54, 0x68, 0x65, 0x20, 0x6C, + 0x65, 0x6E, 0x67, 0x74, 0x68, 0x20, 0x6F, 0x66, + 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x73, 0x74, + 0x72, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, + 0x37, 0x31, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x2E +}; + +static const uint8_t test_packet_ipv4_udp_last_frag[] = { + 0x02, 0x00, 0x00, 0x04, 0x05, 0x06, 0x02, 0x00, + 0x00, 0x01, 0x02, 0x03, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x5B, 0x00, 0x01, 0x00, 0x0A, 0x40, 0x11, + 0xF9, 0x33, 0xC0, 0xA8, 0x00, 0x01, 0xC0, 0xA8, + 0x00, 0x02, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, + 0x73, 0x20, 0x6D, 0x79, 0x20, 0x64, 0x75, 0x6D, + 0x6D, 0x79, 0x20, 0x70, 0x61, 0x79, 0x6C, 0x6F, + 0x61, 0x64, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6E, + 0x67, 0x2E, 0x20, 0x54, 0x68, 0x65, 0x20, 0x6C, + 0x65, 0x6E, 0x67, 0x74, 0x68, 0x20, 0x6F, 0x66, + 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x73, 0x74, + 0x72, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, + 0x37, 0x31, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x2E +}; + #ifdef __cplusplus } #endif diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index db3a47cf..71bf1d86 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -68,7 +68,9 @@ static uint32_t parse_test_pkt_len[] = { sizeof(test_packet_ipv6_ipsec_esp), sizeof(test_packet_mcast_eth_ipv4_udp), sizeof(test_packet_bcast_eth_ipv4_udp), - sizeof(test_packet_mcast_eth_ipv6_udp) + sizeof(test_packet_mcast_eth_ipv6_udp), + sizeof(test_packet_ipv4_udp_first_frag), + sizeof(test_packet_ipv4_udp_last_frag) }; #define packet_compare_offset(pkt1, off1, pkt2, off2, len) \ @@ -3157,6 +3159,70 @@ static void parse_mcast_eth_ipv6_udp(void) odp_packet_free_multi(pkt, num_pkt); } +/* Ethernet/IPv4/UDP first fragment */ +static void parse_eth_ipv4_udp_first_frag(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_udp_first_frag, + sizeof(test_packet_ipv4_udp_first_frag)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ipfrag(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipopt(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + +/* Ethernet/IPv4/UDP last fragment */ +static void parse_eth_ipv4_udp_last_frag(void) +{ + odp_packet_parse_param_t parse; + int i; + int num_pkt = PARSE_TEST_NUM_PKT; + odp_packet_t pkt[num_pkt]; + + parse_test_alloc(pkt, test_packet_ipv4_udp_last_frag, + sizeof(test_packet_ipv4_udp_last_frag)); + + parse.proto = ODP_PROTO_ETH; + parse.last_layer = ODP_PROTO_LAYER_L4; + parse.chksums.all_chksum = 0; + + CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0); + CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero, + num_pkt - 1, &parse) == (num_pkt - 1)); + + for (i = 0; i < num_pkt; i++) { + CU_ASSERT(odp_packet_has_eth(pkt[i])); + CU_ASSERT(odp_packet_has_ipv4(pkt[i])); + CU_ASSERT(odp_packet_has_ipfrag(pkt[i])); + CU_ASSERT(odp_packet_has_udp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); + CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT(!odp_packet_has_ipopt(pkt[i])); + } + + odp_packet_free_multi(pkt, num_pkt); +} + odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_alloc_free), ODP_TEST_INFO(packet_test_alloc_free_multi), @@ -3211,6 +3277,8 @@ odp_testinfo_t packet_parse_suite[] = { ODP_TEST_INFO(parse_mcast_eth_ipv4_udp), ODP_TEST_INFO(parse_bcast_eth_ipv4_udp), ODP_TEST_INFO(parse_mcast_eth_ipv6_udp), + ODP_TEST_INFO(parse_eth_ipv4_udp_first_frag), + ODP_TEST_INFO(parse_eth_ipv4_udp_last_frag), ODP_TEST_INFO_NULL, }; ----------------------------------------------------------------------- Summary of changes: test/common/test_packet_parser.h | 47 ++++++++++++++++ test/validation/api/packet/packet.c | 105 +++++++++++++++++++++++++++++++++++- 2 files changed, 151 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-202-ge7823af3

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via e7823af35b340fed70ed5f423f7d04c7d5c62b38 (commit) via 9ee8609b86639606217d2f78c52f28e3fe08c782 (commit) via 569810c52a72c83aced5c5b8adf3eec40f371d90 (commit) from 6e213fbae7f16558e572da39704927f107c01f80 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e7823af35b340fed70ed5f423f7d04c7d5c62b38 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Jan 16 17:07:54 2018 +0200 example: generator: remove useless csum checks Remove useless csum checks: packets are dropped at platform level if have csum errors. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 440b6b28..d31b6851 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -824,21 +824,12 @@ static void process_pkts(int thr, thread_args_t *thr_args, odp_packet_t pkt_tbl[], unsigned len) { odp_packet_t pkt; - odp_packet_chksum_status_t csum_status; uint32_t left, offset, i; odph_ipv4hdr_t *ip; for (i = 0; i < len; ++i) { pkt = pkt_tbl[i]; - csum_status = odp_packet_l3_chksum_status(pkt); - if (csum_status == ODP_PACKET_CHKSUM_BAD) - printf("L3 checksum error detected.\n"); - - csum_status = odp_packet_l4_chksum_status(pkt); - if (csum_status == ODP_PACKET_CHKSUM_BAD) - printf("L4 checksum error detected.\n"); - /* Drop packets with errors */ if (odp_unlikely(odp_packet_has_error(pkt))) continue; commit 9ee8609b86639606217d2f78c52f28e3fe08c782 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Jan 16 16:13:11 2018 +0200 example: generator: remove busy wait for direct mode receive Add timeout to avoid unnecessary loops on low traffic. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index f8c787e4..440b6b28 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -939,6 +939,7 @@ static int gen_recv_direct_thread(void *arg) odp_packet_t pkts[MAX_RX_BURST]; int pkt_cnt, burst_size; odp_pktin_queue_t pktin; + uint64_t wait = odp_pktin_wait_time(ODP_TIME_SEC_IN_NS); thr = odp_thread_id(); thr_args = (thread_args_t *)arg; @@ -952,8 +953,7 @@ static int gen_recv_direct_thread(void *arg) if (thr_args->stop) break; - pkt_cnt = odp_pktin_recv_tmo(pktin, pkts, burst_size, - ODP_PKTIN_NO_WAIT); + pkt_cnt = odp_pktin_recv_tmo(pktin, pkts, burst_size, wait); if (pkt_cnt > 0) { process_pkts(thr, thr_args, pkts, pkt_cnt); commit 569810c52a72c83aced5c5b8adf3eec40f371d90 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 14 20:26:00 2018 +0300 validation: tm: auto skip test on Shippable in addition to Travis Apply the same workaround as we have on Travis: retun 77 to mark the test as skipped if we detect failure while running on top of CI. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr/traffic_mngr.sh index c4e2d297..c88aa805 100755 --- a/test/validation/api/traffic_mngr/traffic_mngr.sh +++ b/test/validation/api/traffic_mngr/traffic_mngr.sh @@ -31,9 +31,7 @@ TEST_SKIPPED=77 traffic_mngr_main${EXEEXT} ret=$? -SIGSEGV=139 - -if [ "${TRAVIS}" = "true" ] && [ $ret -ne 0 ] && [ $ret -ne ${SIGSEGV} ]; then +if [ "${CI}" = "true" ] && [ $ret -eq 255 ]; then echo "SKIP: skip due to not isolated environment" exit ${TEST_SKIPPED} fi ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 13 ++----------- test/validation/api/traffic_mngr/traffic_mngr.sh | 4 +--- 2 files changed, 3 insertions(+), 14 deletions(-) hooks/post-receive --

7 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp