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 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) from 77ff03881d844a9d6a4bc773086bd8aaecace541 (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 5a4502fc6bc53e6503169da3028f456b64811a0b Author: Ilias Apalodimas ilias.apalodimas@linaro.org Date: Tue Jan 16 21:09:35 2018 +0200
linux-gen: align: Fix alignment for typedef definitions
* typedef struct { } ODP_ALIGN() test_t; is correct * typedef struct ODP_ALIGN() {} test_t; is correct and preferred from gcc standards * typedef struct {} test_t ODP_ALIGN() discards align Had segfauls on gcc-7 using that
Signed-off-by: Ilias Apalodimas ilias.apalodimas@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/example/ipfragreass/odp_ipfragreass.c b/example/ipfragreass/odp_ipfragreass.c index 6ad0db9f..6668263b 100644 --- a/example/ipfragreass/odp_ipfragreass.c +++ b/example/ipfragreass/odp_ipfragreass.c @@ -47,9 +47,9 @@ static odp_queue_t reassembled_pkts; static odp_atomic_u32_t packets_reassembled;
/** Number of fragments processed per thread in reassembly (for printing) */ -static struct { +static struct ODP_ALIGNED_CACHE { uint32_t frags; -} ODP_ALIGNED_CACHE thread_stats[MAX_WORKERS]; +} thread_stats[MAX_WORKERS];
/** Shared hash map structure for reassembly */ static union fraglist *fraglists; diff --git a/example/l3fwd/odp_l3fwd_db.h b/example/l3fwd/odp_l3fwd_db.h index 8df2999d..015f3832 100644 --- a/example/l3fwd/odp_l3fwd_db.h +++ b/example/l3fwd/odp_l3fwd_db.h @@ -39,7 +39,7 @@ typedef struct ip_addr_range_s { /** * TCP/UDP flow */ -typedef struct ipv4_tuple5_s { +typedef struct ODP_ALIGNED_CACHE ipv4_tuple5_s { union { struct { int32_t src_ip; @@ -55,7 +55,7 @@ typedef struct ipv4_tuple5_s { int64_t lo64; }; }; -} ipv4_tuple5_t ODP_ALIGNED_CACHE; +} ipv4_tuple5_t;
/** * Forwarding data base entry diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 3e52970b..954c667c 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -66,7 +66,7 @@ static int exit_threads; /**< Break workers loop if set to 1 */ /** * Statistics */ -typedef union { +typedef union ODP_ALIGNED_CACHE { struct { /** Number of received packets */ uint64_t rx_packets; @@ -79,7 +79,7 @@ typedef union { } s;
uint8_t padding[ODP_CACHE_LINE_SIZE]; -} stats_t ODP_ALIGNED_CACHE; +} stats_t;
/** * Packet buffer diff --git a/helper/cuckootable.c b/helper/cuckootable.c index 4707191d..29298d42 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -93,12 +93,12 @@ struct cuckoo_table_key_value { * into a bucket, and each bucket has at most HASH_BUCKET_ENTRIES * elements. */ -struct cuckoo_table_bucket { +struct ODP_ALIGNED_CACHE cuckoo_table_bucket { struct cuckoo_table_signatures signatures[HASH_BUCKET_ENTRIES]; /* Includes dummy key index that always contains index 0 */ odp_buffer_t key_buf[HASH_BUCKET_ENTRIES + 1]; uint8_t flag[HASH_BUCKET_ENTRIES]; -} ODP_ALIGNED_CACHE; +};
/* More efficient access to a map of single ullong */ #define ULLONG_FOR_EACH_1(IDX, MAP) \ @@ -106,7 +106,7 @@ struct cuckoo_table_bucket { MAP = (MAP & (MAP - 1)))
/** A hash table structure. */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /**< for check */ uint32_t magicword; /**< Name of the hash. */ @@ -126,7 +126,7 @@ typedef struct { /** Table with buckets storing all the hash values and key indexes to the key table*/ struct cuckoo_table_bucket *buckets; -} odph_cuckoo_table_impl ODP_ALIGNED_CACHE; +} odph_cuckoo_table_impl;
/** * Aligns input parameter to the next power of 2 diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 7ca68de2..7b1faa29 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -96,7 +96,7 @@ typedef enum { } cache_type_t;
/** A IP lookup table structure. */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /**< for check */ uint32_t magicword; /** Name of the hash. */ @@ -118,7 +118,7 @@ typedef struct { odp_queue_t free_slots[2]; /** The number of pool used by each queue. */ uint32_t cache_count[2]; -} odph_iplookup_table_impl ODP_ALIGNED_CACHE; +} odph_iplookup_table_impl;
/*********************************************************** ***************** Cache management ******************** diff --git a/include/odp/api/abi-default/cpumask.h b/include/odp/api/abi-default/cpumask.h index 69f4c162..4c350822 100644 --- a/include/odp/api/abi-default/cpumask.h +++ b/include/odp/api/abi-default/cpumask.h @@ -33,14 +33,14 @@ extern "C" { * * Don't access directly, use access functions. */ -typedef struct odp_cpumask_t { +typedef struct ODP_ALIGNED(8) odp_cpumask_t { /** @private CPU mask storage * * This is private to the implementation. * Don't access directly, use access functions. */ uint8_t _u8[ODP_CPUMASK_SIZE / 8]; -} odp_cpumask_t ODP_ALIGNED(8); +} odp_cpumask_t;
/** * @} diff --git a/platform/linux-generic/include/odp/api/plat/static_inline.h b/platform/linux-generic/include/odp/api/plat/static_inline.h new file mode 100644 index 00000000..633e2f27 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/static_inline.h @@ -0,0 +1,43 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * Macro for static inline functions + */ + +#ifndef ODP_PLAT_STATIC_INLINE_H_ +#define ODP_PLAT_STATIC_INLINE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @internal + * @def ODP_ABI_COMPAT + * Control ABI compatibility + */ + +/** + * @internal + * @def _ODP_INLINE + * Define a function as inlined or not inlined (for ABI compatibility) + */ +#if 1 +#define ODP_ABI_COMPAT 1 +#define _ODP_INLINE +#else +#define ODP_ABI_COMPAT 0 +#define _ODP_INLINE static inline +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp_atomic_internal.h b/platform/linux-generic/include/odp_atomic_internal.h index f3696a99..43c29a76 100644 --- a/platform/linux-generic/include/odp_atomic_internal.h +++ b/platform/linux-generic/include/odp_atomic_internal.h @@ -29,10 +29,9 @@ extern "C" { /** * Pointer atomic type */ -typedef struct { +typedef struct ODP_ALIGNED(sizeof(void *)) { void *v; /**< Actual storage for the atomic variable */ -} _odp_atomic_ptr_t -ODP_ALIGNED(sizeof(void *)); /* Enforce alignement! */ +} _odp_atomic_ptr_t;
/** * Atomic flag (boolean) type @@ -709,9 +708,9 @@ static inline void _odp_atomic_flag_clear(_odp_atomic_flag_t *flag) typedef __int128 _uint128_t;
/** Atomic 128-bit type */ -typedef struct { +typedef struct ODP_ALIGNED(16) { _uint128_t v; /**< Actual storage for the atomic variable */ -} _odp_atomic_u128_t ODP_ALIGNED(16); +} _odp_atomic_u128_t;
/** * 16-byte atomic exchange operation diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index c56c5b01..b5266938 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -42,7 +42,7 @@ typedef struct seg_entry_t { } seg_entry_t;
/* Common buffer header */ -struct odp_buffer_hdr_t { +struct ODP_ALIGNED_CACHE odp_buffer_hdr_t {
/* Buffer index in the pool */ uint32_t index; @@ -110,7 +110,7 @@ struct odp_buffer_hdr_t {
/* Data or next header */ uint8_t data[0]; -} ODP_ALIGNED_CACHE; +};
ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256, "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE"); diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h index 70a583c5..dbdcbb91 100644 --- a/platform/linux-generic/include/odp_ipsec_internal.h +++ b/platform/linux-generic/include/odp_ipsec_internal.h @@ -92,7 +92,7 @@ int _odp_ipsec_status_send(odp_queue_t queue, #define ODP_CONFIG_IPSEC_SAS 8
struct ipsec_sa_s { - odp_atomic_u32_t state ODP_ALIGNED_CACHE; + odp_atomic_u32_t ODP_ALIGNED_CACHE state;
uint32_t ipsec_sa_idx; odp_ipsec_sa_t ipsec_sa_hdl; diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 05f00ad3..24292655 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -41,13 +41,13 @@ struct pkt_cache_t { unsigned count; /**< packets in cache */ };
-typedef union { +typedef union ODP_ALIGNED_CACHE { struct pkt_cache_t s; uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pkt_cache_t))]; -} pkt_cache_t ODP_ALIGNED_CACHE; +} pkt_cache_t;
/** Packet IO using DPDK interface */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { odp_pool_t pool; /**< pool to alloc packets from */ struct rte_mempool *pkt_pool; /**< DPDK packet pool */ uint32_t data_room; /**< maximum packet length */ @@ -64,6 +64,6 @@ typedef struct { odp_ticketlock_t tx_lock[PKTIO_MAX_QUEUES]; /**< TX queue locks */ /** cache for storing extra RX packets */ pkt_cache_t rx_cache[PKTIO_MAX_QUEUES]; -} pkt_dpdk_t ODP_ALIGNED_CACHE; +} pkt_dpdk_t;
#endif diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 712799d7..01e0cae1 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -156,7 +156,7 @@ typedef struct { /* Type of extra data */ uint8_t extra_type; /* Extra space for packet descriptors. E.g. DPDK mbuf */ - uint8_t extra[PKT_EXTRA_LEN] ODP_ALIGNED_CACHE; + uint8_t ODP_ALIGNED_CACHE extra[PKT_EXTRA_LEN]; #endif
/* Context for IPsec */ diff --git a/platform/linux-generic/include/odp_packet_io_ring_internal.h b/platform/linux-generic/include/odp_packet_io_ring_internal.h index d044f931..5a60a4ee 100644 --- a/platform/linux-generic/include/odp_packet_io_ring_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ring_internal.h @@ -132,26 +132,26 @@ typedef struct _ring { int flags;
/** @private Producer */ - struct _prod { + struct ODP_ALIGNED_CACHE _prod { uint32_t watermark; /* Maximum items */ uint32_t sp_enqueue; /* True, if single producer. */ uint32_t size; /* Size of ring. */ uint32_t mask; /* Mask (size-1) of ring. */ volatile uint32_t head; /* Producer head. */ volatile uint32_t tail; /* Producer tail. */ - } prod ODP_ALIGNED_CACHE; + } prod;
/** @private Consumer */ - struct _cons { + struct ODP_ALIGNED_CACHE _cons { uint32_t sc_dequeue; /* True, if single consumer. */ uint32_t size; /* Size of the ring. */ uint32_t mask; /* Mask (size-1) of ring. */ volatile uint32_t head; /* Consumer head. */ volatile uint32_t tail; /* Consumer tail. */ - } cons ODP_ALIGNED_CACHE; + } cons;
/** @private Memory space of ring starts here. */ - void *ring[0] ODP_ALIGNED_CACHE; + void ODP_ALIGNED_CACHE *ring[0]; } _ring_t;
/* The default enqueue is "single-producer".*/ diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h index 876c7e46..616541b5 100644 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ b/platform/linux-generic/include/odp_packet_netmap.h @@ -30,10 +30,10 @@ struct netmap_ring_t { odp_ticketlock_t lock; /**< Queue lock */ };
-typedef union { +typedef union ODP_ALIGNED_CACHE { struct netmap_ring_t s; uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct netmap_ring_t))]; -} netmap_ring_t ODP_ALIGNED_CACHE; +} netmap_ring_t;
/** Netmap ring slot */ typedef struct { diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index 0e61f6f0..52d2776b 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -67,11 +67,11 @@ ODP_STATIC_ASSERT(offsetof(struct ring, mm_space) <= ODP_CACHE_LINE_SIZE, /** Packet socket using mmap rings for both Rx and Tx */ typedef struct { /** Packet mmap ring for Rx */ - struct ring rx_ring ODP_ALIGNED_CACHE; + struct ring ODP_ALIGNED_CACHE rx_ring; /** Packet mmap ring for Tx */ - struct ring tx_ring ODP_ALIGNED_CACHE; + struct ring ODP_ALIGNED_CACHE tx_ring;
- int sockfd ODP_ALIGNED_CACHE; + int ODP_ALIGNED_CACHE sockfd; odp_pool_t pool; size_t frame_offset; /**< frame start offset from start of pkt buf */ uint8_t *mmap_base; diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 61ec5ccc..8284bcd7 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -26,27 +26,27 @@ extern "C" { #include <odp_ring_internal.h> #include <odp/api/plat/strong_types.h>
-typedef struct pool_cache_t { +typedef struct ODP_ALIGNED_CACHE pool_cache_t { uint32_t num; uint32_t buf_index[CONFIG_POOL_CACHE_SIZE];
-} pool_cache_t ODP_ALIGNED_CACHE; +} pool_cache_t;
/* Buffer header ring */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Ring header */ ring_t hdr;
/* Ring data: buffer handles */ uint32_t buf[CONFIG_POOL_MAX_NUM];
-} pool_ring_t ODP_ALIGNED_CACHE; +} pool_ring_t;
/* Callback function for pool destroy */ typedef void (*pool_destroy_cb_fn)(void *pool);
typedef struct pool_t { - odp_ticketlock_t lock ODP_ALIGNED_CACHE; + odp_ticketlock_t ODP_ALIGNED_CACHE lock;
char name[ODP_POOL_NAME_LEN]; odp_pool_param_t params; diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index df1b29ff..158b1d5f 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -37,13 +37,13 @@ extern "C" { #define QUEUE_STATUS_SCHED 4
struct queue_entry_s { - odp_ticketlock_t lock ODP_ALIGNED_CACHE; + odp_ticketlock_t ODP_ALIGNED_CACHE lock;
odp_buffer_hdr_t *head; odp_buffer_hdr_t *tail; int status;
- queue_enq_fn_t enqueue ODP_ALIGNED_CACHE; + queue_enq_fn_t ODP_ALIGNED_CACHE enqueue; queue_deq_fn_t dequeue; queue_enq_multi_fn_t enqueue_multi; queue_deq_multi_fn_t dequeue_multi; diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index 58d64aa5..605d8750 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -34,10 +34,10 @@ extern "C" { struct queue_entry_s { sched_elem_t sched_elem;
- odp_ticketlock_t lock ODP_ALIGNED_CACHE; + odp_ticketlock_t ODP_ALIGNED_CACHE lock; int status;
- queue_enq_fn_t enqueue ODP_ALIGNED_CACHE; + queue_enq_fn_t ODP_ALIGNED_CACHE enqueue; queue_deq_fn_t dequeue; queue_enq_multi_fn_t enqueue_multi; queue_deq_multi_fn_t dequeue_multi; diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index 44b83c60..c2eedb8e 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -25,7 +25,7 @@ extern "C" { * must be a power of two. Also ring size must be larger than the maximum * number of data items that will be stored on it (there's no check against * overwriting). */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Writer head and tail */ odp_atomic_u32_t w_head; odp_atomic_u32_t w_tail; @@ -36,7 +36,7 @@ typedef struct { odp_atomic_u32_t r_tail;
uint32_t data[0]; -} ring_t ODP_ALIGNED_CACHE; +} ring_t;
/* Initialize ring */ static inline void ring_init(ring_t *ring) diff --git a/platform/linux-generic/include/odp_schedule_scalable.h b/platform/linux-generic/include/odp_schedule_scalable.h index ac357b01..92d60276 100644 --- a/platform/linux-generic/include/odp_schedule_scalable.h +++ b/platform/linux-generic/include/odp_schedule_scalable.h @@ -29,7 +29,7 @@ #define ODP_SCHED_PRIO_PKTIN 8 #define ODP_SCHED_PRIO_NUM 9
-typedef struct { +typedef struct ODP_ALIGNED_CACHE { union { struct { struct llqueue llq; @@ -37,16 +37,16 @@ typedef struct { }; char line[ODP_CACHE_LINE_SIZE]; }; -} sched_queue_t ODP_ALIGNED_CACHE; +} sched_queue_t;
#define TICKET_INVALID (uint16_t)(~0U)
-typedef struct { +typedef struct ODP_ALIGNED(sizeof(uint64_t)) { int32_t numevts; uint16_t wrr_budget; uint8_t cur_ticket; uint8_t nxt_ticket; -} qschedstate_t ODP_ALIGNED(sizeof(uint64_t)); +} qschedstate_t;
typedef uint32_t ringidx_t;
@@ -58,7 +58,7 @@ typedef uint32_t ringidx_t;
#define ODP_NO_SCHED_QUEUE (ODP_SCHED_SYNC_ORDERED + 1)
-typedef struct { +typedef struct ODP_ALIGNED_CACHE { struct llnode node; sched_queue_t *schedq; #ifdef CONFIG_QSCHST_LOCK @@ -89,7 +89,7 @@ typedef struct { #define cons_type qschst_type #endif odp_schedule_group_t sched_grp; -} sched_elem_t ODP_ALIGNED_CACHE; +} sched_elem_t;
/* Number of scheduling groups */ #define MAX_SCHED_GROUP (sizeof(sched_group_mask_t) * CHAR_BIT) @@ -98,7 +98,7 @@ typedef bitset_t sched_group_mask_t;
typedef struct { /* Threads currently associated with the sched group */ - bitset_t thr_actual[ODP_SCHED_PRIO_NUM] ODP_ALIGNED_CACHE; + bitset_t ODP_ALIGNED_CACHE thr_actual[ODP_SCHED_PRIO_NUM]; bitset_t thr_wanted; /* Used to spread queues over schedq's */ uint32_t xcount[ODP_SCHED_PRIO_NUM]; @@ -106,13 +106,13 @@ typedef struct { uint32_t xfactor; char name[ODP_SCHED_GROUP_NAME_LEN]; /* ODP_SCHED_PRIO_NUM * xfactor. Must be last. */ - sched_queue_t schedq[1] ODP_ALIGNED_CACHE; + sched_queue_t ODP_ALIGNED_CACHE schedq[1]; } sched_group_t;
/* Number of reorder contexts per thread */ #define TS_RVEC_SIZE 16
-typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Atomic queue currently being processed or NULL */ sched_elem_t *atomq; /* Schedq the currently processed queue was popped from */ @@ -135,10 +135,10 @@ typedef struct { sched_group_mask_t sg_wanted[ODP_SCHED_PRIO_NUM]; bitset_t priv_rvec_free; /* Bitset of free entries in rvec[] */ - bitset_t rvec_free ODP_ALIGNED_CACHE; + bitset_t ODP_ALIGNED_CACHE rvec_free; /* Reordering contexts to allocate from */ - reorder_context_t rvec[TS_RVEC_SIZE] ODP_ALIGNED_CACHE; -} sched_scalable_thread_state_t ODP_ALIGNED_CACHE; + reorder_context_t ODP_ALIGNED_CACHE rvec[TS_RVEC_SIZE]; +} sched_scalable_thread_state_t;
void sched_update_enq(sched_elem_t *q, uint32_t actual); void sched_update_enq_sp(sched_elem_t *q, uint32_t actual); diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index c493dead..14e411e2 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -57,12 +57,12 @@ * We need a point of synchronisation where this knowledge and potential state * change can be transferred between threads. */ -typedef struct hc { +typedef struct ODP_ALIGNED(sizeof(uint64_t)) hc { /* First missing context */ uint32_t head; /* Change indicator */ uint32_t chgi; -} hc_t ODP_ALIGNED(sizeof(uint64_t)); +} hc_t;
/* Number of reorder contects in the reorder window. * Should be at least one per CPU. @@ -90,7 +90,7 @@ typedef struct reorder_window { */ #define RC_EVT_SIZE 18
-struct reorder_context { +struct ODP_ALIGNED_CACHE reorder_context { /* Reorder window to which this context belongs */ reorder_window_t *rwin; /* Pointer to TS->rvec_free */ @@ -109,7 +109,7 @@ struct reorder_context { /* Events stored in this context */ odp_buffer_hdr_t *events[RC_EVT_SIZE]; queue_entry_t *destq[RC_EVT_SIZE]; -} ODP_ALIGNED_CACHE; +};
reorder_window_t *rwin_alloc(_odp_ishm_pool_t *pool, unsigned lock_count); diff --git a/platform/linux-generic/odp_name_table.c b/platform/linux-generic/odp_name_table.c index 3ff46b34..e9a84ef3 100644 --- a/platform/linux-generic/odp_name_table.c +++ b/platform/linux-generic/odp_name_table.c @@ -56,7 +56,7 @@ typedef struct name_tbl_entry_s name_tbl_entry_t; /* It is important for most platforms that the following struct fit within * one cacheline. */ -struct name_tbl_entry_s { +struct ODP_ALIGNED_CACHE name_tbl_entry_s { name_tbl_entry_t *next_entry; uint64_t user_data; _odp_int_name_t name_tbl_id; @@ -64,9 +64,9 @@ struct name_tbl_entry_s { uint8_t name_kind; uint8_t name_len; char name[_ODP_INT_NAME_LEN + 1]; -} ODP_ALIGNED_CACHE; +};
-typedef struct { +typedef struct ODP_ALIGNED_CACHE { uint32_t num_allocd; uint32_t num_used; uint32_t num_added_to_free_list; @@ -74,7 +74,7 @@ typedef struct { uint32_t base_id; name_tbl_entry_t *free_list_head; name_tbl_entry_t entries[0]; -} ODP_ALIGNED_CACHE name_tbl_t; +} name_tbl_t;
typedef struct { name_tbl_t *tbls[NUM_NAME_TBLS]; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index bd9e77c0..77765fb8 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -26,7 +26,7 @@ #include <odp/visibility_begin.h>
/* Fill in packet header field offsets for inline functions */ -const _odp_packet_inline_offset_t _odp_packet_inline ODP_ALIGNED_CACHE = { +const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { .data = offsetof(odp_packet_hdr_t, buf_hdr.seg[0].data), .seg_len = offsetof(odp_packet_hdr_t, buf_hdr.seg[0].len), .frame_len = offsetof(odp_packet_hdr_t, frame_len), diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 4f6a1eb6..17219193 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -22,15 +22,16 @@
#define NUM_PKTS 7
-typedef struct /* Must be exactly 64 bytes long AND cacheline aligned! */ { +/* Must be exactly 64 bytes long AND cacheline aligned! */ +typedef struct ODP_ALIGNED_CACHE { uint32_t next_queue_blk_idx; uint32_t tail_queue_blk_idx; odp_packet_t pkts[NUM_PKTS]; -} ODP_ALIGNED_CACHE queue_blk_t; +} queue_blk_t;
-typedef struct { +typedef struct ODP_ALIGNED_CACHE { queue_blk_t blks[0]; -} ODP_ALIGNED_CACHE queue_blks_t; +} queue_blks_t;
/* The queue_num_tbl is used to map from a queue_num to a queue_num_desc. * The reason is based on the assumption that usually only a small fraction diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 7e3e156f..e5ba8982 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -61,7 +61,7 @@ static __thread pool_local_t local; #include <odp/visibility_begin.h>
/* Fill in pool header field offsets for inline functions */ -const _odp_pool_inline_offset_t _odp_pool_inline ODP_ALIGNED_CACHE = { +const _odp_pool_inline_offset_t ODP_ALIGNED_CACHE _odp_pool_inline = { .pool_hdl = offsetof(pool_t, pool_hdl), .uarea_size = offsetof(pool_t, params.pkt.uarea_size) }; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 1a9a2a8f..118f9eb1 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -177,24 +177,24 @@ typedef struct { } sched_local_t;
/* Priority queue */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Ring header */ ring_t ring;
/* Ring data: queue indexes */ uint32_t queue_index[PRIO_QUEUE_RING_SIZE];
-} prio_queue_t ODP_ALIGNED_CACHE; +} prio_queue_t;
/* Packet IO queue */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Ring header */ ring_t ring;
/* Ring data: pktio poll command indexes */ uint32_t cmd_index[PKTIO_RING_SIZE];
-} pktio_queue_t ODP_ALIGNED_CACHE; +} pktio_queue_t;
/* Packet IO poll command */ typedef struct { @@ -205,17 +205,17 @@ typedef struct { } pktio_cmd_t;
/* Order context of a queue */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Current ordered context id */ - odp_atomic_u64_t ctx ODP_ALIGNED_CACHE; + odp_atomic_u64_t ODP_ALIGNED_CACHE ctx;
/* Next unallocated context id */ - odp_atomic_u64_t next_ctx; + odp_atomic_u64_t next_ctx;
/* Array of ordered locks */ - odp_atomic_u64_t lock[CONFIG_QUEUE_MAX_ORD_LOCKS]; + odp_atomic_u64_t lock[CONFIG_QUEUE_MAX_ORD_LOCKS];
-} order_context_t ODP_ALIGNED_CACHE; +} order_context_t;
typedef struct { pri_mask_t pri_mask[NUM_PRIO]; diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index 3d794b14..33767c1f 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -93,13 +93,13 @@ typedef struct { #define MAX_DEQ CONFIG_BURST_SIZE
/* Instantiate a RING data structure as pktio command queue */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Ring header */ ring_t ring;
/* Ring data: pktio poll command indexes */ uint32_t cmd_index[PKTIO_RING_SIZE]; -} pktio_cmd_queue_t ODP_ALIGNED_CACHE; +} pktio_cmd_queue_t;
/* Packet IO poll command */ typedef struct { @@ -122,17 +122,17 @@ typedef struct { typedef struct sched_thread_local sched_thread_local_t;
/* Order context of a queue */ -typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Current ordered context id */ - odp_atomic_u64_t ctx ODP_ALIGNED_CACHE; + odp_atomic_u64_t ODP_ALIGNED_CACHE ctx;
/* Next unallocated context id */ - odp_atomic_u64_t next_ctx; + odp_atomic_u64_t next_ctx;
/* Array of ordered locks */ - odp_atomic_u64_t lock[CONFIG_QUEUE_MAX_ORD_LOCKS]; + odp_atomic_u64_t lock[CONFIG_QUEUE_MAX_ORD_LOCKS];
-} order_context_t ODP_ALIGNED_CACHE; +} order_context_t;
typedef struct { odp_shm_t selfie; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 7f0404b1..017eaee3 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -61,20 +61,20 @@ struct sched_cmd_s { int pktin_idx[NUM_PKTIN]; };
-typedef struct sched_cmd_t { +typedef struct ODP_ALIGNED_CACHE sched_cmd_t { struct sched_cmd_s s; uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct sched_cmd_s)) - sizeof(struct sched_cmd_s)]; -} sched_cmd_t ODP_ALIGNED_CACHE; +} sched_cmd_t;
-typedef struct { +typedef struct ODP_ALIGNED_CACHE { /* Ring header */ ring_t ring;
/* Ring data: queue indexes */ uint32_t ring_idx[RING_SIZE];
-} prio_queue_t ODP_ALIGNED_CACHE; +} prio_queue_t;
typedef struct thr_group_t { /* A generation counter for fast comparison if groups have changed */ @@ -88,7 +88,7 @@ typedef struct thr_group_t {
} thr_group_t;
-typedef struct sched_group_t { +typedef struct ODP_ALIGNED_CACHE sched_group_t { struct { odp_ticketlock_t lock;
@@ -104,7 +104,7 @@ typedef struct sched_group_t {
} s;
-} sched_group_t ODP_ALIGNED_CACHE; +} sched_group_t;
typedef struct { sched_cmd_t queue_cmd[NUM_QUEUE]; diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 72f9505d..bdb25c60 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -98,7 +98,11 @@ static odp_timeout_hdr_t *timeout_hdr(odp_timeout_t tmo) * odp_timer abstract datatype *****************************************************************************/
-typedef struct tick_buf_s { +typedef struct +#ifdef ODP_ATOMIC_U128 +ODP_ALIGNED(16) /* 16-byte atomic operations need properly aligned addresses */ +#endif +tick_buf_s { #if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 /* No atomics support for 64-bit variables, will use separate lock */ /* Use the same layout as odp_atomic_u64_t but without lock variable */ @@ -112,11 +116,7 @@ typedef struct tick_buf_s { #ifdef TB_NEEDS_PAD uint32_t pad;/* Need to be able to access padding for successful CAS */ #endif -} tick_buf_t -#ifdef ODP_ATOMIC_U128 -ODP_ALIGNED(16) /* 16-byte atomic operations need properly aligned addresses */ -#endif -; +} tick_buf_t;
#if __GCC_ATOMIC_LLONG_LOCK_FREE >= 2 /* Only assert this when we perform atomic operations on tick_buf_t */ diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index ac764b3a..b8348677 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -61,9 +61,10 @@ static int set_pkt_sock_fanout_mmap(pkt_sock_mmap_t *const pkt_sock,
union frame_map { struct { - struct tpacket2_hdr tp_h ODP_ALIGNED(TPACKET_ALIGNMENT); - struct sockaddr_ll s_ll - ODP_ALIGNED(TPACKET_ALIGN(sizeof(struct tpacket2_hdr))); + struct tpacket2_hdr ODP_ALIGNED(TPACKET_ALIGNMENT) tp_h; + struct sockaddr_ll + ODP_ALIGNED(TPACKET_ALIGN(sizeof(struct tpacket2_hdr))) + s_ll; } *v2;
void *raw; diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 2353e241..09a12b05 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -123,7 +123,7 @@ static void sig_handler(int signo ODP_UNUSED) /** * Statistics */ -typedef union { +typedef union ODP_ALIGNED_CACHE { struct { /** Number of forwarded packets */ uint64_t packets; @@ -134,7 +134,7 @@ typedef union { } s;
uint8_t padding[ODP_CACHE_LINE_SIZE]; -} stats_t ODP_ALIGNED_CACHE; +} stats_t;
/** * Thread specific data diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index 2248eb2f..db9bfe76 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -179,7 +179,7 @@ ODP_STATIC_ASSERT(sizeof(flow_t) <= PKT_UAREA_SIZE, /** * Statistics */ -typedef union { +typedef union ODP_ALIGNED_CACHE { struct { /** Number of forwarded packets */ uint64_t packets; @@ -192,7 +192,7 @@ typedef union { } s;
uint8_t padding[ODP_CACHE_LINE_SIZE]; -} stats_t ODP_ALIGNED_CACHE; +} stats_t;
/** * IPv4 5-tuple diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c index fc286051..ae7a5914 100644 --- a/test/performance/odp_sched_latency.c +++ b/test/performance/odp_sched_latency.c @@ -97,11 +97,11 @@ typedef struct { } test_stat_t;
/** Performance test statistics (per core) */ -typedef union { +typedef union ODP_ALIGNED_CACHE { test_stat_t prio[NUM_PRIOS]; /**< Test statistics per priority */
uint8_t pad[CACHE_ALIGN_ROUNDUP(NUM_PRIOS * sizeof(test_stat_t))]; -} core_stat_t ODP_ALIGNED_CACHE; +} core_stat_t;
/** Test global variables */ typedef struct { diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index 03078a5b..8d2574b7 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -55,12 +55,12 @@ typedef struct { int fairness; /**< Check fairness */ } test_args_t;
-typedef struct { +typedef struct ODP_ALIGNED_CACHE { uint64_t num_ev;
/* Round up the struct size to cache line size */ uint8_t pad[ODP_CACHE_LINE_SIZE - sizeof(uint64_t)]; -} queue_context_t ODP_ALIGNED_CACHE; +} queue_context_t;
/** Test global variables */ typedef struct { diff --git a/test/validation/api/chksum/chksum.c b/test/validation/api/chksum/chksum.c index de98b74a..f8687955 100644 --- a/test/validation/api/chksum/chksum.c +++ b/test/validation/api/chksum/chksum.c @@ -14,7 +14,7 @@ #define NUM_UDP 4 #define MAX_UDP_LEN 128
-static uint8_t ip_hdr_test_vect[NUM_IP_HDR][IP_HDR_LEN] ODP_ALIGNED(4) = { +static uint8_t ODP_ALIGNED(4) ip_hdr_test_vect[NUM_IP_HDR][IP_HDR_LEN] = { { 0x45, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, 0xAB, 0x33, 0xC0, 0xA8, 0x2C, 0xA2, 0xC0, 0xA8, 0x21, 0x99 }, @@ -38,7 +38,7 @@ struct udp_test_vect_s { uint8_t data[MAX_UDP_LEN]; };
-static struct udp_test_vect_s udp_test_vect[NUM_UDP] ODP_ALIGNED(4) = { +static struct udp_test_vect_s ODP_ALIGNED(4) udp_test_vect[NUM_UDP] = { {.len = 38, .data = { 0x00, 0x11, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x1A, 0xFF, 0x3C, @@ -86,7 +86,7 @@ static struct udp_test_vect_s udp_test_vect[NUM_UDP] ODP_ALIGNED(4) = { /* Long UDP packet with pseudo header. Checksum field is set to zero. * The array contains padding, so that a possible overrun is more likely * detected (overrun bytes are not all zeros). */ -static uint8_t udp_test_vect_long[] ODP_ALIGNED(4) = { +static uint8_t ODP_ALIGNED(4) udp_test_vect_long[] = { 0x00, 0x11, 0x05, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x3F, 0x05, 0xED, 0x00, 0x00, 0x0B, 0x2C, 0x9C, 0x06, 0x07, 0xF3, 0x51, 0x05, 0xF7, 0xA7,
commit ccb6eb85729ad0657b5c852cb2a6ddb519d60898 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Thu Jan 18 19:03:20 2018 +0300
checkpatch.pl: do not warn on odp aligh macros
do not if structure has ODP_ preprocessor macro. ERROR: open brace '{' following function declarations go on the next line static uint8_t ODP_ALIGNED(4) ip_hdr_test_vect[NUM_IP_HDR][IP_HDR_LEN] = {
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 16316b92..d366f257 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3411,6 +3411,7 @@ sub process { # function brace can't be on same line, except for #defines of do while, # or if closed on same line if (($line=~/$Type\s*$Ident(.*).*\s*{/) and + !($line=~/ODP_/) and !($line=~/#\s*define.*do\s{/) and !($line=~/}/)) { if (ERROR("OPEN_BRACE", "open brace '{' following function declarations go on the next line\n" . $herecurr) &&
commit f3b6be23045a924b8d8034a9a490b4fe5928684e Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Jan 9 11:13:54 2018 +0300
include: move visibility headers to generic place
There was an idea that platform might override visibility headers in platform-specific way. For the sake of providing full set of headers for ABI-compatibile case, move those headers to include/ dir. Platform can still override those headers when compiling in non-ABI-compatibile mode.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/Makefile.inc b/Makefile.inc index 1610e274..c887b2ee 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,5 +1,4 @@ ODP_INCLUDES = \ - -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/include
@@ -8,6 +7,7 @@ ODP_INCLUDES += \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ else ODP_INCLUDES += \ + -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_srcdir)/platform/@with_platform@/include-abi endif diff --git a/include/Makefile.am b/include/Makefile.am index d463b6d7..c3452ef3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,6 +2,11 @@ include_HEADERS = \ odp.h \ odp_api.h
+odpincludedir= $(includedir)/odp +odpinclude_HEADERS = \ + odp/visibility_begin.h \ + odp/visibility_end.h + odpapiincludedir= $(includedir)/odp/api/ odpapiinclude_HEADERS = \ odp/api/align.h \ diff --git a/platform/linux-generic/include/odp/visibility_begin.h b/include/odp/visibility_begin.h similarity index 100% rename from platform/linux-generic/include/odp/visibility_begin.h rename to include/odp/visibility_begin.h diff --git a/platform/linux-generic/include/odp/visibility_end.h b/include/odp/visibility_end.h similarity index 100% rename from platform/linux-generic/include/odp/visibility_end.h rename to include/odp/visibility_end.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ecc56088..9b7ee37e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -4,6 +4,7 @@ include $(top_srcdir)/platform/Makefile.inc
AM_CPPFLAGS = $(ODP_INCLUDES) +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/include AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/@ARCH_DIR@ AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default @@ -18,11 +19,6 @@ AM_CFLAGS += -msse4.2 endif endif
-odpincludedir= $(includedir)/odp -odpinclude_HEADERS = \ - include/odp/visibility_begin.h \ - include/odp/visibility_end.h - if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 8287c7e0..edaf4510 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -7,3 +7,6 @@ ring_main_SOURCES = \ ring_basic.c ring_stress.c
PRELDADD += $(LIBCUNIT_COMMON) + +AM_CPPFLAGS += \ + -I$(top_srcdir)/platform/linux-generic/include
commit d4ad3409a51f94df403e0ae27e25baab2b0a1bf4 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Oct 26 16:23:27 2017 +0300
include: provide formal description of ODP specification
Provide formal description of files being part of ODP specification, platform-specific headers, substituting parts of ODP specification and additional headers supplementing ODP specification.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/README b/include/README new file mode 100644 index 00000000..c8abb689 --- /dev/null +++ b/include/README @@ -0,0 +1,79 @@ +ODP specification +================= + +ODP specification consists of several types of files, which together provide +full list of types, values and functions that ODP implementation MUST provide. + +ODP API specification +--------------------- + +These are the files from `include/odp/api/spec` directory. They specify a set +of function prototypes, types, type names, enumerations etc that MUST be +provided by ODP implementation. Doxygen comments inside these files document +requirements for ABI interface provided by an implementation. Content of some +types and value of some enumerations are left undefined in API spec. These are +defined either in ABI spec or implementation specific (non-ABI compatible) +headers .An implementation MUST use these headers AS IS, without any +modifications to be compatible with ODP specification. + +ODP ABI compatibility specification +----------------------------------- + +These are the files from `include/odp/arch/@ARCH_ABI@/odp/api/abi/` directory. +They specify a set of types and values that MUST be used AS IS without any +modifications by an implementation if it supports and is compiled for +ABI-compatibility mode. + +ODP default ABI headers +----------------------- + +These are the files from `include/odp/api/abi-default` directory. They provide +default specification for ODP types and values for ABI compatibility. CPU +architecture specific ABI compatibility files heavily depend on these headers. +These files MUST NOT be changed by an implementation. + +odp_api.h header +---------------- + +This header found at `include/odp_api.h` is an entry point for an application. +Application MUST include only odp_api.h, nothing else. This file includes all +files from ODP specification. + +Additional ODP headers +====================== + +These are the headers provided by an ODP to supplement ODP specification. + +ODP API headers +--------------- + +These are the files from `include/odp/api` directory. They glue together API +and ABI specification headers. Although they are not part of ODP specification +itself, they provide an easy way for an implementation to use ODP API/ABI +header files. An implementation SHOULD use these headers AS IS unless it has +strong reason not to do so. + +Platform-specific headers +========================= + +Platform ABI headers +-------------------- + +These are the headers found at +`platform/@with_platform@/include-abi/odp/api/abi` directory. They are used by +the rest of ODP code if implementation is compiled with ABI compatibility +disabled. They should implement at least a set of types and values documented +in ODP API specification headers. They are permitted to provide any platform +specific optimizations (i.e. they might provide types and/or values that map +directly onto the hardware details, they might provide inline functions to +speed up execution of the application, etc). These headers MAY use ODP default +ABI headers if they do fit. + +Rest of platform-specific headers +--------------------------------- + +Platform MAY provide additional headers at `platform/@with_platform/include`. +However these headers SHOULD NOT be used directly by an application, because +this will tie it to the exact implementation details. Application MUST include +only <odp_api.h> header. Platform ABI headers MAY use these headers to +implement platform-specific optimizations.
commit 2bbecec83bc1d8ca1b45f98214d2dbbe13950e25 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sat Dec 30 03:44:34 2017 +0300
include: inline compiler.h spec
compiler.h header contains one internal definition used only in platform-optimized headers. This definition, being internal, is not a part of the specification, so let's merge it into linux-gen plat file and drop compiler.h headers.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 9e88bbca..d463b6d7 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -11,7 +11,6 @@ odpapiinclude_HEADERS = \ odp/api/byteorder.h \ odp/api/chksum.h \ odp/api/classification.h \ - odp/api/compiler.h \ odp/api/cpu.h \ odp/api/cpumask.h \ odp/api/crypto.h \ @@ -61,7 +60,6 @@ odpapispecinclude_HEADERS = \ odp/api/spec/byteorder.h \ odp/api/spec/chksum.h \ odp/api/spec/classification.h \ - odp/api/spec/compiler.h \ odp/api/spec/cpu.h \ odp/api/spec/cpumask.h \ odp/api/spec/crypto.h \ diff --git a/include/odp/api/compiler.h b/include/odp/api/compiler.h deleted file mode 100644 index 04e815bb..00000000 --- a/include/odp/api/compiler.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Compiler related - */ - -#ifndef ODP_API_COMPILER_H_ -#define ODP_API_COMPILER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/spec/compiler.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/include/odp/api/spec/compiler.h b/include/odp/api/spec/compiler.h deleted file mode 100644 index 443607fb..00000000 --- a/include/odp/api/spec/compiler.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * Compiler related - */ - -#ifndef ODP_API_SPEC_COMPILER_H_ -#define ODP_API_SPEC_COMPILER_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odp_compiler_optim - * Macro for old compilers - * @{ - */ - -/** @internal GNU compiler version */ -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -/** - * @internal - * Compiler __builtin_bswap16() is not available on all platforms - * until GCC 4.8.0 - work around this by offering __odp_builtin_bswap16() - * Don't use this function directly, instead see odp_byteorder.h - */ -#if GCC_VERSION < 40800 -#define __odp_builtin_bswap16(u16) ((((u16)&0x00ff) << 8)|(((u16)&0xff00) >> 8)) -#else -#define __odp_builtin_bswap16(u16) __builtin_bswap16(u16) -#endif - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/include/odp_api.h b/include/odp_api.h index 069ec9d1..51558d6b 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -21,7 +21,6 @@ extern "C" { #include <odp/api/deprecated.h> #include <odp/api/version.h> #include <odp/api/std_types.h> -#include <odp/api/compiler.h> #include <odp/api/align.h> #include <odp/api/hash.h> #include <odp/api/chksum.h> diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h index 6f313962..2f96863b 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h @@ -21,12 +21,28 @@ extern "C" { #define __odp_force #endif
-#include <odp/api/compiler.h> - /** @ingroup odp_compiler_optim * @{ */
+/** @internal GNU compiler version */ +#define GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) + +/** + * @internal + * Compiler __builtin_bswap16() is not available on all platforms + * until GCC 4.8.0 - work around this by offering __odp_builtin_bswap16() + * Don't use this function directly, instead see odp_byteorder.h + */ +#if GCC_VERSION < 40800 +#define __odp_builtin_bswap16(u16) ((((u16)&0x00ff) << 8) | \ + (((u16)&0xff00) >> 8)) +#else +#define __odp_builtin_bswap16(u16) __builtin_bswap16(u16) +#endif + _ODP_INLINE uint16_t odp_be_to_cpu_16(odp_u16be_t be16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN
commit db250be8b7363b24708ebc9476aa26fe1754d3c0 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Mon Oct 23 09:51:21 2017 +0300
configure: stop AC_SUBST'ing ODP_ABI_COMPAT
With static_inline.h gone, there is no need to AC_SUBST([ODP_ABI_COMPAT]). Drop it from configure.ac.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/configure.ac b/configure.ac index 31e798b0..0c8799f1 100644 --- a/configure.ac +++ b/configure.ac @@ -279,7 +279,6 @@ AC_ARG_ENABLE([abi-compat], #if there is no ABI compatibility the .so numbers are meaningless ODP_LIBSO_VERSION=0:0:0 fi]) -AC_SUBST(ODP_ABI_COMPAT) AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"])
##########################################################################
commit 39730f7e46405a44abee01532547fed530c6f906 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 15:45:30 2017 +0300
linux-gen: don't install inline headers in ABI-compat mode
There is no point in installing inline headers in ABI-compat mode anymore. They are not included by any other header.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0445a72d..ecc56088 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -23,6 +23,7 @@ odpinclude_HEADERS = \ include/odp/visibility_begin.h \ include/odp/visibility_end.h
+if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ @@ -39,7 +40,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h
-if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/align.h \
commit 2c92ee7ef4198ba7b7ab67cf079c2262e70414d2 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Mon Oct 23 01:02:59 2017 +0300
linux-gen: remove static_inline.h header
Replace static_inline.h header with unconditional defines of _ODP_INLINE macro (either to 'static inline' or to empty value) depending on the compilation place.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/Makefile.inc b/Makefile.inc index 12ee3bab..1610e274 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,5 +1,4 @@ ODP_INCLUDES = \ - -I$(top_builddir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/include diff --git a/platform/linux-generic/.gitignore b/platform/linux-generic/.gitignore index 442e82a9..fd5ade7e 100644 --- a/platform/linux-generic/.gitignore +++ b/platform/linux-generic/.gitignore @@ -1,2 +1 @@ -include/odp/api/plat/static_inline.h libodp-linux.pc diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index aa1bc6a8..0445a72d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -39,9 +39,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h
-nodist_odpapiplatinclude_HEADERS = \ - include/odp/api/plat/static_inline.h - if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/atomic.h b/platform/linux-generic/include-abi/odp/api/abi/atomic.h index 0b7b254c..67127aa4 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/atomic.h +++ b/platform/linux-generic/include-abi/odp/api/abi/atomic.h @@ -63,7 +63,7 @@ typedef struct odp_atomic_u32_s odp_atomic_u32_t; * @{ */
-#include <odp/api/plat/static_inline.h> +#define _ODP_INLINE static inline #include <odp/api/plat/atomic_inlines.h>
/** diff --git a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h index 0f8fac0b..da07c0eb 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h +++ b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h @@ -75,7 +75,7 @@ typedef uint64_t __odp_bitwise odp_u64be_t; typedef uint16_t __odp_bitwise odp_u16sum_t; typedef uint32_t __odp_bitwise odp_u32sum_t;
-#include <odp/api/plat/static_inline.h> +#define _ODP_INLINE static inline #include <odp/api/plat/byteorder_inlines.h>
/** diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index 31d446f8..1aa7cbd5 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -32,6 +32,9 @@ typedef ODP_HANDLE_T(odp_packet_t);
typedef uint8_t odp_packet_seg_t;
+/* or it will be provided by packet_inlines.h */ +#define _ODP_HAVE_PACKET_SEG_NDX 1 + static inline uint8_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) { return (uint8_t)seg; @@ -53,7 +56,7 @@ typedef enum {
#define ODP_NUM_PACKET_COLORS 3
-#include <odp/api/plat/static_inline.h> +#define _ODP_INLINE static inline #include <odp/api/plat/packet_inlines.h> #include <odp/api/plat/packet_inlines_api.h>
diff --git a/platform/linux-generic/include-abi/odp/api/abi/std_clib.h b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h index b31034df..8ef9e9ad 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/std_clib.h +++ b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h @@ -17,7 +17,7 @@ extern "C" { #endif
-#include <odp/api/plat/static_inline.h> +#define _ODP_INLINE static inline #include <odp/api/plat/std_clib_inlines.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include-abi/odp/api/abi/sync.h b/platform/linux-generic/include-abi/odp/api/abi/sync.h index 74e3fb15..9ecc40f2 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/sync.h +++ b/platform/linux-generic/include-abi/odp/api/abi/sync.h @@ -21,7 +21,7 @@ extern "C" { * @{ */
-#include <odp/api/plat/static_inline.h> +#define _ODP_INLINE static inline #include <odp/api/plat/sync_inlines.h>
/** diff --git a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h index cf3c2f77..f6600988 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h @@ -30,7 +30,7 @@ typedef struct odp_ticketlock_s { } odp_ticketlock_t;
/* Include inlined versions of API functions */ -#include <odp/api/plat/static_inline.h> +#define _ODP_INLINE static inline #include <odp/api/plat/ticketlock_inlines.h> #include <odp/api/plat/ticketlock_inlines_api.h>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 95e0fe42..fb9c524f 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -34,8 +34,7 @@ extern const _odp_packet_inline_offset_t _odp_packet_inline; /** @internal Pool inline function offsets */ extern const _odp_pool_inline_offset_t _odp_pool_inline;
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 +#ifndef _ODP_HAVE_PACKET_SEG_NDX #include <odp/api/plat/strong_types.h> /** @internal Inline function @param seg @return */ static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) diff --git a/platform/linux-generic/include/odp/api/plat/static_inline.h.in b/platform/linux-generic/include/odp/api/plat/static_inline.h.in deleted file mode 100644 index 3cf00434..00000000 --- a/platform/linux-generic/include/odp/api/plat/static_inline.h.in +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Macro for static inline functions - */ - -#ifndef ODP_PLAT_STATIC_INLINE_H_ -#define ODP_PLAT_STATIC_INLINE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @internal - * @def ODP_ABI_COMPAT - * Control ABI compatibility - */ - -/** - * @internal - * @def _ODP_INLINE - * Define a function as inlined or not inlined (for ABI compatibility) - */ -#if @ODP_ABI_COMPAT@ -#define ODP_ABI_COMPAT 1 -#define _ODP_INLINE -#else -#define ODP_ABI_COMPAT 0 -#define _ODP_INLINE static inline -#endif - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 5d7ad35a..08ea1a33 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -18,7 +18,6 @@ AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], [test "${with_platform}" = "linux-generic"]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc - platform/linux-generic/include/odp/api/plat/static_inline.h platform/linux-generic/test/Makefile platform/linux-generic/test/validation/api/shmem/Makefile platform/linux-generic/test/validation/api/pktio/Makefile
commit d35f27a2c613e5fa66a6d854b662b435f0e4f402 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Mon Oct 23 10:27:40 2017 +0300
linux-gen: split odp_packet/odp_packet_flags
Split away inclusion of API implementation to the files selected by Automake.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 3dc7bbc8..aa1bc6a8 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -206,6 +206,8 @@ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ odp_byteorder.c \ + odp_packet_api.c \ + odp_packet_flags_api.c \ odp_std_clib.c \ odp_sync.c \ odp_ticketlock.c diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index a72049e3..bd9e77c0 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2538,8 +2538,3 @@ int odp_packet_has_ref(odp_packet_t pkt)
return 0; } - -/* Include non-inlined versions of API functions */ -#if ODP_ABI_COMPAT == 1 -#include <odp/api/plat/packet_inlines_api.h> -#endif diff --git a/platform/linux-generic/odp_packet_api.c b/platform/linux-generic/odp_packet_api.c new file mode 100644 index 00000000..dd038e81 --- /dev/null +++ b/platform/linux-generic/odp_packet_api.c @@ -0,0 +1,28 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/packet.h> +#include <odp/api/plat/packet_inlines.h> +#include <odp_packet_internal.h> +#include <odp_debug_internal.h> +#include <odp/api/hints.h> +#include <odp/api/byteorder.h> + +#include <protocols/eth.h> +#include <protocols/ip.h> +#include <protocols/tcp.h> +#include <protocols/udp.h> + +#include <errno.h> +#include <string.h> +#include <stdio.h> +#include <inttypes.h> + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE +#include <odp/api/plat/packet_inlines_api.h> diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index 2e26ad60..96507c66 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -299,8 +299,3 @@ void odp_packet_has_ts_clr(odp_packet_t pkt)
pkt_hdr->p.input_flags.timestamp = 0; } - -/* Include non-inlined versions of API functions */ -#if ODP_ABI_COMPAT == 1 -#include <odp/api/plat/packet_flag_inlines_api.h> -#endif diff --git a/platform/linux-generic/odp_packet_flags_api.c b/platform/linux-generic/odp_packet_flags_api.c new file mode 100644 index 00000000..6b373843 --- /dev/null +++ b/platform/linux-generic/odp_packet_flags_api.c @@ -0,0 +1,15 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/plat/packet_flag_inlines.h> +#include <odp/api/packet_flags.h> +#include <odp_packet_internal.h> + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE +#include <odp/api/plat/packet_flag_inlines_api.h>
commit db2587a9a5ade3e9ad3f4e3355db2d4639e100b0 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Mon Oct 23 09:49:43 2017 +0300
linux-gen: move several files under ODP_ABI_COMPAT condition
Several files consist only (or mostly) of functions compiled only if ODP is compiled in ABI compatibility mode. Instead of having an ifdef inside, guard them with if ODP_ABI_COMPAT condition in Makefile.am
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 63aaa08b..3dc7bbc8 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -145,7 +145,6 @@ __LIB__libodp_linux_la_SOURCES = \ odp_barrier.c \ odp_bitmap.c \ odp_buffer.c \ - odp_byteorder.c \ odp_chksum.c \ odp_classification.c \ odp_cpu.c \ @@ -193,12 +192,9 @@ __LIB__libodp_linux_la_SOURCES = \ odp_sorted_list.c \ odp_spinlock.c \ odp_spinlock_recursive.c \ - odp_std_clib.c \ - odp_sync.c \ odp_system_info.c \ odp_thread.c \ odp_thrmask.c \ - odp_ticketlock.c \ odp_time.c \ odp_timer.c \ odp_timer_wheel.c \ @@ -206,6 +202,15 @@ __LIB__libodp_linux_la_SOURCES = \ odp_version.c \ odp_weak.c
+if ODP_ABI_COMPAT +__LIB__libodp_linux_la_SOURCES += \ + odp_atomic_api.c \ + odp_byteorder.c \ + odp_std_clib.c \ + odp_sync.c \ + odp_ticketlock.c +endif + if ARCH_IS_ARM __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h index 5efe696f..4f850956 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h @@ -33,4 +33,10 @@ _ODP_INLINE int odp_ticketlock_is_locked(odp_ticketlock_t *lock) return _odp_ticketlock_is_locked(lock); }
+_ODP_INLINE void odp_ticketlock_init(odp_ticketlock_t *ticketlock) +{ + odp_atomic_init_u32(&ticketlock->next_ticket, 0); + odp_atomic_init_u32(&ticketlock->cur_ticket, 0); +} + #endif diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c index 1d76caf2..8c46bb5b 100644 --- a/platform/linux-generic/odp_atomic.c +++ b/platform/linux-generic/odp_atomic.c @@ -7,10 +7,6 @@ #include "config.h"
#include <odp/api/atomic.h> -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/plat/atomic_inlines.h> -#endif
int odp_atomic_lock_free_u64(odp_atomic_op_t *atomic_op) { diff --git a/platform/linux-generic/odp_atomic_api.c b/platform/linux-generic/odp_atomic_api.c new file mode 100644 index 00000000..a1aabb07 --- /dev/null +++ b/platform/linux-generic/odp_atomic_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/atomic.h> + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE +#include <odp/api/plat/atomic_inlines.h> diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder.c index faf1c590..ff0b74b2 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder.c @@ -7,7 +7,7 @@ #include "config.h"
#include <odp/api/byteorder.h> -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE #include <odp/api/plat/byteorder_inlines.h> -#endif diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib.c index 38406b86..b267ea65 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib.c @@ -7,7 +7,7 @@ #include "config.h"
#include <odp/api/std_clib.h> -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE #include <odp/api/plat/std_clib_inlines.h> -#endif diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync.c index a9d2bbe2..b9e85593 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync.c @@ -7,7 +7,7 @@ #include "config.h"
#include <odp/api/sync.h> -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE #include <odp/api/plat/sync_inlines.h> -#endif diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c index 59431620..63381f44 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock.c @@ -10,14 +10,6 @@
#include <odp/api/plat/ticketlock_inlines.h>
-void odp_ticketlock_init(odp_ticketlock_t *ticketlock) -{ - odp_atomic_init_u32(&ticketlock->next_ticket, 0); - odp_atomic_init_u32(&ticketlock->cur_ticket, 0); -} - /* Include non-inlined versions of API functions */ -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 +#define _ODP_INLINE #include <odp/api/plat/ticketlock_inlines_api.h> -#endif
commit 0f628d448a0055cfff6ea759790c60520bbff6b8 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Nov 23 02:23:15 2017 +0300
include, linux-gen: move API files into generic location
Now that api header files consist only of generic includes, move them to generic locations, so that they can be reused by implementations.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index e11ed0fa..9e88bbca 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,6 +2,56 @@ include_HEADERS = \ odp.h \ odp_api.h
+odpapiincludedir= $(includedir)/odp/api/ +odpapiinclude_HEADERS = \ + odp/api/align.h \ + odp/api/atomic.h \ + odp/api/barrier.h \ + odp/api/buffer.h \ + odp/api/byteorder.h \ + odp/api/chksum.h \ + odp/api/classification.h \ + odp/api/compiler.h \ + odp/api/cpu.h \ + odp/api/cpumask.h \ + odp/api/crypto.h \ + odp/api/debug.h \ + odp/api/deprecated.h \ + odp/api/errno.h \ + odp/api/event.h \ + odp/api/feature.h \ + odp/api/hash.h \ + odp/api/hints.h \ + odp/api/init.h \ + odp/api/ipsec.h \ + odp/api/packet.h \ + odp/api/packet_flags.h \ + odp/api/packet_io.h \ + odp/api/packet_io_stats.h \ + odp/api/pool.h \ + odp/api/queue.h \ + odp/api/random.h \ + odp/api/rwlock.h \ + odp/api/rwlock_recursive.h \ + odp/api/schedule.h \ + odp/api/schedule_types.h \ + odp/api/shared_memory.h \ + odp/api/spinlock.h \ + odp/api/spinlock_recursive.h \ + odp/api/std_clib.h \ + odp/api/std_types.h \ + odp/api/support.h \ + odp/api/sync.h \ + odp/api/system_info.h \ + odp/api/thread.h \ + odp/api/threshold.h \ + odp/api/thrmask.h \ + odp/api/ticketlock.h \ + odp/api/time.h \ + odp/api/timer.h \ + odp/api/traffic_mngr.h \ + odp/api/version.h + odpapispecincludedir= $(includedir)/odp/api/spec odpapispecinclude_HEADERS = \ odp/api/spec/align.h \ diff --git a/platform/linux-generic/include/odp/api/align.h b/include/odp/api/align.h similarity index 100% rename from platform/linux-generic/include/odp/api/align.h rename to include/odp/api/align.h diff --git a/platform/linux-generic/include/odp/api/atomic.h b/include/odp/api/atomic.h similarity index 100% rename from platform/linux-generic/include/odp/api/atomic.h rename to include/odp/api/atomic.h diff --git a/platform/linux-generic/include/odp/api/barrier.h b/include/odp/api/barrier.h similarity index 100% rename from platform/linux-generic/include/odp/api/barrier.h rename to include/odp/api/barrier.h diff --git a/platform/linux-generic/include/odp/api/buffer.h b/include/odp/api/buffer.h similarity index 100% rename from platform/linux-generic/include/odp/api/buffer.h rename to include/odp/api/buffer.h diff --git a/platform/linux-generic/include/odp/api/byteorder.h b/include/odp/api/byteorder.h similarity index 100% rename from platform/linux-generic/include/odp/api/byteorder.h rename to include/odp/api/byteorder.h diff --git a/platform/linux-generic/include/odp/api/chksum.h b/include/odp/api/chksum.h similarity index 100% rename from platform/linux-generic/include/odp/api/chksum.h rename to include/odp/api/chksum.h diff --git a/platform/linux-generic/include/odp/api/classification.h b/include/odp/api/classification.h similarity index 100% rename from platform/linux-generic/include/odp/api/classification.h rename to include/odp/api/classification.h diff --git a/platform/linux-generic/include/odp/api/compiler.h b/include/odp/api/compiler.h similarity index 100% rename from platform/linux-generic/include/odp/api/compiler.h rename to include/odp/api/compiler.h diff --git a/platform/linux-generic/include/odp/api/cpu.h b/include/odp/api/cpu.h similarity index 100% rename from platform/linux-generic/include/odp/api/cpu.h rename to include/odp/api/cpu.h diff --git a/platform/linux-generic/include/odp/api/cpumask.h b/include/odp/api/cpumask.h similarity index 100% rename from platform/linux-generic/include/odp/api/cpumask.h rename to include/odp/api/cpumask.h diff --git a/platform/linux-generic/include/odp/api/crypto.h b/include/odp/api/crypto.h similarity index 100% rename from platform/linux-generic/include/odp/api/crypto.h rename to include/odp/api/crypto.h diff --git a/platform/linux-generic/include/odp/api/debug.h b/include/odp/api/debug.h similarity index 100% rename from platform/linux-generic/include/odp/api/debug.h rename to include/odp/api/debug.h diff --git a/platform/linux-generic/include/odp/api/deprecated.h b/include/odp/api/deprecated.h similarity index 100% rename from platform/linux-generic/include/odp/api/deprecated.h rename to include/odp/api/deprecated.h diff --git a/platform/linux-generic/include/odp/api/errno.h b/include/odp/api/errno.h similarity index 100% rename from platform/linux-generic/include/odp/api/errno.h rename to include/odp/api/errno.h diff --git a/platform/linux-generic/include/odp/api/event.h b/include/odp/api/event.h similarity index 100% rename from platform/linux-generic/include/odp/api/event.h rename to include/odp/api/event.h diff --git a/platform/linux-generic/include/odp/api/feature.h b/include/odp/api/feature.h similarity index 100% rename from platform/linux-generic/include/odp/api/feature.h rename to include/odp/api/feature.h diff --git a/platform/linux-generic/include/odp/api/hash.h b/include/odp/api/hash.h similarity index 100% rename from platform/linux-generic/include/odp/api/hash.h rename to include/odp/api/hash.h diff --git a/platform/linux-generic/include/odp/api/hints.h b/include/odp/api/hints.h similarity index 100% rename from platform/linux-generic/include/odp/api/hints.h rename to include/odp/api/hints.h diff --git a/platform/linux-generic/include/odp/api/init.h b/include/odp/api/init.h similarity index 100% rename from platform/linux-generic/include/odp/api/init.h rename to include/odp/api/init.h diff --git a/platform/linux-generic/include/odp/api/ipsec.h b/include/odp/api/ipsec.h similarity index 100% rename from platform/linux-generic/include/odp/api/ipsec.h rename to include/odp/api/ipsec.h diff --git a/platform/linux-generic/include/odp/api/packet.h b/include/odp/api/packet.h similarity index 100% rename from platform/linux-generic/include/odp/api/packet.h rename to include/odp/api/packet.h diff --git a/platform/linux-generic/include/odp/api/packet_flags.h b/include/odp/api/packet_flags.h similarity index 100% rename from platform/linux-generic/include/odp/api/packet_flags.h rename to include/odp/api/packet_flags.h diff --git a/platform/linux-generic/include/odp/api/packet_io.h b/include/odp/api/packet_io.h similarity index 100% rename from platform/linux-generic/include/odp/api/packet_io.h rename to include/odp/api/packet_io.h diff --git a/platform/linux-generic/include/odp/api/packet_io_stats.h b/include/odp/api/packet_io_stats.h similarity index 100% rename from platform/linux-generic/include/odp/api/packet_io_stats.h rename to include/odp/api/packet_io_stats.h diff --git a/platform/linux-generic/include/odp/api/pool.h b/include/odp/api/pool.h similarity index 100% rename from platform/linux-generic/include/odp/api/pool.h rename to include/odp/api/pool.h diff --git a/platform/linux-generic/include/odp/api/queue.h b/include/odp/api/queue.h similarity index 100% rename from platform/linux-generic/include/odp/api/queue.h rename to include/odp/api/queue.h diff --git a/platform/linux-generic/include/odp/api/random.h b/include/odp/api/random.h similarity index 100% rename from platform/linux-generic/include/odp/api/random.h rename to include/odp/api/random.h diff --git a/platform/linux-generic/include/odp/api/rwlock.h b/include/odp/api/rwlock.h similarity index 100% rename from platform/linux-generic/include/odp/api/rwlock.h rename to include/odp/api/rwlock.h diff --git a/platform/linux-generic/include/odp/api/rwlock_recursive.h b/include/odp/api/rwlock_recursive.h similarity index 100% rename from platform/linux-generic/include/odp/api/rwlock_recursive.h rename to include/odp/api/rwlock_recursive.h diff --git a/platform/linux-generic/include/odp/api/schedule.h b/include/odp/api/schedule.h similarity index 100% rename from platform/linux-generic/include/odp/api/schedule.h rename to include/odp/api/schedule.h diff --git a/platform/linux-generic/include/odp/api/schedule_types.h b/include/odp/api/schedule_types.h similarity index 100% rename from platform/linux-generic/include/odp/api/schedule_types.h rename to include/odp/api/schedule_types.h diff --git a/platform/linux-generic/include/odp/api/shared_memory.h b/include/odp/api/shared_memory.h similarity index 100% rename from platform/linux-generic/include/odp/api/shared_memory.h rename to include/odp/api/shared_memory.h diff --git a/platform/linux-generic/include/odp/api/spinlock.h b/include/odp/api/spinlock.h similarity index 100% rename from platform/linux-generic/include/odp/api/spinlock.h rename to include/odp/api/spinlock.h diff --git a/platform/linux-generic/include/odp/api/spinlock_recursive.h b/include/odp/api/spinlock_recursive.h similarity index 100% rename from platform/linux-generic/include/odp/api/spinlock_recursive.h rename to include/odp/api/spinlock_recursive.h diff --git a/platform/linux-generic/include/odp/api/std_clib.h b/include/odp/api/std_clib.h similarity index 100% rename from platform/linux-generic/include/odp/api/std_clib.h rename to include/odp/api/std_clib.h diff --git a/platform/linux-generic/include/odp/api/std_types.h b/include/odp/api/std_types.h similarity index 100% rename from platform/linux-generic/include/odp/api/std_types.h rename to include/odp/api/std_types.h diff --git a/platform/linux-generic/include/odp/api/support.h b/include/odp/api/support.h similarity index 100% rename from platform/linux-generic/include/odp/api/support.h rename to include/odp/api/support.h diff --git a/platform/linux-generic/include/odp/api/sync.h b/include/odp/api/sync.h similarity index 100% rename from platform/linux-generic/include/odp/api/sync.h rename to include/odp/api/sync.h diff --git a/platform/linux-generic/include/odp/api/system_info.h b/include/odp/api/system_info.h similarity index 100% rename from platform/linux-generic/include/odp/api/system_info.h rename to include/odp/api/system_info.h diff --git a/platform/linux-generic/include/odp/api/thread.h b/include/odp/api/thread.h similarity index 100% rename from platform/linux-generic/include/odp/api/thread.h rename to include/odp/api/thread.h diff --git a/platform/linux-generic/include/odp/api/threshold.h b/include/odp/api/threshold.h similarity index 100% rename from platform/linux-generic/include/odp/api/threshold.h rename to include/odp/api/threshold.h diff --git a/platform/linux-generic/include/odp/api/thrmask.h b/include/odp/api/thrmask.h similarity index 100% rename from platform/linux-generic/include/odp/api/thrmask.h rename to include/odp/api/thrmask.h diff --git a/platform/linux-generic/include/odp/api/ticketlock.h b/include/odp/api/ticketlock.h similarity index 100% rename from platform/linux-generic/include/odp/api/ticketlock.h rename to include/odp/api/ticketlock.h diff --git a/platform/linux-generic/include/odp/api/time.h b/include/odp/api/time.h similarity index 100% rename from platform/linux-generic/include/odp/api/time.h rename to include/odp/api/time.h diff --git a/platform/linux-generic/include/odp/api/timer.h b/include/odp/api/timer.h similarity index 100% rename from platform/linux-generic/include/odp/api/timer.h rename to include/odp/api/timer.h diff --git a/platform/linux-generic/include/odp/api/traffic_mngr.h b/include/odp/api/traffic_mngr.h similarity index 100% rename from platform/linux-generic/include/odp/api/traffic_mngr.h rename to include/odp/api/traffic_mngr.h diff --git a/platform/linux-generic/include/odp/api/version.h b/include/odp/api/version.h similarity index 100% rename from platform/linux-generic/include/odp/api/version.h rename to include/odp/api/version.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e2e872f5..63aaa08b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -23,55 +23,6 @@ odpinclude_HEADERS = \ include/odp/visibility_begin.h \ include/odp/visibility_end.h
-odpapiincludedir= $(includedir)/odp/api -odpapiinclude_HEADERS = \ - include/odp/api/align.h \ - include/odp/api/atomic.h \ - include/odp/api/barrier.h \ - include/odp/api/buffer.h \ - include/odp/api/byteorder.h \ - include/odp/api/chksum.h \ - include/odp/api/classification.h \ - include/odp/api/compiler.h \ - include/odp/api/cpu.h \ - include/odp/api/cpumask.h \ - include/odp/api/crypto.h \ - include/odp/api/debug.h \ - include/odp/api/deprecated.h \ - include/odp/api/errno.h \ - include/odp/api/event.h \ - include/odp/api/feature.h \ - include/odp/api/hash.h \ - include/odp/api/hints.h \ - include/odp/api/init.h \ - include/odp/api/ipsec.h \ - include/odp/api/packet_flags.h \ - include/odp/api/packet.h \ - include/odp/api/packet_io.h \ - include/odp/api/packet_io_stats.h \ - include/odp/api/pool.h \ - include/odp/api/queue.h \ - include/odp/api/random.h \ - include/odp/api/rwlock.h \ - include/odp/api/rwlock_recursive.h \ - include/odp/api/schedule.h \ - include/odp/api/schedule_types.h \ - include/odp/api/shared_memory.h \ - include/odp/api/spinlock.h \ - include/odp/api/spinlock_recursive.h \ - include/odp/api/std_clib.h \ - include/odp/api/std_types.h \ - include/odp/api/support.h \ - include/odp/api/system_info.h \ - include/odp/api/thread.h \ - include/odp/api/threshold.h \ - include/odp/api/thrmask.h \ - include/odp/api/ticketlock.h \ - include/odp/api/time.h \ - include/odp/api/timer.h \ - include/odp/api/traffic_mngr.h \ - include/odp/api/version.h - odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \
commit 42e8e9ac8bf029fb94c4b0d79dba115ba7450958 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Nov 23 02:46:02 2017 +0300
linux-gen: minor cleanup of API headers
Minor cleanup of API headers: - remove empty Doxygen groups - rename guarding defines to follow ODP_API_FOO_H_ pattern
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/include/odp/api/align.h b/platform/linux-generic/include/odp/api/align.h index f70e4d76..35609971 100644 --- a/platform/linux-generic/include/odp/api/align.h +++ b/platform/linux-generic/include/odp/api/align.h @@ -10,8 +10,8 @@ * ODP alignments */
-#ifndef ODP_PLAT_ALIGN_H_ -#define ODP_PLAT_ALIGN_H_ +#ifndef ODP_API_ALIGN_H_ +#define ODP_API_ALIGN_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/chksum.h b/platform/linux-generic/include/odp/api/chksum.h index 18dcb6d1..6dd1554c 100644 --- a/platform/linux-generic/include/odp/api/chksum.h +++ b/platform/linux-generic/include/odp/api/chksum.h @@ -10,21 +10,13 @@ * ODP checksum functions */
-#ifndef ODP_PLAT_CHKSUM_H_ -#define ODP_PLAT_CHKSUM_H_ +#ifndef ODP_API_CHKSUM_H_ +#define ODP_API_CHKSUM_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_chksum - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/chksum.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/compiler.h b/platform/linux-generic/include/odp/api/compiler.h index 5249d5d6..04e815bb 100644 --- a/platform/linux-generic/include/odp/api/compiler.h +++ b/platform/linux-generic/include/odp/api/compiler.h @@ -10,21 +10,13 @@ * Compiler related */
-#ifndef ODP_PLAT_COMPILER_H_ -#define ODP_PLAT_COMPILER_H_ +#ifndef ODP_API_COMPILER_H_ +#define ODP_API_COMPILER_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_compiler_optim - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/compiler.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h index 89674d69..7229857a 100644 --- a/platform/linux-generic/include/odp/api/cpu.h +++ b/platform/linux-generic/include/odp/api/cpu.h @@ -10,8 +10,8 @@ * ODP CPU */
-#ifndef ODP_PLAT_CPU_H_ -#define ODP_PLAT_CPU_H_ +#ifndef ODP_API_CPU_H_ +#define ODP_API_CPU_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/debug.h b/platform/linux-generic/include/odp/api/debug.h index e5465937..625dec59 100644 --- a/platform/linux-generic/include/odp/api/debug.h +++ b/platform/linux-generic/include/odp/api/debug.h @@ -10,8 +10,8 @@ * ODP debug */
-#ifndef ODP_PLAT_DEBUG_H_ -#define ODP_PLAT_DEBUG_H_ +#ifndef ODP_API_DEBUG_H_ +#define ODP_API_DEBUG_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/deprecated.h b/platform/linux-generic/include/odp/api/deprecated.h index 82797ebc..881f23d1 100644 --- a/platform/linux-generic/include/odp/api/deprecated.h +++ b/platform/linux-generic/include/odp/api/deprecated.h @@ -10,8 +10,8 @@ * Control deprecated API definitions */
-#ifndef ODP_PLAT_DEPRECATED_H_ -#define ODP_PLAT_DEPRECATED_H_ +#ifndef ODP_API_DEPRECATED_H_ +#define ODP_API_DEPRECATED_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/errno.h b/platform/linux-generic/include/odp/api/errno.h index f70d84df..420d5d07 100644 --- a/platform/linux-generic/include/odp/api/errno.h +++ b/platform/linux-generic/include/odp/api/errno.h @@ -10,14 +10,13 @@ * ODP errno API */
-#ifndef ODP_PLAT_ERRNO_H_ -#define ODP_PLAT_ERRNO_H_ +#ifndef ODP_API_ERRNO_H_ +#define ODP_API_ERRNO_H_
#ifdef __cplusplus extern "C" { #endif
- #include <odp/api/spec/errno.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/feature.h b/platform/linux-generic/include/odp/api/feature.h index 55a86a83..6bbde3c3 100644 --- a/platform/linux-generic/include/odp/api/feature.h +++ b/platform/linux-generic/include/odp/api/feature.h @@ -10,21 +10,13 @@ * ODP features. */
-#ifndef ODP_PLAT_FEATURE_H_ -#define ODP_PLAT_FEATURE_H_ +#ifndef ODP_API_FEATURE_H_ +#define ODP_API_FEATURE_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_feature - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/feature.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/hash.h b/platform/linux-generic/include/odp/api/hash.h index 332029ed..8e1699cc 100644 --- a/platform/linux-generic/include/odp/api/hash.h +++ b/platform/linux-generic/include/odp/api/hash.h @@ -10,21 +10,13 @@ * ODP Hash function */
-#ifndef ODP_PLAT_HASH_H_ -#define ODP_PLAT_HASH_H_ +#ifndef ODP_API_HASH_H_ +#define ODP_API_HASH_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_hash - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/hash.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/hints.h b/platform/linux-generic/include/odp/api/hints.h index 3ba1ba95..c4d134b7 100644 --- a/platform/linux-generic/include/odp/api/hints.h +++ b/platform/linux-generic/include/odp/api/hints.h @@ -10,21 +10,13 @@ * ODP compiler hints */
-#ifndef ODP_PLAT_HINTS_H_ -#define ODP_PLAT_HINTS_H_ +#ifndef ODP_API_HINTS_H_ +#define ODP_API_HINTS_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_compiler_optim - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/hints.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/random.h b/platform/linux-generic/include/odp/api/random.h index c8529b3f..4ce97384 100644 --- a/platform/linux-generic/include/odp/api/random.h +++ b/platform/linux-generic/include/odp/api/random.h @@ -10,21 +10,13 @@ * ODP random number API */
-#ifndef ODP_PLAT_RANDOM_H_ -#define ODP_PLAT_RANDOM_H_ +#ifndef ODP_API_RANDOM_H_ +#define ODP_API_RANDOM_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_random ODP RANDOM - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/random.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/support.h b/platform/linux-generic/include/odp/api/support.h index dd6abab2..6c1759d4 100644 --- a/platform/linux-generic/include/odp/api/support.h +++ b/platform/linux-generic/include/odp/api/support.h @@ -10,21 +10,13 @@ * ODP support API - platform specific header */
-#ifndef ODP_PLAT_SUPPORT_H_ -#define ODP_PLAT_SUPPORT_H_ +#ifndef ODP_API_SUPPORT_H_ +#define ODP_API_SUPPORT_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_support - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/support.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/system_info.h b/platform/linux-generic/include/odp/api/system_info.h index 36ddc814..7b95a876 100644 --- a/platform/linux-generic/include/odp/api/system_info.h +++ b/platform/linux-generic/include/odp/api/system_info.h @@ -10,8 +10,8 @@ * ODP system information */
-#ifndef ODP_PLAT_SYSTEM_INFO_H_ -#define ODP_PLAT_SYSTEM_INFO_H_ +#ifndef ODP_API_SYSTEM_INFO_H_ +#define ODP_API_SYSTEM_INFO_H_
#ifdef __cplusplus extern "C" { @@ -19,7 +19,6 @@ extern "C" {
#include <odp/api/std_types.h>
- #include <odp/api/spec/system_info.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/threshold.h b/platform/linux-generic/include/odp/api/threshold.h index f4f36285..17943256 100644 --- a/platform/linux-generic/include/odp/api/threshold.h +++ b/platform/linux-generic/include/odp/api/threshold.h @@ -10,21 +10,13 @@ * ODP threshold API - platform specific header */
-#ifndef ODP_PLAT_THRESHOLD_H_ -#define ODP_PLAT_THRESHOLD_H_ +#ifndef ODP_API_THRESHOLD_H_ +#define ODP_API_THRESHOLD_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_threshold - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/threshold.h>
#ifdef __cplusplus
commit 8d3786410c269d5e9838bacb9dd0a4b0524824ef Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sat Dec 30 03:39:39 2017 +0300
linux-gen, include: drop interm _ODP_CACHE_LINE_SIZE define
_ODP_CACHE_LINE_SIZE is only used to define ODP_CACHE_LINE_SIZE. Drop interim define and make cpu.h directly define ODP_CACHE_LINE_SIZE.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/abi-default/align.h b/include/odp/api/abi-default/align.h index 8521435b..7a95078f 100644 --- a/include/odp/api/abi-default/align.h +++ b/include/odp/api/abi-default/align.h @@ -37,7 +37,7 @@ extern "C" { #error Non-gcc compatible compiler #endif
-#define ODP_CACHE_LINE_SIZE _ODP_CACHE_LINE_SIZE +/* ODP_CACHE_LINE_SIZE is defined in odp/api/abi/cpu.h */
#define ODP_PAGE_SIZE 4096
diff --git a/include/odp/api/abi-default/cpu.h b/include/odp/api/abi-default/cpu.h index fea13a48..af22dafd 100644 --- a/include/odp/api/abi-default/cpu.h +++ b/include/odp/api/abi-default/cpu.h @@ -11,8 +11,8 @@ extern "C" { #endif
-#ifndef _ODP_CACHE_LINE_SIZE -#define _ODP_CACHE_LINE_SIZE 64 +#ifndef ODP_CACHE_LINE_SIZE +#define ODP_CACHE_LINE_SIZE 64 #endif
#ifdef _ODP_NEED_GENERIC_CPU_PAUSE diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpu.h b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h index 49546e25..1e483966 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h @@ -11,7 +11,7 @@ extern "C" { #endif
-#define _ODP_CACHE_LINE_SIZE 64 +#define ODP_CACHE_LINE_SIZE 64
static inline void odp_cpu_pause(void) { diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpu.h b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h index 49546e25..1e483966 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h @@ -11,7 +11,7 @@ extern "C" { #endif
-#define _ODP_CACHE_LINE_SIZE 64 +#define ODP_CACHE_LINE_SIZE 64
static inline void odp_cpu_pause(void) { diff --git a/include/odp/arch/mips64-linux/odp/api/abi/cpu.h b/include/odp/arch/mips64-linux/odp/api/abi/cpu.h index 9e1126eb..589e9d03 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/cpu.h @@ -12,7 +12,7 @@ extern "C" { #endif
#if defined __OCTEON__ -#define _ODP_CACHE_LINE_SIZE 128 +#define ODP_CACHE_LINE_SIZE 128 #else #error Please add support for your arch in abi/cpu.h #endif diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h index 3942bd32..a5314439 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h @@ -11,7 +11,7 @@ extern "C" { #endif
-#define _ODP_CACHE_LINE_SIZE 64 +#define ODP_CACHE_LINE_SIZE 64
static inline void odp_cpu_pause(void) { diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h index 2a509585..a4695e60 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h @@ -11,7 +11,7 @@ extern "C" { #endif
-#define _ODP_CACHE_LINE_SIZE 64 +#define ODP_CACHE_LINE_SIZE 64
static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h index 49546e25..1e483966 100644 --- a/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h @@ -11,7 +11,7 @@ extern "C" { #endif
-#define _ODP_CACHE_LINE_SIZE 64 +#define ODP_CACHE_LINE_SIZE 64
static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/arch/arm/odp/api/abi/cpu.h b/platform/linux-generic/arch/arm/odp/api/abi/cpu.h index 49546e25..1e483966 100644 --- a/platform/linux-generic/arch/arm/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/arm/odp/api/abi/cpu.h @@ -11,7 +11,7 @@ extern "C" { #endif
-#define _ODP_CACHE_LINE_SIZE 64 +#define ODP_CACHE_LINE_SIZE 64
static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h b/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h index 403f0eba..7bf62d48 100644 --- a/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h @@ -12,7 +12,7 @@ extern "C" { #endif
#if defined __OCTEON__ -#define _ODP_CACHE_LINE_SIZE 128 +#define ODP_CACHE_LINE_SIZE 128 #else #error Please add support for your arch in cpu_arch.h #endif diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h index 3942bd32..a5314439 100644 --- a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h @@ -11,7 +11,7 @@ extern "C" { #endif
-#define _ODP_CACHE_LINE_SIZE 64 +#define ODP_CACHE_LINE_SIZE 64
static inline void odp_cpu_pause(void) {
commit be3696f3617fb05bf55347a724e422814b1be19b Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Nov 23 01:31:27 2017 +0300
linux-gen, include: switch align.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 25b12f56..e11ed0fa 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -56,6 +56,7 @@ nodist_odpapispecinclude_HEADERS = \
odpapiabidefaultincludedir= $(includedir)/odp/api/abi-default odpapiabidefaultinclude_HEADERS = \ + odp/api/abi-default/align.h \ odp/api/abi-default/atomic.h \ odp/api/abi-default/barrier.h \ odp/api/abi-default/buffer.h \ @@ -97,6 +98,7 @@ if ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ + odp/arch/arm32-linux/odp/api/abi/align.h \ odp/arch/arm32-linux/odp/api/abi/atomic.h \ odp/arch/arm32-linux/odp/api/abi/barrier.h \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ @@ -134,6 +136,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_AARCH64 odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/align.h \ odp/arch/arm64-linux/odp/api/abi/atomic.h \ odp/arch/arm64-linux/odp/api/abi/barrier.h \ odp/arch/arm64-linux/odp/api/abi/buffer.h \ @@ -171,6 +174,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/align.h \ odp/arch/mips64-linux/odp/api/abi/atomic.h \ odp/arch/mips64-linux/odp/api/abi/barrier.h \ odp/arch/mips64-linux/odp/api/abi/buffer.h \ @@ -208,6 +212,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_POWERPC odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/align.h \ odp/arch/power64-linux/odp/api/abi/atomic.h \ odp/arch/power64-linux/odp/api/abi/barrier.h \ odp/arch/power64-linux/odp/api/abi/buffer.h \ @@ -245,6 +250,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_X86_32 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/align.h \ odp/arch/x86_32-linux/odp/api/abi/atomic.h \ odp/arch/x86_32-linux/odp/api/abi/barrier.h \ odp/arch/x86_32-linux/odp/api/abi/buffer.h \ @@ -282,6 +288,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_X86_64 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/align.h \ odp/arch/x86_64-linux/odp/api/abi/atomic.h \ odp/arch/x86_64-linux/odp/api/abi/barrier.h \ odp/arch/x86_64-linux/odp/api/abi/buffer.h \ diff --git a/platform/linux-generic/include/odp/api/align.h b/include/odp/api/abi-default/align.h similarity index 81% copy from platform/linux-generic/include/odp/api/align.h copy to include/odp/api/abi-default/align.h index af09e895..8521435b 100644 --- a/platform/linux-generic/include/odp/api/align.h +++ b/include/odp/api/abi-default/align.h @@ -1,7 +1,7 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2015, Linaro Limited * All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-3-Clause */
/** @@ -10,8 +10,8 @@ * ODP alignments */
-#ifndef ODP_PLAT_ALIGN_H_ -#define ODP_PLAT_ALIGN_H_ +#ifndef ODP_ABI_ALIGN_H_ +#define ODP_ABI_ALIGN_H_
#ifdef __cplusplus extern "C" { @@ -49,8 +49,6 @@ extern "C" { * @} */
-#include <odp/api/spec/align.h> - #ifdef __cplusplus } #endif diff --git a/include/odp/arch/arm32-linux/odp/api/abi/align.h b/include/odp/arch/arm32-linux/odp/api/abi/align.h new file mode 100644 index 00000000..fb704d58 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/align.h b/include/odp/arch/arm64-linux/odp/api/abi/align.h new file mode 100644 index 00000000..fb704d58 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/align.h b/include/odp/arch/mips64-linux/odp/api/abi/align.h new file mode 100644 index 00000000..fb704d58 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/align.h b/include/odp/arch/power64-linux/odp/api/abi/align.h new file mode 100644 index 00000000..fb704d58 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/align.h b/include/odp/arch/x86_32-linux/odp/api/abi/align.h new file mode 100644 index 00000000..fb704d58 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/align.h b/include/odp/arch/x86_64-linux/odp/api/abi/align.h new file mode 100644 index 00000000..fb704d58 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index c4a28977..e2e872f5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -94,6 +94,7 @@ nodist_odpapiplatinclude_HEADERS = \ if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ + include-abi/odp/api/abi/align.h \ include-abi/odp/api/abi/atomic.h \ include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/align.h b/platform/linux-generic/include-abi/odp/api/abi/align.h new file mode 100644 index 00000000..fb704d58 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/platform/linux-generic/include/odp/api/align.h b/platform/linux-generic/include/odp/api/align.h index af09e895..f70e4d76 100644 --- a/platform/linux-generic/include/odp/api/align.h +++ b/platform/linux-generic/include/odp/api/align.h @@ -17,37 +17,7 @@ extern "C" { #endif
-#include <odp/api/abi/cpu.h> - -/** @ingroup odp_compiler_optim - * @{ - */ - -#ifdef __GNUC__ - -#define ODP_ALIGNED(x) __attribute__((__aligned__(x))) - -#define ODP_PACKED __attribute__((__packed__)) - -#define ODP_OFFSETOF(type, member) __builtin_offsetof(type, member) - -#define ODP_FIELD_SIZEOF(type, member) sizeof(((type *)0)->member) - -#else -#error Non-gcc compatible compiler -#endif - -#define ODP_CACHE_LINE_SIZE _ODP_CACHE_LINE_SIZE - -#define ODP_PAGE_SIZE 4096 - -#define ODP_ALIGNED_CACHE ODP_ALIGNED(ODP_CACHE_LINE_SIZE) - -#define ODP_ALIGNED_PAGE ODP_ALIGNED(ODP_PAGE_SIZE) - -/** - * @} - */ +#include <odp/api/abi/align.h>
#include <odp/api/spec/align.h>
commit e3f0ac3bb039d95af55176828539ebfd2697f932 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch packet headers to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 4a84e283..25b12f56 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -69,6 +69,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/init.h \ odp/api/abi-default/ipsec.h \ odp/api/abi-default/packet.h \ + odp/api/abi-default/packet_flags.h \ odp/api/abi-default/packet_io.h \ odp/api/abi-default/pool.h \ odp/api/abi-default/queue.h \ @@ -109,6 +110,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/init.h \ odp/arch/arm32-linux/odp/api/abi/ipsec.h \ odp/arch/arm32-linux/odp/api/abi/packet.h \ + odp/arch/arm32-linux/odp/api/abi/packet_flags.h \ odp/arch/arm32-linux/odp/api/abi/packet_io.h \ odp/arch/arm32-linux/odp/api/abi/pool.h \ odp/arch/arm32-linux/odp/api/abi/queue.h \ @@ -145,6 +147,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/init.h \ odp/arch/arm64-linux/odp/api/abi/ipsec.h \ odp/arch/arm64-linux/odp/api/abi/packet.h \ + odp/arch/arm64-linux/odp/api/abi/packet_flags.h \ odp/arch/arm64-linux/odp/api/abi/packet_io.h \ odp/arch/arm64-linux/odp/api/abi/pool.h \ odp/arch/arm64-linux/odp/api/abi/queue.h \ @@ -181,6 +184,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/init.h \ odp/arch/mips64-linux/odp/api/abi/ipsec.h \ odp/arch/mips64-linux/odp/api/abi/packet.h \ + odp/arch/mips64-linux/odp/api/abi/packet_flags.h \ odp/arch/mips64-linux/odp/api/abi/packet_io.h \ odp/arch/mips64-linux/odp/api/abi/pool.h \ odp/arch/mips64-linux/odp/api/abi/queue.h \ @@ -217,6 +221,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/init.h \ odp/arch/power64-linux/odp/api/abi/ipsec.h \ odp/arch/power64-linux/odp/api/abi/packet.h \ + odp/arch/power64-linux/odp/api/abi/packet_flags.h \ odp/arch/power64-linux/odp/api/abi/packet_io.h \ odp/arch/power64-linux/odp/api/abi/pool.h \ odp/arch/power64-linux/odp/api/abi/queue.h \ @@ -253,6 +258,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/init.h \ odp/arch/x86_32-linux/odp/api/abi/ipsec.h \ odp/arch/x86_32-linux/odp/api/abi/packet.h \ + odp/arch/x86_32-linux/odp/api/abi/packet_flags.h \ odp/arch/x86_32-linux/odp/api/abi/packet_io.h \ odp/arch/x86_32-linux/odp/api/abi/pool.h \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ @@ -289,6 +295,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/init.h \ odp/arch/x86_64-linux/odp/api/abi/ipsec.h \ odp/arch/x86_64-linux/odp/api/abi/packet.h \ + odp/arch/x86_64-linux/odp/api/abi/packet_flags.h \ odp/arch/x86_64-linux/odp/api/abi/packet_io.h \ odp/arch/x86_64-linux/odp/api/abi/pool.h \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ diff --git a/include/odp/api/abi-default/packet_flags.h b/include/odp/api/abi-default/packet_flags.h new file mode 100644 index 00000000..8ee9fc1a --- /dev/null +++ b/include/odp/api/abi-default/packet_flags.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet descriptor + */ + +#ifndef ODP_ABI_PACKET_FLAGS_H_ +#define ODP_ABI_PACKET_FLAGS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..a60c8bd0 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/arm64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..a60c8bd0 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/mips64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..a60c8bd0 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/power64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..a60c8bd0 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..a60c8bd0 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..a60c8bd0 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet_flags.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 364e56cd..c4a28977 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -78,9 +78,9 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ + include/odp/api/plat/packet_inline_types.h \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ - include/odp/api/plat/packet_types.h \ include/odp/api/plat/pool_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ @@ -105,6 +105,8 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/event.h \ include-abi/odp/api/abi/init.h \ include-abi/odp/api/abi/ipsec.h \ + include-abi/odp/api/abi/packet.h \ + include-abi/odp/api/abi/packet_flags.h \ include-abi/odp/api/abi/packet_io.h \ include-abi/odp/api/abi/pool.h \ include-abi/odp/api/abi/queue.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h new file mode 100644 index 00000000..31d446f8 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -0,0 +1,68 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet descriptor + */ + +#ifndef ODP_API_ABI_PACKET_H_ +#define ODP_API_ABI_PACKET_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/std_types.h> +#include <odp/api/plat/strong_types.h> + +/** @ingroup odp_packet + * @{ + */ + +typedef ODP_HANDLE_T(odp_packet_t); + +#define ODP_PACKET_INVALID _odp_cast_scalar(odp_packet_t, 0) + +#define ODP_PACKET_OFFSET_INVALID 0xffff + +typedef uint8_t odp_packet_seg_t; + +static inline uint8_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) +{ + return (uint8_t)seg; +} + +static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) +{ + return (odp_packet_seg_t)ndx; +} + +#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) + +typedef enum { + ODP_PACKET_GREEN = 0, + ODP_PACKET_YELLOW = 1, + ODP_PACKET_RED = 2, + ODP_PACKET_ALL_COLORS = 3, +} odp_packet_color_t; + +#define ODP_NUM_PACKET_COLORS 3 + +#include <odp/api/plat/static_inline.h> +#include <odp/api/plat/packet_inlines.h> +#include <odp/api/plat/packet_inlines_api.h> + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..9a8474a3 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet descriptor + */ + +#ifndef ODP_API_ABI_PACKET_FLAGS_H_ +#define ODP_API_ABI_PACKET_FLAGS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/plat/packet_flag_inlines.h> +#include <odp/api/plat/packet_flag_inlines_api.h> + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h index 01be7063..ecdf9203 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/platform/linux-generic/include/odp/api/classification.h @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/abi/pool.h> #include <odp/api/abi/classification.h> -#include <odp/api/plat/packet_types.h> +#include <odp/api/abi/packet.h> #include <odp/api/abi/packet_io.h> #include <odp/api/abi/queue.h>
diff --git a/platform/linux-generic/include/odp/api/crypto.h b/platform/linux-generic/include/odp/api/crypto.h index ead28eab..3f410467 100644 --- a/platform/linux-generic/include/odp/api/crypto.h +++ b/platform/linux-generic/include/odp/api/crypto.h @@ -18,7 +18,7 @@ extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/packet_types.h> +#include <odp/api/abi/packet.h> #include <odp/api/abi/crypto.h> #include <odp/api/abi/buffer.h> #include <odp/api/abi/pool.h> diff --git a/platform/linux-generic/include/odp/api/packet.h b/platform/linux-generic/include/odp/api/packet.h index 5d744df5..88c4f027 100644 --- a/platform/linux-generic/include/odp/api/packet.h +++ b/platform/linux-generic/include/odp/api/packet.h @@ -10,8 +10,8 @@ * ODP packet descriptor */
-#ifndef ODP_PLAT_PACKET_H_ -#define ODP_PLAT_PACKET_H_ +#ifndef ODP_API_PACKET_H_ +#define ODP_API_PACKET_H_
#ifdef __cplusplus extern "C" { @@ -20,15 +20,10 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/abi/event.h> #include <odp/api/abi/packet_io.h> -#include <odp/api/plat/packet_types.h> +#include <odp/api/abi/packet.h> #include <odp/api/abi/buffer.h> #include <odp/api/abi/pool.h>
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/packet_inlines.h> -#endif - #include <odp/api/spec/packet.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/packet_flags.h b/platform/linux-generic/include/odp/api/packet_flags.h index 1e55af82..2b3006b5 100644 --- a/platform/linux-generic/include/odp/api/packet_flags.h +++ b/platform/linux-generic/include/odp/api/packet_flags.h @@ -10,17 +10,14 @@ * ODP packet flags */
-#ifndef ODP_PLAT_PACKET_FLAGS_H_ -#define ODP_PLAT_PACKET_FLAGS_H_ +#ifndef ODP_API_PACKET_FLAGS_H_ +#define ODP_API_PACKET_FLAGS_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/packet_flag_inlines.h> -#endif +#include <odp/api/abi/packet_flags.h>
#include <odp/api/spec/packet_flags.h>
diff --git a/platform/linux-generic/include/odp/api/packet_io.h b/platform/linux-generic/include/odp/api/packet_io.h index 18e9ae01..a854d7b9 100644 --- a/platform/linux-generic/include/odp/api/packet_io.h +++ b/platform/linux-generic/include/odp/api/packet_io.h @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/abi/pool.h> #include <odp/api/abi/classification.h> -#include <odp/api/plat/packet_types.h> +#include <odp/api/abi/packet.h> #include <odp/api/abi/packet_io.h> #include <odp/api/abi/queue.h>
diff --git a/platform/linux-generic/include/odp/api/packet_io_stats.h b/platform/linux-generic/include/odp/api/packet_io_stats.h index a9cd9535..b2b32075 100644 --- a/platform/linux-generic/include/odp/api/packet_io_stats.h +++ b/platform/linux-generic/include/odp/api/packet_io_stats.h @@ -10,8 +10,8 @@ * ODP packet IO stats */
-#ifndef ODP_PLAT_PACKET_IO_STATS_H_ -#define ODP_PLAT_PACKET_IO_STATS_H_ +#ifndef ODP_API_PACKET_IO_STATS_H_ +#define ODP_API_PACKET_IO_STATS_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index 42003e31..3212248f 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -13,7 +13,8 @@ #ifndef _ODP_PLAT_PACKET_FLAG_INLINES_H_ #define _ODP_PLAT_PACKET_FLAG_INLINES_H_
-#include <odp/api/plat/packet_types.h> +#include <odp/api/abi/packet.h> +#include <odp/api/plat/packet_inlines.h> #include <odp/api/hints.h>
/** @internal Inline function offsets */ @@ -70,20 +71,4 @@ static inline int _odp_packet_has_ts(odp_packet_t pkt) return flags.timestamp; }
-/* Include inlined versions of API functions */ -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 - -/** @ingroup odp_packet - * @{ - */ - -#include <odp/api/plat/packet_flag_inlines_api.h> - -/** - * @} - */ - -#endif - #endif diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h similarity index 78% rename from platform/linux-generic/include/odp/api/plat/packet_types.h rename to platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 98e5c4f0..47ec821c 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -11,61 +11,14 @@ * ODP packet descriptor */
-#ifndef ODP_PACKET_TYPES_H_ -#define ODP_PACKET_TYPES_H_ +#ifndef ODP_PACKET_INLINE_TYPES_H_ +#define ODP_PACKET_INLINE_TYPES_H_
#ifdef __cplusplus extern "C" { #endif
-#include <stddef.h> - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/abi/packet.h> -#else - -#include <odp/api/std_types.h> -#include <odp/api/plat/strong_types.h> - -/** @ingroup odp_packet - * @{ - */ - -typedef ODP_HANDLE_T(odp_packet_t); - -#define ODP_PACKET_INVALID _odp_cast_scalar(odp_packet_t, 0) - -#define ODP_PACKET_OFFSET_INVALID 0xffff - -typedef uint8_t odp_packet_seg_t; - -static inline uint8_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) -{ - return (uint8_t)seg; -} - -static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) -{ - return (odp_packet_seg_t)ndx; -} - -#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) - -typedef enum { - ODP_PACKET_GREEN = 0, - ODP_PACKET_YELLOW = 1, - ODP_PACKET_RED = 2, - ODP_PACKET_ALL_COLORS = 3, -} odp_packet_color_t; - -#define ODP_NUM_PACKET_COLORS 3 - -/** - * @} - */ - -#endif +#include <stdint.h>
/** @internal Packet field accessor */ #define _odp_pkt_get(pkt, cast, field) \ diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 6a19b1c0..95e0fe42 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -13,14 +13,15 @@ #ifndef _ODP_PLAT_PACKET_INLINES_H_ #define _ODP_PLAT_PACKET_INLINES_H_
-#include <odp/api/plat/strong_types.h> -#include <odp/api/plat/packet_types.h> +#include <odp/api/abi/packet.h> #include <odp/api/pool.h> -#include <odp/api/plat/pool_inline_types.h> -#include <odp/api/time.h> #include <odp/api/abi/packet_io.h> -#include <odp/api/abi/buffer.h> #include <odp/api/hints.h> +#include <odp/api/time.h> +#include <odp/api/abi/buffer.h> + +#include <odp/api/plat/packet_inline_types.h> +#include <odp/api/plat/pool_inline_types.h>
/** @internal Inline function @param pkt_ptr @param offset @param seg_len * @param seg_idx @return */ @@ -33,7 +34,9 @@ extern const _odp_packet_inline_offset_t _odp_packet_inline; /** @internal Pool inline function offsets */ extern const _odp_pool_inline_offset_t _odp_pool_inline;
+#include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 1 +#include <odp/api/plat/strong_types.h> /** @internal Inline function @param seg @return */ static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) { @@ -254,20 +257,4 @@ static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) return (odp_buffer_t)pkt; }
-/* Include inlined versions of API functions */ -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 - -/** @ingroup odp_packet - * @{ - */ - -#include <odp/api/plat/packet_inlines_api.h> - -/** - * @} - */ - -#endif - #endif diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 62888f8a..712799d7 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -23,10 +23,11 @@ extern "C" { #include <odp_pool_internal.h> #include <odp_buffer_inlines.h> #include <odp/api/packet.h> +#include <odp/api/plat/packet_inline_types.h> #include <odp/api/packet_io.h> #include <odp/api/crypto.h> -#include <odp/api/ipsec.h> -#include <odp/api/plat/packet_types.h> +#include <odp_ipsec_internal.h> +#include <odp/api/abi/packet.h> #include <odp_queue_if.h>
/** Minimum segment length expected by packet_parse_common() */ diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index a812fec1..a72049e3 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -6,8 +6,8 @@
#include "config.h"
-#include <odp/api/plat/packet_inlines.h> #include <odp/api/packet.h> +#include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> #include <odp_debug_internal.h> #include <odp/api/hints.h> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 54fd0bde..6fd4b192 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -17,8 +17,8 @@
#include <odp/api/cpumask.h>
-#include <odp/api/plat/packet_inlines.h> #include <odp/api/packet.h> +#include <odp/api/plat/packet_inlines.h>
#include <odp_packet_io_internal.h> #include <odp_classification_internal.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 763b7aed..ace0dd85 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -10,8 +10,8 @@
#include <odp_posix_extensions.h>
-#include <odp/api/plat/packet_inlines.h> #include <odp/api/packet.h> +#include <odp/api/plat/packet_inlines.h>
#include <odp_packet_io_internal.h> #include <odp_packet_netmap.h>
commit ffee6ee63f437bab54151da5f31d54385c3247af Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Nov 23 01:31:27 2017 +0300
linux-gen, include: switch cpu.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/Makefile.inc b/Makefile.inc index 91be46bc..12ee3bab 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,7 +1,6 @@ ODP_INCLUDES = \ -I$(top_builddir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ -I$(top_srcdir)/include
@@ -10,6 +9,7 @@ ODP_INCLUDES += \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ else ODP_INCLUDES += \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_srcdir)/platform/@with_platform@/include-abi endif
diff --git a/include/Makefile.am b/include/Makefile.am index a2d8dfc0..4a84e283 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -61,6 +61,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/buffer.h \ odp/api/abi-default/byteorder.h \ odp/api/abi-default/classification.h \ + odp/api/abi-default/cpu.h \ odp/api/abi-default/cpumask.h \ odp/api/abi-default/crypto.h \ odp/api/abi-default/debug.h \ @@ -100,6 +101,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ odp/arch/arm32-linux/odp/api/abi/byteorder.h \ odp/arch/arm32-linux/odp/api/abi/classification.h \ + odp/arch/arm32-linux/odp/api/abi/cpu.h \ odp/arch/arm32-linux/odp/api/abi/cpumask.h \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ odp/arch/arm32-linux/odp/api/abi/debug.h \ @@ -135,6 +137,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/buffer.h \ odp/arch/arm64-linux/odp/api/abi/byteorder.h \ odp/arch/arm64-linux/odp/api/abi/classification.h \ + odp/arch/arm64-linux/odp/api/abi/cpu.h \ odp/arch/arm64-linux/odp/api/abi/cpumask.h \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ odp/arch/arm64-linux/odp/api/abi/debug.h \ @@ -170,6 +173,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/buffer.h \ odp/arch/mips64-linux/odp/api/abi/byteorder.h \ odp/arch/mips64-linux/odp/api/abi/classification.h \ + odp/arch/mips64-linux/odp/api/abi/cpu.h \ odp/arch/mips64-linux/odp/api/abi/cpumask.h \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ odp/arch/mips64-linux/odp/api/abi/debug.h \ @@ -205,6 +209,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/buffer.h \ odp/arch/power64-linux/odp/api/abi/byteorder.h \ odp/arch/power64-linux/odp/api/abi/classification.h \ + odp/arch/power64-linux/odp/api/abi/cpu.h \ odp/arch/power64-linux/odp/api/abi/cpumask.h \ odp/arch/power64-linux/odp/api/abi/crypto.h \ odp/arch/power64-linux/odp/api/abi/debug.h \ @@ -240,6 +245,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/buffer.h \ odp/arch/x86_32-linux/odp/api/abi/byteorder.h \ odp/arch/x86_32-linux/odp/api/abi/classification.h \ + odp/arch/x86_32-linux/odp/api/abi/cpu.h \ odp/arch/x86_32-linux/odp/api/abi/cpumask.h \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ odp/arch/x86_32-linux/odp/api/abi/debug.h \ @@ -275,6 +281,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/buffer.h \ odp/arch/x86_64-linux/odp/api/abi/byteorder.h \ odp/arch/x86_64-linux/odp/api/abi/classification.h \ + odp/arch/x86_64-linux/odp/api/abi/cpu.h \ odp/arch/x86_64-linux/odp/api/abi/cpumask.h \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ odp/arch/x86_64-linux/odp/api/abi/debug.h \ diff --git a/platform/linux-generic/arch/default/odp/api/cpu_arch.h b/include/odp/api/abi-default/cpu.h similarity index 68% rename from platform/linux-generic/arch/default/odp/api/cpu_arch.h rename to include/odp/api/abi-default/cpu.h index 22b1da2d..fea13a48 100644 --- a/platform/linux-generic/arch/default/odp/api/cpu_arch.h +++ b/include/odp/api/abi-default/cpu.h @@ -4,18 +4,22 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_ABI_CPU_H_ +#define ODP_ABI_CPU_H_
#ifdef __cplusplus extern "C" { #endif
+#ifndef _ODP_CACHE_LINE_SIZE #define _ODP_CACHE_LINE_SIZE 64 +#endif
+#ifdef _ODP_NEED_GENERIC_CPU_PAUSE static inline void odp_cpu_pause(void) { } +#endif
#ifdef __cplusplus } diff --git a/include/odp/api/spec/cpu.h b/include/odp/api/spec/cpu.h index 04fbbe90..7cab4d76 100644 --- a/include/odp/api/spec/cpu.h +++ b/include/odp/api/spec/cpu.h @@ -161,13 +161,14 @@ uint64_t odp_cpu_cycles_max(void); uint64_t odp_cpu_cycles_resolution(void);
/** + * @def odp_cpu_pause * Pause CPU execution for a short while * * This call is intended for tight loops which poll a shared resource. A short * pause within the loop may save energy and improve system performance as * CPU polling frequency is reduced. */ -void odp_cpu_pause(void); +/* void odp_cpu_pause(void); */
/** * @} diff --git a/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h similarity index 89% copy from platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h copy to include/odp/arch/arm32-linux/odp/api/abi/cpu.h index 7c75a690..49546e25 100644 --- a/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/arch/arm/odp/api/cpu_arch.h b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h similarity index 89% rename from platform/linux-generic/arch/arm/odp/api/cpu_arch.h rename to include/odp/arch/arm64-linux/odp/api/abi/cpu.h index 7c75a690..49546e25 100644 --- a/platform/linux-generic/arch/arm/odp/api/cpu_arch.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/include/odp/arch/mips64-linux/odp/api/abi/cpu.h similarity index 79% copy from platform/linux-generic/arch/mips64/odp/api/cpu_arch.h copy to include/odp/arch/mips64-linux/odp/api/abi/cpu.h index 3582b129..9e1126eb 100644 --- a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_
#ifdef __cplusplus extern "C" { @@ -14,7 +14,7 @@ extern "C" { #if defined __OCTEON__ #define _ODP_CACHE_LINE_SIZE 128 #else -#error Please add support for your arch in cpu_arch.h +#error Please add support for your arch in abi/cpu.h #endif
static inline void odp_cpu_pause(void) diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpu.h b/include/odp/arch/power64-linux/odp/api/abi/cpu.h new file mode 100644 index 00000000..7e835f06 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/cpu.h @@ -0,0 +1,8 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#define _ODP_NEED_GENERIC_CPU_PAUSE +#include <odp/api/abi-default/cpu.h> diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h similarity index 86% copy from platform/linux-generic/arch/x86/odp/api/cpu_arch.h copy to include/odp/arch/x86_32-linux/odp/api/abi/cpu.h index 44e6b30e..3942bd32 100644 --- a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h similarity index 73% rename from platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h rename to include/odp/arch/x86_64-linux/odp/api/abi/cpu.h index 22b1da2d..2a509585 100644 --- a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_ARCH_H_ +#define ODP_API_ABI_CPU_ARCH_H_
#ifdef __cplusplus extern "C" { @@ -15,6 +15,7 @@ extern "C" {
static inline void odp_cpu_pause(void) { + __asm__ __volatile__ ("pause"); }
#ifdef __cplusplus diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8b497fcd..364e56cd 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -5,6 +5,7 @@ include $(top_srcdir)/platform/Makefile.inc
AM_CPPFLAGS = $(ODP_INCLUDES) AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/@ARCH_DIR@ AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default
AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) @@ -255,7 +256,9 @@ if ARCH_IS_ARM __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -arch_odp_headers = arch/arm/odp/api/cpu_arch.h +if !ODP_ABI_COMPAT +odpapiabiarchinclude_HEADERS += arch/arm/odp/api/abi/cpu.h +endif noinst_HEADERS += arch/arm/odp_atomic.h \ arch/arm/odp_cpu.h \ arch/arm/odp_cpu_idling.h \ @@ -266,7 +269,9 @@ if ARCH_IS_AARCH64 __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -arch_odp_headers = arch/aarch64/odp/api/cpu_arch.h +if !ODP_ABI_COMPAT +odpapiabiarchinclude_HEADERS += arch/aarch64/odp/api/abi/cpu.h +endif noinst_HEADERS += arch/aarch64/odp_atomic.h \ arch/aarch64/odp_cpu.h \ arch/aarch64/odp_cpu_idling.h \ @@ -277,7 +282,9 @@ if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c -arch_odp_headers = arch/mips64/odp/api/cpu_arch.h +if !ODP_ABI_COMPAT +odpapiabiarchinclude_HEADERS += arch/mips64/odp/api/abi/cpu.h +endif noinst_HEADERS += arch/default/odp_cpu.h \ arch/default/odp_cpu_idling.h endif @@ -285,7 +292,9 @@ if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c -arch_odp_headers = arch/powerpc/odp/api/cpu_arch.h +if !ODP_ABI_COMPAT +odpapiabiarchinclude_HEADERS += arch/powerpc/odp/api/abi/cpu.h +endif noinst_HEADERS += arch/default/odp_cpu.h \ arch/default/odp_cpu_idling.h endif @@ -294,17 +303,14 @@ __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_cpu_cycles.c \ arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c -arch_odp_headers = arch/x86/odp/api/cpu_arch.h +if !ODP_ABI_COMPAT +odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu.h +endif noinst_HEADERS += arch/x86/cpu_flags.h noinst_HEADERS += arch/default/odp_cpu.h \ arch/default/odp_cpu_idling.h endif
-noinst_HEADERS += arch/default/odp/api/cpu_arch.h - -odpapiarchincludedir = $(archincludedir)/odp/api -odpapiarchinclude_HEADERS = $(arch_odp_headers) - if HAVE_PCAP __LIB__libodp_linux_la_SOURCES += pktio/pcap.c endif diff --git a/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h similarity index 89% copy from platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h copy to platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h index 7c75a690..49546e25 100644 --- a/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h b/platform/linux-generic/arch/arm/odp/api/abi/cpu.h similarity index 89% rename from platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h rename to platform/linux-generic/arch/arm/odp/api/abi/cpu.h index 7c75a690..49546e25 100644 --- a/platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/arm/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h similarity index 89% rename from platform/linux-generic/arch/mips64/odp/api/cpu_arch.h rename to platform/linux-generic/arch/mips64/odp/api/abi/cpu.h index 3582b129..403f0eba 100644 --- a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h b/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h new file mode 100644 index 00000000..7e835f06 --- /dev/null +++ b/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h @@ -0,0 +1,8 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#define _ODP_NEED_GENERIC_CPU_PAUSE +#include <odp/api/abi-default/cpu.h> diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index fd880646..b59a3581 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -39,7 +39,7 @@
#include "config.h"
-#include <cpu_flags.h> +#include "cpu_flags.h" #include <odp_debug_internal.h> #include <odp_arch_time_internal.h> #include <stdio.h> diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h similarity index 86% rename from platform/linux-generic/arch/x86/odp/api/cpu_arch.h rename to platform/linux-generic/arch/x86/odp/api/abi/cpu.h index 44e6b30e..3942bd32 100644 --- a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index be2dfb23..b99e523d 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -7,7 +7,7 @@ #include "config.h"
#include <odp_internal.h> -#include <cpu_flags.h> +#include "cpu_flags.h" #include <string.h>
int cpuinfo_parser(FILE *file, system_info_t *sysinfo) diff --git a/platform/linux-generic/include/odp/api/align.h b/platform/linux-generic/include/odp/api/align.h index c238b80a..af09e895 100644 --- a/platform/linux-generic/include/odp/api/align.h +++ b/platform/linux-generic/include/odp/api/align.h @@ -17,7 +17,7 @@ extern "C" { #endif
-#include <odp/api/cpu_arch.h> +#include <odp/api/abi/cpu.h>
/** @ingroup odp_compiler_optim * @{ diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h index d49c782b..89674d69 100644 --- a/platform/linux-generic/include/odp/api/cpu.h +++ b/platform/linux-generic/include/odp/api/cpu.h @@ -17,7 +17,7 @@ extern "C" { #endif
-#include <odp/api/cpu_arch.h> +#include <odp/api/abi/cpu.h>
#include <odp/api/spec/cpu.h>
commit 22e7c58bf12540c95168f079f6b39375c96f6e94 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch debug.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index eeca75ef..a2d8dfc0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -63,6 +63,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/classification.h \ odp/api/abi-default/cpumask.h \ odp/api/abi-default/crypto.h \ + odp/api/abi-default/debug.h \ odp/api/abi-default/event.h \ odp/api/abi-default/init.h \ odp/api/abi-default/ipsec.h \ @@ -101,6 +102,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/classification.h \ odp/arch/arm32-linux/odp/api/abi/cpumask.h \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ + odp/arch/arm32-linux/odp/api/abi/debug.h \ odp/arch/arm32-linux/odp/api/abi/event.h \ odp/arch/arm32-linux/odp/api/abi/init.h \ odp/arch/arm32-linux/odp/api/abi/ipsec.h \ @@ -135,6 +137,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/classification.h \ odp/arch/arm64-linux/odp/api/abi/cpumask.h \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ + odp/arch/arm64-linux/odp/api/abi/debug.h \ odp/arch/arm64-linux/odp/api/abi/event.h \ odp/arch/arm64-linux/odp/api/abi/init.h \ odp/arch/arm64-linux/odp/api/abi/ipsec.h \ @@ -169,6 +172,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/classification.h \ odp/arch/mips64-linux/odp/api/abi/cpumask.h \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ + odp/arch/mips64-linux/odp/api/abi/debug.h \ odp/arch/mips64-linux/odp/api/abi/event.h \ odp/arch/mips64-linux/odp/api/abi/init.h \ odp/arch/mips64-linux/odp/api/abi/ipsec.h \ @@ -203,6 +207,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/classification.h \ odp/arch/power64-linux/odp/api/abi/cpumask.h \ odp/arch/power64-linux/odp/api/abi/crypto.h \ + odp/arch/power64-linux/odp/api/abi/debug.h \ odp/arch/power64-linux/odp/api/abi/event.h \ odp/arch/power64-linux/odp/api/abi/init.h \ odp/arch/power64-linux/odp/api/abi/ipsec.h \ @@ -237,6 +242,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/classification.h \ odp/arch/x86_32-linux/odp/api/abi/cpumask.h \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ + odp/arch/x86_32-linux/odp/api/abi/debug.h \ odp/arch/x86_32-linux/odp/api/abi/event.h \ odp/arch/x86_32-linux/odp/api/abi/init.h \ odp/arch/x86_32-linux/odp/api/abi/ipsec.h \ @@ -271,6 +277,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/classification.h \ odp/arch/x86_64-linux/odp/api/abi/cpumask.h \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ + odp/arch/x86_64-linux/odp/api/abi/debug.h \ odp/arch/x86_64-linux/odp/api/abi/event.h \ odp/arch/x86_64-linux/odp/api/abi/init.h \ odp/arch/x86_64-linux/odp/api/abi/ipsec.h \ diff --git a/include/odp/api/abi-default/debug.h b/include/odp/api/abi-default/debug.h new file mode 100644 index 00000000..4ccd2148 --- /dev/null +++ b/include/odp/api/abi-default/debug.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP debug + */ + +#ifndef ODP_ABI_DEBUG_H_ +#define ODP_ABI_DEBUG_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @internal Compile time assertion macro. Fails compilation and outputs 'msg' + * if condition 'cond' is false. Macro definition is empty when compiler is not + * supported or the compiler does not support static assertion. + */ +#ifndef __cplusplus +#define ODP_STATIC_ASSERT(cond, msg) _Static_assert(cond, msg) +#else +#define ODP_STATIC_ASSERT(cond, msg) static_assert(cond, msg) +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/arm32-linux/odp/api/abi/debug.h b/include/odp/arch/arm32-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..b37b8f9c --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/debug.h b/include/odp/arch/arm64-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..b37b8f9c --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/debug.h b/include/odp/arch/mips64-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..b37b8f9c --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/debug.h b/include/odp/arch/power64-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..b37b8f9c --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/debug.h b/include/odp/arch/x86_32-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..b37b8f9c --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/debug.h b/include/odp/arch/x86_64-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..b37b8f9c --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ebf32fda..8b497fcd 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -100,6 +100,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/classification.h \ include-abi/odp/api/abi/cpumask.h \ include-abi/odp/api/abi/crypto.h \ + include-abi/odp/api/abi/debug.h \ include-abi/odp/api/abi/event.h \ include-abi/odp/api/abi/init.h \ include-abi/odp/api/abi/ipsec.h \ diff --git a/platform/linux-generic/include/odp/api/debug.h b/platform/linux-generic/include-abi/odp/api/abi/debug.h similarity index 72% copy from platform/linux-generic/include/odp/api/debug.h copy to platform/linux-generic/include-abi/odp/api/abi/debug.h index bef2fd0e..e0397957 100644 --- a/platform/linux-generic/include/odp/api/debug.h +++ b/platform/linux-generic/include-abi/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2015, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -7,18 +7,16 @@ /** * @file * - * ODP debug + * ODP atomic operations */
-#ifndef ODP_PLAT_DEBUG_H_ -#define ODP_PLAT_DEBUG_H_ +#ifndef ODP_API_ABI_DEBUG_H_ +#define ODP_API_ABI_DEBUG_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/spec/debug.h> - /** * @internal _Static_assert was only added in GCC 4.6 and the C++ version * static_assert for g++ 6 and above. Provide a weak replacement for previous @@ -61,16 +59,9 @@ extern "C" {
#endif
-/** - * @internal Compile time assertion macro. Fails compilation and outputs 'msg' - * if condition 'cond' is false. Macro definition is empty when compiler is not - * supported or the compiler does not support static assertion. - */ -#ifndef __cplusplus -#define ODP_STATIC_ASSERT(cond, msg) _Static_assert(cond, msg) +#include <odp/api/abi-default/debug.h>
-#else -#define ODP_STATIC_ASSERT(cond, msg) static_assert(cond, msg) +#ifdef __cplusplus } #endif
diff --git a/platform/linux-generic/include/odp/api/debug.h b/platform/linux-generic/include/odp/api/debug.h index bef2fd0e..e5465937 100644 --- a/platform/linux-generic/include/odp/api/debug.h +++ b/platform/linux-generic/include/odp/api/debug.h @@ -17,60 +17,11 @@ extern "C" { #endif
-#include <odp/api/spec/debug.h> +#include <odp/api/abi/debug.h>
-/** - * @internal _Static_assert was only added in GCC 4.6 and the C++ version - * static_assert for g++ 6 and above. Provide a weak replacement for previous - * versions. - */ -#define _odp_merge(a, b) a##b -/** @internal */ -#define _odp_label(a) _odp_merge(_ODP_SASSERT_, a) -/** @internal */ -#define _ODP_SASSERT _odp_label(__COUNTER__) -/** @internal */ -#define _ODP_SASSERT_ENUM(e) { _ODP_SASSERT = 1 / !!(e) } -/** @internal */ -#define _odp_static_assert(e, s) enum _ODP_SASSERT_ENUM(e) - -#if defined(__clang__) -#if defined(__cplusplus) -#if !__has_feature(cxx_static_assert) && !defined(static_assert) -/** @internal */ -#define static_assert(e, s) _odp_static_assert(e, s) -#endif -#elif !__has_feature(c_static_assert) && !defined(_Static_assert) -/** @internal */ -#define _Static_assert(e, s) _odp_static_assert(e, s) -#endif - -#elif defined(__GNUC__) -#if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6)) || \ - (__GNUC__ < 6 && defined(__cplusplus)) -#if defined(__cplusplus) -#if !defined(static_assert) -/** @intenral */ -#define static_assert(e, s) _odp_static_assert(e, s) -#endif -#elif !defined(_Static_assert) -/** @internal */ -#define _Static_assert(e, s) _odp_static_assert(e, s) -#endif -#endif - -#endif - -/** - * @internal Compile time assertion macro. Fails compilation and outputs 'msg' - * if condition 'cond' is false. Macro definition is empty when compiler is not - * supported or the compiler does not support static assertion. - */ -#ifndef __cplusplus -#define ODP_STATIC_ASSERT(cond, msg) _Static_assert(cond, msg) +#include <odp/api/spec/debug.h>
-#else -#define ODP_STATIC_ASSERT(cond, msg) static_assert(cond, msg) +#ifdef __cplusplus } #endif
commit aa698a07e99416663b9b829926efefde1c4e0abb Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch ticketlock.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 737e5e9f..eeca75ef 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -82,6 +82,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/sync.h \ odp/api/abi-default/thread.h \ odp/api/abi-default/thrmask.h \ + odp/api/abi-default/ticketlock.h \ odp/api/abi-default/time.h \ odp/api/abi-default/timer.h \ odp/api/abi-default/traffic_mngr.h \ @@ -119,6 +120,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/sync.h \ odp/arch/arm32-linux/odp/api/abi/thread.h \ odp/arch/arm32-linux/odp/api/abi/thrmask.h \ + odp/arch/arm32-linux/odp/api/abi/ticketlock.h \ odp/arch/arm32-linux/odp/api/abi/time.h \ odp/arch/arm32-linux/odp/api/abi/timer.h \ odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h \ @@ -152,6 +154,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/sync.h \ odp/arch/arm64-linux/odp/api/abi/thread.h \ odp/arch/arm64-linux/odp/api/abi/thrmask.h \ + odp/arch/arm64-linux/odp/api/abi/ticketlock.h \ odp/arch/arm64-linux/odp/api/abi/time.h \ odp/arch/arm64-linux/odp/api/abi/timer.h \ odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h \ @@ -185,6 +188,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/sync.h \ odp/arch/mips64-linux/odp/api/abi/thread.h \ odp/arch/mips64-linux/odp/api/abi/thrmask.h \ + odp/arch/mips64-linux/odp/api/abi/ticketlock.h \ odp/arch/mips64-linux/odp/api/abi/time.h \ odp/arch/mips64-linux/odp/api/abi/timer.h \ odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h \ @@ -218,6 +222,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/sync.h \ odp/arch/power64-linux/odp/api/abi/thread.h \ odp/arch/power64-linux/odp/api/abi/thrmask.h \ + odp/arch/power64-linux/odp/api/abi/ticketlock.h \ odp/arch/power64-linux/odp/api/abi/time.h \ odp/arch/power64-linux/odp/api/abi/timer.h \ odp/arch/power64-linux/odp/api/abi/traffic_mngr.h \ @@ -251,6 +256,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/sync.h \ odp/arch/x86_32-linux/odp/api/abi/thread.h \ odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ + odp/arch/x86_32-linux/odp/api/abi/ticketlock.h \ odp/arch/x86_32-linux/odp/api/abi/time.h \ odp/arch/x86_32-linux/odp/api/abi/timer.h \ odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h \ @@ -284,6 +290,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/sync.h \ odp/arch/x86_64-linux/odp/api/abi/thread.h \ odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ + odp/arch/x86_64-linux/odp/api/abi/ticketlock.h \ odp/arch/x86_64-linux/odp/api/abi/time.h \ odp/arch/x86_64-linux/odp/api/abi/timer.h \ odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h \ diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_types.h b/include/odp/api/abi-default/ticketlock.h similarity index 72% copy from platform/linux-generic/include/odp/api/plat/ticketlock_types.h copy to include/odp/api/abi-default/ticketlock.h index 81d479d6..d771ffbe 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_types.h +++ b/include/odp/api/abi-default/ticketlock.h @@ -4,15 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */
- /** * @file * * ODP ticketlock */
-#ifndef ODP_TICKETLOCK_TYPES_H_ -#define ODP_TICKETLOCK_TYPES_H_ +#ifndef ODP_ABI_TICKETLOCK_H_ +#define ODP_ABI_TICKETLOCK_H_
#ifdef __cplusplus extern "C" { @@ -21,12 +20,10 @@ extern "C" { #include <odp/api/atomic.h>
/** @internal */ -struct odp_ticketlock_s { +typedef struct odp_ticketlock_s { odp_atomic_u32_t next_ticket; /**< Next ticket */ odp_atomic_u32_t cur_ticket; /**< Current ticket */ -}; - -typedef struct odp_ticketlock_s odp_ticketlock_t; +} odp_ticketlock_t;
#ifdef __cplusplus } diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..0065ce02 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..0065ce02 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..0065ce02 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..0065ce02 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..0065ce02 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..0065ce02 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9af245be..ebf32fda 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -85,8 +85,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/ticketlock_inlines.h \ - include/odp/api/plat/ticketlock_inlines_api.h \ - include/odp/api/plat/ticketlock_types.h + include/odp/api/plat/ticketlock_inlines_api.h
nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h @@ -119,6 +118,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/sync.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ + include-abi/odp/api/abi/ticketlock.h \ include-abi/odp/api/abi/time.h \ include-abi/odp/api/abi/timer.h \ include-abi/odp/api/abi/traffic_mngr.h \ diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_types.h b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h similarity index 52% rename from platform/linux-generic/include/odp/api/plat/ticketlock_types.h rename to platform/linux-generic/include-abi/odp/api/abi/ticketlock.h index 81d479d6..cf3c2f77 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h @@ -4,15 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */
- /** * @file * * ODP ticketlock */
-#ifndef ODP_TICKETLOCK_TYPES_H_ -#define ODP_TICKETLOCK_TYPES_H_ +#ifndef ODP_API_ABI_TICKETLOCK_H_ +#define ODP_API_ABI_TICKETLOCK_H_
#ifdef __cplusplus extern "C" { @@ -20,13 +19,24 @@ extern "C" {
#include <odp/api/atomic.h>
+/** @ingroup odp_locks + * @{ + */ + /** @internal */ -struct odp_ticketlock_s { +typedef struct odp_ticketlock_s { odp_atomic_u32_t next_ticket; /**< Next ticket */ odp_atomic_u32_t cur_ticket; /**< Current ticket */ -}; +} odp_ticketlock_t;
-typedef struct odp_ticketlock_s odp_ticketlock_t; +/* Include inlined versions of API functions */ +#include <odp/api/plat/static_inline.h> +#include <odp/api/plat/ticketlock_inlines.h> +#include <odp/api/plat/ticketlock_inlines_api.h> + +/** + * @} + */
#ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index ecbea7c4..185d77de 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -14,10 +14,6 @@ #define _ODP_PLAT_TICKETLOCK_INLINES_H_
#include <odp/api/atomic.h> -#include <odp/api/sync.h> -#include <odp/api/cpu.h> - -#include <odp/api/plat/ticketlock_types.h>
/** @internal * Acquire ticket lock. @@ -111,20 +107,4 @@ static inline int _odp_ticketlock_is_locked(odp_ticketlock_t *ticketlock) odp_atomic_load_u32(&ticketlock->next_ticket); }
-/* Include inlined versions of API functions */ -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 - -/** @ingroup odp_locks - * @{ - */ - -#include <odp/api/plat/ticketlock_inlines_api.h> - -/** - * @} - */ - -#endif - #endif diff --git a/platform/linux-generic/include/odp/api/ticketlock.h b/platform/linux-generic/include/odp/api/ticketlock.h index ca12cc37..d875c0e3 100644 --- a/platform/linux-generic/include/odp/api/ticketlock.h +++ b/platform/linux-generic/include/odp/api/ticketlock.h @@ -10,19 +10,14 @@ * ODP ticketlock */
-#ifndef ODP_PLAT_TICKETLOCK_H_ -#define ODP_PLAT_TICKETLOCK_H_ +#ifndef ODP_API_TICKETLOCK_H_ +#define ODP_API_TICKETLOCK_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/ticketlock_types.h> - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/ticketlock_inlines.h> -#endif +#include <odp/api/abi/ticketlock.h>
#include <odp/api/spec/ticketlock.h>
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 88a5a8c2..da4fd835 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -8,6 +8,7 @@ #include <config.h>
#include <odp/api/hints.h> +#include <odp/api/ticketlock.h> #include <odp/api/plat/ticketlock_inlines.h> #include <odp/api/queue.h> #include <odp/api/schedule.h> diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c index 0c94f8ae..59431620 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock.c @@ -6,8 +6,9 @@
#include "config.h"
+#include <odp/api/ticketlock.h> + #include <odp/api/plat/ticketlock_inlines.h> -#include <odp/api/spec/ticketlock.h>
void odp_ticketlock_init(odp_ticketlock_t *ticketlock) { @@ -16,6 +17,7 @@ void odp_ticketlock_init(odp_ticketlock_t *ticketlock) }
/* Include non-inlined versions of API functions */ +#include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/ticketlock_inlines_api.h> #endif
commit 34ba6c32491c9b18f78f49855d76c5e60555dd6e Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch sync.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 1378bdab..737e5e9f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -79,6 +79,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/spinlock_recursive.h \ odp/api/abi-default/std_clib.h \ odp/api/abi-default/std_types.h \ + odp/api/abi-default/sync.h \ odp/api/abi-default/thread.h \ odp/api/abi-default/thrmask.h \ odp/api/abi-default/time.h \ @@ -115,6 +116,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/arm32-linux/odp/api/abi/std_clib.h \ odp/arch/arm32-linux/odp/api/abi/std_types.h \ + odp/arch/arm32-linux/odp/api/abi/sync.h \ odp/arch/arm32-linux/odp/api/abi/thread.h \ odp/arch/arm32-linux/odp/api/abi/thrmask.h \ odp/arch/arm32-linux/odp/api/abi/time.h \ @@ -147,6 +149,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/arm64-linux/odp/api/abi/std_clib.h \ odp/arch/arm64-linux/odp/api/abi/std_types.h \ + odp/arch/arm64-linux/odp/api/abi/sync.h \ odp/arch/arm64-linux/odp/api/abi/thread.h \ odp/arch/arm64-linux/odp/api/abi/thrmask.h \ odp/arch/arm64-linux/odp/api/abi/time.h \ @@ -179,6 +182,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/mips64-linux/odp/api/abi/std_clib.h \ odp/arch/mips64-linux/odp/api/abi/std_types.h \ + odp/arch/mips64-linux/odp/api/abi/sync.h \ odp/arch/mips64-linux/odp/api/abi/thread.h \ odp/arch/mips64-linux/odp/api/abi/thrmask.h \ odp/arch/mips64-linux/odp/api/abi/time.h \ @@ -211,6 +215,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/power64-linux/odp/api/abi/std_clib.h \ odp/arch/power64-linux/odp/api/abi/std_types.h \ + odp/arch/power64-linux/odp/api/abi/sync.h \ odp/arch/power64-linux/odp/api/abi/thread.h \ odp/arch/power64-linux/odp/api/abi/thrmask.h \ odp/arch/power64-linux/odp/api/abi/time.h \ @@ -243,6 +248,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/x86_32-linux/odp/api/abi/std_clib.h \ odp/arch/x86_32-linux/odp/api/abi/std_types.h \ + odp/arch/x86_32-linux/odp/api/abi/sync.h \ odp/arch/x86_32-linux/odp/api/abi/thread.h \ odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ odp/arch/x86_32-linux/odp/api/abi/time.h \ @@ -275,6 +281,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/x86_64-linux/odp/api/abi/std_clib.h \ odp/arch/x86_64-linux/odp/api/abi/std_types.h \ + odp/arch/x86_64-linux/odp/api/abi/sync.h \ odp/arch/x86_64-linux/odp/api/abi/thread.h \ odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ odp/arch/x86_64-linux/odp/api/abi/time.h \ diff --git a/include/odp/api/abi-default/sync.h b/include/odp/api/abi-default/sync.h new file mode 100644 index 00000000..d325507c --- /dev/null +++ b/include/odp/api/abi-default/sync.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP barrier + */ + +#ifndef ODP_ABI_SYNC_H_ +#define ODP_ABI_SYNC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/arm32-linux/odp/api/abi/sync.h b/include/odp/arch/arm32-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..8e5f8132 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/sync.h b/include/odp/arch/arm64-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..8e5f8132 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/sync.h b/include/odp/arch/mips64-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..8e5f8132 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/sync.h b/include/odp/arch/power64-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..8e5f8132 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/sync.h b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..8e5f8132 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/sync.h b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..8e5f8132 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 54b8668c..9af245be 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -61,7 +61,6 @@ odpapiinclude_HEADERS = \ include/odp/api/std_clib.h \ include/odp/api/std_types.h \ include/odp/api/support.h \ - include/odp/api/sync.h \ include/odp/api/system_info.h \ include/odp/api/thread.h \ include/odp/api/threshold.h \ @@ -117,6 +116,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/spinlock_recursive.h \ include-abi/odp/api/abi/std_clib.h \ include-abi/odp/api/abi/std_types.h \ + include-abi/odp/api/abi/sync.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ include-abi/odp/api/abi/time.h \ diff --git a/platform/linux-generic/include/odp/api/sync.h b/platform/linux-generic/include-abi/odp/api/abi/sync.h similarity index 63% copy from platform/linux-generic/include/odp/api/sync.h copy to platform/linux-generic/include-abi/odp/api/abi/sync.h index e1afcc72..74e3fb15 100644 --- a/platform/linux-generic/include/odp/api/sync.h +++ b/platform/linux-generic/include-abi/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2015, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -7,11 +7,11 @@ /** * @file * - * ODP synchronisation + * ODP barrier */
-#ifndef ODP_PLAT_SYNC_H_ -#define ODP_PLAT_SYNC_H_ +#ifndef ODP_API_ABI_SYNC_H_ +#define ODP_API_ABI_SYNC_H_
#ifdef __cplusplus extern "C" { @@ -22,16 +22,12 @@ extern "C" { */
#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 #include <odp/api/plat/sync_inlines.h> -#endif
/** * @} */
-#include <odp/api/spec/sync.h> - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/sync.h b/platform/linux-generic/include/odp/api/sync.h index e1afcc72..b84289ca 100644 --- a/platform/linux-generic/include/odp/api/sync.h +++ b/platform/linux-generic/include/odp/api/sync.h @@ -10,25 +10,14 @@ * ODP synchronisation */
-#ifndef ODP_PLAT_SYNC_H_ -#define ODP_PLAT_SYNC_H_ +#ifndef ODP_API_SYNC_H_ +#define ODP_API_SYNC_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_barrier - * @{ - */ - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/sync_inlines.h> -#endif - -/** - * @} - */ +#include <odp/api/abi/sync.h>
#include <odp/api/spec/sync.h>
diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync.c index 7acdc92d..a9d2bbe2 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync.c @@ -7,6 +7,7 @@ #include "config.h"
#include <odp/api/sync.h> +#include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/sync_inlines.h> #endif
commit 0c8009e48f6bcb254ba06a85e9226d1a0459a36e Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch std_clib.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/example/traffic_mgmt/odp_traffic_mgmt.c b/example/traffic_mgmt/odp_traffic_mgmt.c index 1f1102dd..e02a1af8 100644 --- a/example/traffic_mgmt/odp_traffic_mgmt.c +++ b/example/traffic_mgmt/odp_traffic_mgmt.c @@ -10,6 +10,7 @@
#include <unistd.h> #include <signal.h> +#include <string.h> #include <inttypes.h> #include <sys/resource.h> #include <execinfo.h> diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c index 12504d01..3ed2032b 100644 --- a/helper/test/linux/process.c +++ b/helper/test/linux/process.c @@ -11,6 +11,8 @@ #include <odp/helper/linux/pthread.h> #include <odp/helper/linux/process.h>
+#include <string.h> + #define NUMBER_WORKERS 16 /* 0 = max */
static void *worker_fn(void *arg ODPH_UNUSED) diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c index a50df027..0863283d 100644 --- a/helper/test/linux/pthread.c +++ b/helper/test/linux/pthread.c @@ -10,6 +10,8 @@ #include <odp_api.h> #include <odp/helper/linux/pthread.h>
+#include <string.h> + #define NUMBER_WORKERS 16 static void *worker_fn(void *arg ODPH_UNUSED) { diff --git a/helper/threads.c b/helper/threads.c index a83014d4..32a09282 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -10,6 +10,7 @@ #define _GNU_SOURCE #endif #include <sched.h> +#include <string.h> #include <unistd.h> #include <sys/wait.h> #include <sys/prctl.h> diff --git a/include/Makefile.am b/include/Makefile.am index ec69082d..1378bdab 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -77,6 +77,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/shared_memory.h \ odp/api/abi-default/spinlock.h \ odp/api/abi-default/spinlock_recursive.h \ + odp/api/abi-default/std_clib.h \ odp/api/abi-default/std_types.h \ odp/api/abi-default/thread.h \ odp/api/abi-default/thrmask.h \ @@ -112,6 +113,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ odp/arch/arm32-linux/odp/api/abi/spinlock.h \ odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/arm32-linux/odp/api/abi/std_clib.h \ odp/arch/arm32-linux/odp/api/abi/std_types.h \ odp/arch/arm32-linux/odp/api/abi/thread.h \ odp/arch/arm32-linux/odp/api/abi/thrmask.h \ @@ -143,6 +145,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ odp/arch/arm64-linux/odp/api/abi/spinlock.h \ odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/arm64-linux/odp/api/abi/std_clib.h \ odp/arch/arm64-linux/odp/api/abi/std_types.h \ odp/arch/arm64-linux/odp/api/abi/thread.h \ odp/arch/arm64-linux/odp/api/abi/thrmask.h \ @@ -174,6 +177,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ odp/arch/mips64-linux/odp/api/abi/spinlock.h \ odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/mips64-linux/odp/api/abi/std_clib.h \ odp/arch/mips64-linux/odp/api/abi/std_types.h \ odp/arch/mips64-linux/odp/api/abi/thread.h \ odp/arch/mips64-linux/odp/api/abi/thrmask.h \ @@ -205,6 +209,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/shared_memory.h \ odp/arch/power64-linux/odp/api/abi/spinlock.h \ odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/power64-linux/odp/api/abi/std_clib.h \ odp/arch/power64-linux/odp/api/abi/std_types.h \ odp/arch/power64-linux/odp/api/abi/thread.h \ odp/arch/power64-linux/odp/api/abi/thrmask.h \ @@ -236,6 +241,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/x86_32-linux/odp/api/abi/std_clib.h \ odp/arch/x86_32-linux/odp/api/abi/std_types.h \ odp/arch/x86_32-linux/odp/api/abi/thread.h \ odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ @@ -267,6 +273,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/x86_64-linux/odp/api/abi/std_clib.h \ odp/arch/x86_64-linux/odp/api/abi/std_types.h \ odp/arch/x86_64-linux/odp/api/abi/thread.h \ odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ diff --git a/include/odp/api/abi-default/std_clib.h b/include/odp/api/abi-default/std_clib.h new file mode 100644 index 00000000..88ea770a --- /dev/null +++ b/include/odp/api/abi-default/std_clib.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP barrier + */ + +#ifndef ODP_ABI_STD_CLIB_H_ +#define ODP_ABI_STD_CLIB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..72898878 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/arm64-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..72898878 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/mips64-linux/odp/api/abi/std_clib.h b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..72898878 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/power64-linux/odp/api/abi/std_clib.h b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..72898878 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_32-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..72898878 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_64-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..72898878 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_clib.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 98aeab30..54b8668c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -115,6 +115,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/spinlock.h \ include-abi/odp/api/abi/spinlock_recursive.h \ + include-abi/odp/api/abi/std_clib.h \ include-abi/odp/api/abi/std_types.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ diff --git a/platform/linux-generic/include/odp/api/std_clib.h b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h similarity index 60% copy from platform/linux-generic/include/odp/api/std_clib.h copy to platform/linux-generic/include-abi/odp/api/abi/std_clib.h index fea47254..b31034df 100644 --- a/platform/linux-generic/include/odp/api/std_clib.h +++ b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h @@ -4,22 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_STD_CLIB_H_ -#define ODP_PLAT_STD_CLIB_H_ +/** + * @file + * + * ODP barrier + */ + +#ifndef ODP_API_ABI_STD_CLIB_H_ +#define ODP_API_ABI_STD_CLIB_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/spec/std_types.h> -#include <string.h> - #include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 #include <odp/api/plat/std_clib_inlines.h> -#endif - -#include <odp/api/spec/std_clib.h>
#ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h index 8f505d07..bb6f9d02 100644 --- a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h @@ -11,7 +11,6 @@ extern "C" { #endif
-#include <odp/api/spec/std_types.h> #include <string.h>
_ODP_INLINE void *odp_memcpy(void *dst, const void *src, size_t num) diff --git a/platform/linux-generic/include/odp/api/std_clib.h b/platform/linux-generic/include/odp/api/std_clib.h index fea47254..16973ad6 100644 --- a/platform/linux-generic/include/odp/api/std_clib.h +++ b/platform/linux-generic/include/odp/api/std_clib.h @@ -4,20 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_PLAT_STD_CLIB_H_ -#define ODP_PLAT_STD_CLIB_H_ +#ifndef ODP_API_STD_CLIB_H_ +#define ODP_API_STD_CLIB_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/spec/std_types.h> -#include <string.h> - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/std_clib_inlines.h> -#endif +#include <odp/api/abi/std_types.h> +#include <odp/api/abi/std_clib.h>
#include <odp/api/spec/std_clib.h>
diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib.c index ed7c6446..38406b86 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib.c @@ -7,6 +7,7 @@ #include "config.h"
#include <odp/api/std_clib.h> +#include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/std_clib_inlines.h> #endif
commit d70c5f1ce3e98c3a7409312ccfdc3ce0087a2d49 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Nov 23 01:40:14 2017 +0300
linux-gen, include: switch byteorder.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index bae7bc8b..ec69082d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -59,6 +59,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/atomic.h \ odp/api/abi-default/barrier.h \ odp/api/abi-default/buffer.h \ + odp/api/abi-default/byteorder.h \ odp/api/abi-default/classification.h \ odp/api/abi-default/cpumask.h \ odp/api/abi-default/crypto.h \ @@ -93,6 +94,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/atomic.h \ odp/arch/arm32-linux/odp/api/abi/barrier.h \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ + odp/arch/arm32-linux/odp/api/abi/byteorder.h \ odp/arch/arm32-linux/odp/api/abi/classification.h \ odp/arch/arm32-linux/odp/api/abi/cpumask.h \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ @@ -123,6 +125,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/atomic.h \ odp/arch/arm64-linux/odp/api/abi/barrier.h \ odp/arch/arm64-linux/odp/api/abi/buffer.h \ + odp/arch/arm64-linux/odp/api/abi/byteorder.h \ odp/arch/arm64-linux/odp/api/abi/classification.h \ odp/arch/arm64-linux/odp/api/abi/cpumask.h \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ @@ -153,6 +156,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/atomic.h \ odp/arch/mips64-linux/odp/api/abi/barrier.h \ odp/arch/mips64-linux/odp/api/abi/buffer.h \ + odp/arch/mips64-linux/odp/api/abi/byteorder.h \ odp/arch/mips64-linux/odp/api/abi/classification.h \ odp/arch/mips64-linux/odp/api/abi/cpumask.h \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ @@ -183,6 +187,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/atomic.h \ odp/arch/power64-linux/odp/api/abi/barrier.h \ odp/arch/power64-linux/odp/api/abi/buffer.h \ + odp/arch/power64-linux/odp/api/abi/byteorder.h \ odp/arch/power64-linux/odp/api/abi/classification.h \ odp/arch/power64-linux/odp/api/abi/cpumask.h \ odp/arch/power64-linux/odp/api/abi/crypto.h \ @@ -213,6 +218,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/atomic.h \ odp/arch/x86_32-linux/odp/api/abi/barrier.h \ odp/arch/x86_32-linux/odp/api/abi/buffer.h \ + odp/arch/x86_32-linux/odp/api/abi/byteorder.h \ odp/arch/x86_32-linux/odp/api/abi/classification.h \ odp/arch/x86_32-linux/odp/api/abi/cpumask.h \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ @@ -243,6 +249,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/atomic.h \ odp/arch/x86_64-linux/odp/api/abi/barrier.h \ odp/arch/x86_64-linux/odp/api/abi/buffer.h \ + odp/arch/x86_64-linux/odp/api/abi/byteorder.h \ odp/arch/x86_64-linux/odp/api/abi/classification.h \ odp/arch/x86_64-linux/odp/api/abi/cpumask.h \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_types.h b/include/odp/api/abi-default/byteorder.h similarity index 53% copy from platform/linux-generic/include/odp/api/plat/byteorder_types.h copy to include/odp/api/abi-default/byteorder.h index 20d52bf8..92f9743a 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_types.h +++ b/include/odp/api/abi-default/byteorder.h @@ -10,36 +10,25 @@ * ODP byteorder */
-#ifndef ODP_BYTEORDER_TYPES_H_ -#define ODP_BYTEORDER_TYPES_H_ +#ifndef ODP_ABI_BYTEORDER_H_ +#define ODP_ABI_BYTEORDER_H_
#ifdef __cplusplus extern "C" { #endif
+#include <odp/api/std_types.h> + #ifndef __BYTE_ORDER__ -#error __BYTE_ORDER not defined! +#error __BYTE_ORDER__ not defined! #endif
#ifndef __ORDER_BIG_ENDIAN__ -#error __BIG_ENDIAN not defined! +#error __ORDER_BIG_ENDIAN__ not defined! #endif
#ifndef __ORDER_LITTLE_ENDIAN__ -#error __LITTLE_ENDIAN not defined! -#endif - -/* for use with type checkers such as sparse */ -#ifdef __CHECKER__ -/** @internal bitwise attribute */ -#define __odp_bitwise __attribute__((bitwise)) -/** @internal force attribute */ -#define __odp_force __attribute__((force)) -#else -/** @internal bitwise attribute */ -#define __odp_bitwise -/** @internal force attribute */ -#define __odp_force +#error __ORDER_LITTLE_ENDIAN__ not defined! #endif
/** @addtogroup odp_compiler_optim @@ -61,17 +50,17 @@ extern "C" { #define ODP_BITFIELD_ORDER ODP_BIG_ENDIAN_BITFIELD #endif
-typedef uint16_t __odp_bitwise odp_u16le_t; -typedef uint16_t __odp_bitwise odp_u16be_t; +typedef uint16_t odp_u16le_t; +typedef uint16_t odp_u16be_t;
-typedef uint32_t __odp_bitwise odp_u32le_t; -typedef uint32_t __odp_bitwise odp_u32be_t; +typedef uint32_t odp_u32le_t; +typedef uint32_t odp_u32be_t;
-typedef uint64_t __odp_bitwise odp_u64le_t; -typedef uint64_t __odp_bitwise odp_u64be_t; +typedef uint64_t odp_u64le_t; +typedef uint64_t odp_u64be_t;
-typedef uint16_t __odp_bitwise odp_u16sum_t; -typedef uint32_t __odp_bitwise odp_u32sum_t; +typedef uint16_t odp_u16sum_t; +typedef uint32_t odp_u32sum_t;
/** * @} diff --git a/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..2fd53414 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..2fd53414 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..2fd53414 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/byteorder.h b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..2fd53414 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..2fd53414 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..2fd53414 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 511afabb..98aeab30 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -76,7 +76,6 @@ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/byteorder_inlines.h \ - include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inlines.h \ @@ -99,6 +98,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/atomic.h \ include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ + include-abi/odp/api/abi/byteorder.h \ include-abi/odp/api/abi/classification.h \ include-abi/odp/api/abi/cpumask.h \ include-abi/odp/api/abi/crypto.h \ diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_types.h b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h similarity index 84% rename from platform/linux-generic/include/odp/api/plat/byteorder_types.h rename to platform/linux-generic/include-abi/odp/api/abi/byteorder.h index 20d52bf8..0f8fac0b 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h @@ -10,23 +10,25 @@ * ODP byteorder */
-#ifndef ODP_BYTEORDER_TYPES_H_ -#define ODP_BYTEORDER_TYPES_H_ +#ifndef ODP_API_ABI_BYTEORDER_H_ +#define ODP_API_ABI_BYTEORDER_H_
#ifdef __cplusplus extern "C" { #endif
+#include <odp/api/std_types.h> + #ifndef __BYTE_ORDER__ -#error __BYTE_ORDER not defined! +#error __BYTE_ORDER__ not defined! #endif
#ifndef __ORDER_BIG_ENDIAN__ -#error __BIG_ENDIAN not defined! +#error __ORDER_BIG_ENDIAN__ not defined! #endif
#ifndef __ORDER_LITTLE_ENDIAN__ -#error __LITTLE_ENDIAN not defined! +#error __ORDER_LITTLE_ENDIAN__ not defined! #endif
/* for use with type checkers such as sparse */ @@ -73,6 +75,9 @@ typedef uint64_t __odp_bitwise odp_u64be_t; typedef uint16_t __odp_bitwise odp_u16sum_t; typedef uint32_t __odp_bitwise odp_u32sum_t;
+#include <odp/api/plat/static_inline.h> +#include <odp/api/plat/byteorder_inlines.h> + /** * @} */ diff --git a/platform/linux-generic/include/odp/api/byteorder.h b/platform/linux-generic/include/odp/api/byteorder.h index ec3d0eef..cbb45429 100644 --- a/platform/linux-generic/include/odp/api/byteorder.h +++ b/platform/linux-generic/include/odp/api/byteorder.h @@ -10,29 +10,14 @@ * ODP byteorder */
-#ifndef ODP_PLAT_BYTEORDER_H_ -#define ODP_PLAT_BYTEORDER_H_ +#ifndef ODP_API_BYTEORDER_H_ +#define ODP_API_BYTEORDER_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/std_types.h> -#include <odp/api/plat/byteorder_types.h> -#include <odp/api/compiler.h> - -/** @ingroup odp_compiler_optim - * @{ - */ - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/byteorder_inlines.h> -#endif - -/** - * @} - */ +#include <odp/api/abi/byteorder.h>
#include <odp/api/spec/byteorder.h>
diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h index e7818904..6f313962 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h @@ -17,6 +17,12 @@ extern "C" { #endif
+#ifndef __odp_force +#define __odp_force +#endif + +#include <odp/api/compiler.h> + /** @ingroup odp_compiler_optim * @{ */ diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder.c index a3d1f981..faf1c590 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder.c @@ -7,6 +7,7 @@ #include "config.h"
#include <odp/api/byteorder.h> +#include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/byteorder_inlines.h> #endif
commit 47932d20fdf72f73e5de4961569fda760200edc6 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Nov 23 01:31:27 2017 +0300
linux-gen, include: switch atomic.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 7c3293b9..bae7bc8b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -56,6 +56,7 @@ nodist_odpapispecinclude_HEADERS = \
odpapiabidefaultincludedir= $(includedir)/odp/api/abi-default odpapiabidefaultinclude_HEADERS = \ + odp/api/abi-default/atomic.h \ odp/api/abi-default/barrier.h \ odp/api/abi-default/buffer.h \ odp/api/abi-default/classification.h \ @@ -89,6 +90,7 @@ if ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ + odp/arch/arm32-linux/odp/api/abi/atomic.h \ odp/arch/arm32-linux/odp/api/abi/barrier.h \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ odp/arch/arm32-linux/odp/api/abi/classification.h \ @@ -118,6 +120,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_AARCH64 odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/atomic.h \ odp/arch/arm64-linux/odp/api/abi/barrier.h \ odp/arch/arm64-linux/odp/api/abi/buffer.h \ odp/arch/arm64-linux/odp/api/abi/classification.h \ @@ -147,6 +150,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/atomic.h \ odp/arch/mips64-linux/odp/api/abi/barrier.h \ odp/arch/mips64-linux/odp/api/abi/buffer.h \ odp/arch/mips64-linux/odp/api/abi/classification.h \ @@ -176,6 +180,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_POWERPC odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/atomic.h \ odp/arch/power64-linux/odp/api/abi/barrier.h \ odp/arch/power64-linux/odp/api/abi/buffer.h \ odp/arch/power64-linux/odp/api/abi/classification.h \ @@ -205,6 +210,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_X86_32 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/atomic.h \ odp/arch/x86_32-linux/odp/api/abi/barrier.h \ odp/arch/x86_32-linux/odp/api/abi/buffer.h \ odp/arch/x86_32-linux/odp/api/abi/classification.h \ @@ -234,6 +240,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_X86_64 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/atomic.h \ odp/arch/x86_64-linux/odp/api/abi/barrier.h \ odp/arch/x86_64-linux/odp/api/abi/buffer.h \ odp/arch/x86_64-linux/odp/api/abi/classification.h \ diff --git a/platform/linux-generic/include/odp/api/plat/atomic_types.h b/include/odp/api/abi-default/atomic.h similarity index 90% copy from platform/linux-generic/include/odp/api/plat/atomic_types.h copy to include/odp/api/abi-default/atomic.h index c0803bf1..796e512e 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ b/include/odp/api/abi-default/atomic.h @@ -10,8 +10,8 @@ * ODP atomic operations */
-#ifndef ODP_ATOMIC_TYPES_H_ -#define ODP_ATOMIC_TYPES_H_ +#ifndef ODP_ABI_ATOMIC_H_ +#define ODP_ABI_ATOMIC_H_
#ifdef __cplusplus extern "C" { @@ -40,6 +40,10 @@ struct odp_atomic_u64_s {
#else
+/** + * @internal + * Use embedded lock for atomic 64-bit variable implementation + */ #define ODP_ATOMIC_U64_LOCK 1
/** diff --git a/include/odp/arch/arm32-linux/odp/api/abi/atomic.h b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..8848ad19 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/atomic.h b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..8848ad19 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/atomic.h b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..8848ad19 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/atomic.h b/include/odp/arch/power64-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..8848ad19 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..8848ad19 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..8848ad19 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8bc56847..511afabb 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -75,7 +75,6 @@ odpapiinclude_HEADERS = \ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ - include/odp/api/plat/atomic_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/packet_flag_inlines.h \ @@ -97,6 +96,7 @@ nodist_odpapiplatinclude_HEADERS = \ if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ + include-abi/odp/api/abi/atomic.h \ include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ include-abi/odp/api/abi/classification.h \ diff --git a/platform/linux-generic/include/odp/api/plat/atomic_types.h b/platform/linux-generic/include-abi/odp/api/abi/atomic.h similarity index 86% rename from platform/linux-generic/include/odp/api/plat/atomic_types.h rename to platform/linux-generic/include-abi/odp/api/abi/atomic.h index c0803bf1..0b7b254c 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/atomic.h @@ -10,8 +10,8 @@ * ODP atomic operations */
-#ifndef ODP_ATOMIC_TYPES_H_ -#define ODP_ATOMIC_TYPES_H_ +#ifndef ODP_API_ABI_ATOMIC_H_ +#define ODP_API_ABI_ATOMIC_H_
#ifdef __cplusplus extern "C" { @@ -59,6 +59,16 @@ typedef struct odp_atomic_u64_s odp_atomic_u64_t;
typedef struct odp_atomic_u32_s odp_atomic_u32_t;
+/** @ingroup odp_atomic + * @{ + */ + +#include <odp/api/plat/static_inline.h> +#include <odp/api/plat/atomic_inlines.h> + +/** + * @} + */ #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/atomic.h b/platform/linux-generic/include/odp/api/atomic.h index 7886cb4e..8e515ec6 100644 --- a/platform/linux-generic/include/odp/api/atomic.h +++ b/platform/linux-generic/include/odp/api/atomic.h @@ -10,28 +10,14 @@ * ODP atomic operations */
-#ifndef ODP_PLAT_ATOMIC_H_ -#define ODP_PLAT_ATOMIC_H_ +#ifndef ODP_API_ATOMIC_H_ +#define ODP_API_ATOMIC_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/align.h> -#include <odp/api/plat/atomic_types.h> - -/** @ingroup odp_atomic - * @{ - */ - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/atomic_inlines.h> -#endif - -/** - * @} - */ +#include <odp/api/abi/atomic.h>
#include <odp/api/spec/atomic.h>
diff --git a/platform/linux-generic/include/odp/api/ticketlock.h b/platform/linux-generic/include/odp/api/ticketlock.h index e0f5d81f..ca12cc37 100644 --- a/platform/linux-generic/include/odp/api/ticketlock.h +++ b/platform/linux-generic/include/odp/api/ticketlock.h @@ -19,6 +19,7 @@ extern "C" {
#include <odp/api/plat/ticketlock_types.h>
+#include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 0 #include <odp/api/plat/ticketlock_inlines.h> #endif diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c index 53123b67..1d76caf2 100644 --- a/platform/linux-generic/odp_atomic.c +++ b/platform/linux-generic/odp_atomic.c @@ -7,6 +7,7 @@ #include "config.h"
#include <odp/api/atomic.h> +#include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 1 #include <odp/api/plat/atomic_inlines.h> #endif
commit 585af294de9194f2e5e0bd53b4d5e12eba8ba1ba Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch pool.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 58329901..8bc56847 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -83,7 +83,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/packet_types.h \ - include/odp/api/plat/pool_types.h \ + include/odp/api/plat/pool_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ @@ -106,6 +106,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/init.h \ include-abi/odp/api/abi/ipsec.h \ include-abi/odp/api/abi/packet_io.h \ + include-abi/odp/api/abi/pool.h \ include-abi/odp/api/abi/queue.h \ include-abi/odp/api/abi/rwlock.h \ include-abi/odp/api/abi/rwlock_recursive.h \ diff --git a/platform/linux-generic/include/odp/api/plat/pool_types.h b/platform/linux-generic/include-abi/odp/api/abi/pool.h similarity index 55% rename from platform/linux-generic/include/odp/api/plat/pool_types.h rename to platform/linux-generic/include-abi/odp/api/abi/pool.h index d02e505d..586e80f7 100644 --- a/platform/linux-generic/include/odp/api/plat/pool_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/pool.h @@ -10,18 +10,13 @@ * ODP pool */
-#ifndef ODP_POOL_TYPES_H_ -#define ODP_POOL_TYPES_H_ +#ifndef ODP_API_ABI_POOL_H_ +#define ODP_API_ABI_POOL_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/abi/pool.h> -#else - #include <odp/api/std_types.h> #include <odp/api/plat/strong_types.h> #include <odp/api/abi/event.h> @@ -46,21 +41,6 @@ typedef enum odp_pool_type_t { * @} */
-#endif - -/** @internal Pool field accessor */ -#define _odp_pool_get(pool, cast, field) \ - (*(cast *)(uintptr_t)((uint8_t *)pool + _odp_pool_inline.field)) - -/** @internal Pool header field offsets for inline functions */ -typedef struct _odp_pool_inline_offset_t { - /** @internal field offset */ - uint16_t pool_hdl; - /** @internal field offset */ - uint16_t uarea_size; - -} _odp_pool_inline_offset_t; - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/buffer.h b/platform/linux-generic/include/odp/api/buffer.h index 787a26eb..15734ca7 100644 --- a/platform/linux-generic/include/odp/api/buffer.h +++ b/platform/linux-generic/include/odp/api/buffer.h @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/abi/event.h> #include <odp/api/abi/buffer.h> -#include <odp/api/plat/pool_types.h> +#include <odp/api/abi/pool.h>
#include <odp/api/spec/buffer.h>
diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h index 16f856d3..01be7063 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/platform/linux-generic/include/odp/api/classification.h @@ -18,7 +18,7 @@ extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/pool_types.h> +#include <odp/api/abi/pool.h> #include <odp/api/abi/classification.h> #include <odp/api/plat/packet_types.h> #include <odp/api/abi/packet_io.h> diff --git a/platform/linux-generic/include/odp/api/crypto.h b/platform/linux-generic/include/odp/api/crypto.h index c4fdb884..ead28eab 100644 --- a/platform/linux-generic/include/odp/api/crypto.h +++ b/platform/linux-generic/include/odp/api/crypto.h @@ -21,7 +21,7 @@ extern "C" { #include <odp/api/plat/packet_types.h> #include <odp/api/abi/crypto.h> #include <odp/api/abi/buffer.h> -#include <odp/api/plat/pool_types.h> +#include <odp/api/abi/pool.h> #include <odp/api/queue.h>
/** @ingroup odp_crypto diff --git a/platform/linux-generic/include/odp/api/packet.h b/platform/linux-generic/include/odp/api/packet.h index 71d05a59..5d744df5 100644 --- a/platform/linux-generic/include/odp/api/packet.h +++ b/platform/linux-generic/include/odp/api/packet.h @@ -22,7 +22,7 @@ extern "C" { #include <odp/api/abi/packet_io.h> #include <odp/api/plat/packet_types.h> #include <odp/api/abi/buffer.h> -#include <odp/api/plat/pool_types.h> +#include <odp/api/abi/pool.h>
#include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 0 diff --git a/platform/linux-generic/include/odp/api/packet_io.h b/platform/linux-generic/include/odp/api/packet_io.h index e56a929b..18e9ae01 100644 --- a/platform/linux-generic/include/odp/api/packet_io.h +++ b/platform/linux-generic/include/odp/api/packet_io.h @@ -18,7 +18,7 @@ extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/pool_types.h> +#include <odp/api/abi/pool.h> #include <odp/api/abi/classification.h> #include <odp/api/plat/packet_types.h> #include <odp/api/abi/packet_io.h> diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 5472f7ca..6a19b1c0 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -16,6 +16,7 @@ #include <odp/api/plat/strong_types.h> #include <odp/api/plat/packet_types.h> #include <odp/api/pool.h> +#include <odp/api/plat/pool_inline_types.h> #include <odp/api/time.h> #include <odp/api/abi/packet_io.h> #include <odp/api/abi/buffer.h> diff --git a/platform/linux-generic/include/odp/api/plat/pool_inline_types.h b/platform/linux-generic/include/odp/api/plat/pool_inline_types.h new file mode 100644 index 00000000..784c3846 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/pool_inline_types.h @@ -0,0 +1,37 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet descriptor + */ + +#ifndef ODP_POOL_INLINE_TYPES_H_ +#define ODP_POOL_INLINE_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @internal Pool field accessor */ +#define _odp_pool_get(pool, cast, field) \ + (*(cast *)(uintptr_t)((uint8_t *)pool + _odp_pool_inline.field)) + +/** @internal Pool header field offsets for inline functions */ +typedef struct _odp_pool_inline_offset_t { + /** @internal field offset */ + uint16_t pool_hdl; + /** @internal field offset */ + uint16_t uarea_size; + +} _odp_pool_inline_offset_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/pool.h b/platform/linux-generic/include/odp/api/pool.h index 91c56ad3..845ed5fb 100644 --- a/platform/linux-generic/include/odp/api/pool.h +++ b/platform/linux-generic/include/odp/api/pool.h @@ -10,24 +10,17 @@ * ODP pool */
-#ifndef ODP_PLAT_POOL_H_ -#define ODP_PLAT_POOL_H_ +#ifndef ODP_API_POOL_H_ +#define ODP_API_POOL_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_buffer - * @{ - */ - -/** - * @} - */ - -#include <odp/api/plat/pool_types.h> +#include <odp/api/abi/pool.h> #include <odp/api/abi/shared_memory.h> #include <odp/api/abi/event.h> + #include <odp/api/spec/pool.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/queue.h b/platform/linux-generic/include/odp/api/queue.h index 2fccabcd..6a67b176 100644 --- a/platform/linux-generic/include/odp/api/queue.h +++ b/platform/linux-generic/include/odp/api/queue.h @@ -21,7 +21,7 @@ extern "C" { #include <odp/api/abi/event.h> #include <odp/api/abi/queue.h> #include <odp/api/abi/buffer.h> -#include <odp/api/plat/pool_types.h> +#include <odp/api/abi/pool.h>
#include <odp/api/spec/queue.h>
diff --git a/platform/linux-generic/include/odp/api/timer.h b/platform/linux-generic/include/odp/api/timer.h index 46f25918..e69a8532 100644 --- a/platform/linux-generic/include/odp/api/timer.h +++ b/platform/linux-generic/include/odp/api/timer.h @@ -19,7 +19,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/abi/event.h> -#include <odp/api/plat/pool_types.h> +#include <odp/api/abi/pool.h> #include <odp/api/abi/queue.h> #include <odp/api/abi/timer.h>
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index e20693de..7e3e156f 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <inttypes.h>
+#include <odp/api/plat/pool_inline_types.h> #include <odp/api/plat/ticketlock_inlines.h> #define LOCK(a) _odp_ticketlock_lock(a) #define UNLOCK(a) _odp_ticketlock_unlock(a)
commit 9fd7bf5ec2096b65248d9be983130396de1c32eb Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch schedule.h/schedule_types.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 0f98c46c..7c3293b9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -70,6 +70,8 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/queue.h \ odp/api/abi-default/rwlock.h \ odp/api/abi-default/rwlock_recursive.h \ + odp/api/abi-default/schedule.h \ + odp/api/abi-default/schedule_types.h \ odp/api/abi-default/shared_memory.h \ odp/api/abi-default/spinlock.h \ odp/api/abi-default/spinlock_recursive.h \ @@ -101,6 +103,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/queue.h \ odp/arch/arm32-linux/odp/api/abi/rwlock.h \ odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/arm32-linux/odp/api/abi/schedule.h \ + odp/arch/arm32-linux/odp/api/abi/schedule_types.h \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ odp/arch/arm32-linux/odp/api/abi/spinlock.h \ odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ @@ -128,6 +132,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/queue.h \ odp/arch/arm64-linux/odp/api/abi/rwlock.h \ odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/arm64-linux/odp/api/abi/schedule.h \ + odp/arch/arm64-linux/odp/api/abi/schedule_types.h \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ odp/arch/arm64-linux/odp/api/abi/spinlock.h \ odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ @@ -155,6 +161,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/queue.h \ odp/arch/mips64-linux/odp/api/abi/rwlock.h \ odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/mips64-linux/odp/api/abi/schedule.h \ + odp/arch/mips64-linux/odp/api/abi/schedule_types.h \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ odp/arch/mips64-linux/odp/api/abi/spinlock.h \ odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ @@ -182,6 +190,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/queue.h \ odp/arch/power64-linux/odp/api/abi/rwlock.h \ odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/power64-linux/odp/api/abi/schedule.h \ + odp/arch/power64-linux/odp/api/abi/schedule_types.h \ odp/arch/power64-linux/odp/api/abi/shared_memory.h \ odp/arch/power64-linux/odp/api/abi/spinlock.h \ odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ @@ -209,6 +219,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ odp/arch/x86_32-linux/odp/api/abi/rwlock.h \ odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/x86_32-linux/odp/api/abi/schedule.h \ + odp/arch/x86_32-linux/odp/api/abi/schedule_types.h \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ @@ -236,6 +248,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ odp/arch/x86_64-linux/odp/api/abi/rwlock.h \ odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/x86_64-linux/odp/api/abi/schedule.h \ + odp/arch/x86_64-linux/odp/api/abi/schedule_types.h \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ diff --git a/include/odp/api/abi-default/schedule.h b/include/odp/api/abi-default/schedule.h new file mode 100644 index 00000000..009b14ec --- /dev/null +++ b/include/odp/api/abi-default/schedule.h @@ -0,0 +1,39 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP schedule + */ + +#ifndef ODP_ABI_SCHEDULE_H_ +#define ODP_ABI_SCHEDULE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/std_types.h> + +/** @addtogroup odp_scheduler + * @{ + */ + +#define ODP_SCHED_WAIT UINT64_MAX +#define ODP_SCHED_NO_WAIT 0 + +#define ODP_SCHED_GROUP_NAME_LEN 32 + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/schedule_types.h b/include/odp/api/abi-default/schedule_types.h similarity index 81% rename from platform/linux-generic/include/odp/api/plat/schedule_types.h rename to include/odp/api/abi-default/schedule_types.h index 4e75f9ee..10065a98 100644 --- a/platform/linux-generic/include/odp/api/plat/schedule_types.h +++ b/include/odp/api/abi-default/schedule_types.h @@ -4,29 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */
- /** * @file * * ODP schedule */
-#ifndef ODP_SCHEDULE_TYPES_H_ -#define ODP_SCHEDULE_TYPES_H_ +#ifndef ODP_ABI_SCHEDULE_TYPES_H_ +#define ODP_ABI_SCHEDULE_TYPES_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/std_types.h> - /** @addtogroup odp_scheduler * @{ */
-#define ODP_SCHED_WAIT UINT64_MAX -#define ODP_SCHED_NO_WAIT 0 - typedef int odp_schedule_prio_t;
#define ODP_SCHED_PRIO_HIGHEST 0 @@ -51,8 +45,6 @@ typedef int odp_schedule_group_t; #define ODP_SCHED_GROUP_WORKER 1 #define ODP_SCHED_GROUP_CONTROL 2
-#define ODP_SCHED_GROUP_NAME_LEN 32 - /** * @} */ diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..18427744 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..b3ea96b5 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/arm64-linux/odp/api/abi/schedule.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..18427744 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..b3ea96b5 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/mips64-linux/odp/api/abi/schedule.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..18427744 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..b3ea96b5 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/power64-linux/odp/api/abi/schedule.h b/include/odp/arch/power64-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..18427744 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..b3ea96b5 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_32-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..18427744 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..b3ea96b5 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_64-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..18427744 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..b3ea96b5 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule_types.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 34c979fd..58329901 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -84,7 +84,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/packet_types.h \ include/odp/api/plat/pool_types.h \ - include/odp/api/plat/schedule_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ @@ -110,6 +109,8 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/queue.h \ include-abi/odp/api/abi/rwlock.h \ include-abi/odp/api/abi/rwlock_recursive.h \ + include-abi/odp/api/abi/schedule.h \ + include-abi/odp/api/abi/schedule_types.h \ include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/spinlock.h \ include-abi/odp/api/abi/spinlock_recursive.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/schedule.h b/platform/linux-generic/include-abi/odp/api/abi/schedule.h new file mode 100644 index 00000000..18427744 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h b/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..b3ea96b5 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule_types.h> diff --git a/platform/linux-generic/include/odp/api/schedule.h b/platform/linux-generic/include/odp/api/schedule.h index 00264851..dcdc0ff4 100644 --- a/platform/linux-generic/include/odp/api/schedule.h +++ b/platform/linux-generic/include/odp/api/schedule.h @@ -10,22 +10,15 @@ * ODP schedule */
-#ifndef ODP_PLAT_SCHEDULE_H_ -#define ODP_PLAT_SCHEDULE_H_ +#ifndef ODP_API_SCHEDULE_H_ +#define ODP_API_SCHEDULE_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/schedule_types.h> - -/** @ingroup odp_scheduler - * @{ - */ - -/** - * @} - */ +#include <odp/api/abi/schedule_types.h> +#include <odp/api/abi/schedule.h>
#include <odp/api/spec/schedule.h>
diff --git a/platform/linux-generic/include/odp/api/schedule_types.h b/platform/linux-generic/include/odp/api/schedule_types.h index 536007d6..7c347ae4 100644 --- a/platform/linux-generic/include/odp/api/schedule_types.h +++ b/platform/linux-generic/include/odp/api/schedule_types.h @@ -10,14 +10,14 @@ * ODP schedule */
-#ifndef ODP_PLAT_SCHEDULE_TYPES_H_ -#define ODP_PLAT_SCHEDULE_TYPES_H_ +#ifndef ODP_API_SCHEDULE_TYPES_H_ +#define ODP_API_SCHEDULE_TYPES_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/schedule_types.h> +#include <odp/api/abi/schedule_types.h>
#include <odp/api/spec/schedule_types.h>
commit 539b6fb552d171d202880c3f5ee6e7ca509db98a Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch traffic_mngr.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 947e3569..0f98c46c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -78,6 +78,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/thrmask.h \ odp/api/abi-default/time.h \ odp/api/abi-default/timer.h \ + odp/api/abi-default/traffic_mngr.h \ odp/api/abi-default/version.h
# Insall ABI headers only if required @@ -108,6 +109,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/thrmask.h \ odp/arch/arm32-linux/odp/api/abi/time.h \ odp/arch/arm32-linux/odp/api/abi/timer.h \ + odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 @@ -134,6 +136,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/thrmask.h \ odp/arch/arm64-linux/odp/api/abi/time.h \ odp/arch/arm64-linux/odp/api/abi/timer.h \ + odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 @@ -160,6 +163,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/thrmask.h \ odp/arch/mips64-linux/odp/api/abi/time.h \ odp/arch/mips64-linux/odp/api/abi/timer.h \ + odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC @@ -186,6 +190,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/thrmask.h \ odp/arch/power64-linux/odp/api/abi/time.h \ odp/arch/power64-linux/odp/api/abi/timer.h \ + odp/arch/power64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 @@ -212,6 +217,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ odp/arch/x86_32-linux/odp/api/abi/time.h \ odp/arch/x86_32-linux/odp/api/abi/timer.h \ + odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 @@ -238,6 +244,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ odp/arch/x86_64-linux/odp/api/abi/time.h \ odp/arch/x86_64-linux/odp/api/abi/timer.h \ + odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif endif # ODP_ABI_COMPAT diff --git a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h b/include/odp/api/abi-default/traffic_mngr.h similarity index 95% rename from platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h rename to include/odp/api/abi-default/traffic_mngr.h index be3926d4..b43ab1a0 100644 --- a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h +++ b/include/odp/api/abi-default/traffic_mngr.h @@ -10,15 +10,14 @@ * ODP traffic mngr */
-#ifndef ODP_TRAFFIC_MNGR_TYPES_H_ -#define ODP_TRAFFIC_MNGR_TYPES_H_ +#ifndef ODP_ABI_TRAFFIC_MNGR_H_ +#define ODP_ABI_TRAFFIC_MNGR_H_
#ifdef __cplusplus extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/strong_types.h>
/** @addtogroup odp_traffic_mngr * Macros and operations on a TM system. @@ -168,12 +167,6 @@ typedef odp_tm_handle_t odp_tm_wred_t; */ #define ODP_TM_ROOT ((odp_tm_handle_t)-1)
-/** @internal Get printable format of odp_tm_handle_t @param hdl @return */ -static inline uint64_t odp_tm_handle_to_u64(odp_tm_handle_t hdl) -{ - return hdl; -} - /** * @} */ diff --git a/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..4245cbf7 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/arm64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..4245cbf7 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/mips64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..4245cbf7 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/power64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..4245cbf7 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..4245cbf7 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..4245cbf7 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/traffic_mngr.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4d3fdb15..34c979fd 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -90,8 +90,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h \ - include/odp/api/plat/ticketlock_types.h \ - include/odp/api/plat/traffic_mngr_types.h + include/odp/api/plat/ticketlock_types.h
nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h @@ -119,6 +118,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/thrmask.h \ include-abi/odp/api/abi/time.h \ include-abi/odp/api/abi/timer.h \ + include-abi/odp/api/abi/traffic_mngr.h \ include-abi/odp/api/abi/version.h endif
diff --git a/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h b/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..4245cbf7 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/traffic_mngr.h> diff --git a/platform/linux-generic/include/odp/api/traffic_mngr.h b/platform/linux-generic/include/odp/api/traffic_mngr.h index 3e6f5fbb..6360ccf9 100644 --- a/platform/linux-generic/include/odp/api/traffic_mngr.h +++ b/platform/linux-generic/include/odp/api/traffic_mngr.h @@ -10,22 +10,15 @@ * ODP Traffic manager */
-#ifndef ODP_PLAT_TRAFFIC_MNGR_H_ -#define ODP_PLAT_TRAFFIC_MNGR_H_ +#ifndef ODP_API_TRAFFIC_MNGR_H_ +#define ODP_API_TRAFFIC_MNGR_H_
#ifdef __cplusplus extern "C" { #endif
-/** @ingroup odp_traffic_mngr - * @{ - */ - -/** - * @} - */ +#include <odp/api/abi/traffic_mngr.h>
-#include <odp/api/plat/traffic_mngr_types.h> #include <odp/api/spec/traffic_mngr.h>
#ifdef __cplusplus
commit faa8498d122fcce6321140d9f1c062ebc2bc3d79 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch std_types.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 51a5e717..947e3569 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -73,6 +73,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/shared_memory.h \ odp/api/abi-default/spinlock.h \ odp/api/abi-default/spinlock_recursive.h \ + odp/api/abi-default/std_types.h \ odp/api/abi-default/thread.h \ odp/api/abi-default/thrmask.h \ odp/api/abi-default/time.h \ @@ -102,6 +103,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ odp/arch/arm32-linux/odp/api/abi/spinlock.h \ odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/arm32-linux/odp/api/abi/std_types.h \ odp/arch/arm32-linux/odp/api/abi/thread.h \ odp/arch/arm32-linux/odp/api/abi/thrmask.h \ odp/arch/arm32-linux/odp/api/abi/time.h \ @@ -127,6 +129,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ odp/arch/arm64-linux/odp/api/abi/spinlock.h \ odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/arm64-linux/odp/api/abi/std_types.h \ odp/arch/arm64-linux/odp/api/abi/thread.h \ odp/arch/arm64-linux/odp/api/abi/thrmask.h \ odp/arch/arm64-linux/odp/api/abi/time.h \ @@ -152,6 +155,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ odp/arch/mips64-linux/odp/api/abi/spinlock.h \ odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/mips64-linux/odp/api/abi/std_types.h \ odp/arch/mips64-linux/odp/api/abi/thread.h \ odp/arch/mips64-linux/odp/api/abi/thrmask.h \ odp/arch/mips64-linux/odp/api/abi/time.h \ @@ -177,6 +181,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/shared_memory.h \ odp/arch/power64-linux/odp/api/abi/spinlock.h \ odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/power64-linux/odp/api/abi/std_types.h \ odp/arch/power64-linux/odp/api/abi/thread.h \ odp/arch/power64-linux/odp/api/abi/thrmask.h \ odp/arch/power64-linux/odp/api/abi/time.h \ @@ -202,6 +207,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/x86_32-linux/odp/api/abi/std_types.h \ odp/arch/x86_32-linux/odp/api/abi/thread.h \ odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ odp/arch/x86_32-linux/odp/api/abi/time.h \ @@ -227,6 +233,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/x86_64-linux/odp/api/abi/std_types.h \ odp/arch/x86_64-linux/odp/api/abi/thread.h \ odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ odp/arch/x86_64-linux/odp/api/abi/time.h \ diff --git a/platform/linux-generic/include/odp/api/std_types.h b/include/odp/api/abi-default/std_types.h similarity index 82% copy from platform/linux-generic/include/odp/api/std_types.h copy to include/odp/api/abi-default/std_types.h index b61f33f4..aa449512 100644 --- a/platform/linux-generic/include/odp/api/std_types.h +++ b/include/odp/api/abi-default/std_types.h @@ -10,8 +10,8 @@ * Standard C language types and definitions for ODP. */
-#ifndef ODP_PLAT_STD_TYPES_H_ -#define ODP_PLAT_STD_TYPES_H_ +#ifndef ODP_ABI_STD_TYPES_H_ +#define ODP_ABI_STD_TYPES_H_
#ifdef __cplusplus extern "C" { @@ -20,6 +20,9 @@ extern "C" { /* uint64_t, uint32_t, etc */ #include <stdint.h>
+/* size_t */ +#include <stddef.h> + /* true and false for odp_bool_t */ #include <stdbool.h>
@@ -33,8 +36,6 @@ typedef int odp_bool_t; * @} */
-#include <odp/api/spec/std_types.h> - #ifdef __cplusplus } #endif diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_types.h b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..91130000 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/arm64-linux/odp/api/abi/std_types.h b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..91130000 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/mips64-linux/odp/api/abi/std_types.h b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..91130000 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/power64-linux/odp/api/abi/std_types.h b/include/odp/arch/power64-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..91130000 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_32-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..91130000 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_64-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..91130000 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_types.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index f7d27fd1..4d3fdb15 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -114,6 +114,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/spinlock.h \ include-abi/odp/api/abi/spinlock_recursive.h \ + include-abi/odp/api/abi/std_types.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ include-abi/odp/api/abi/time.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/std_types.h b/platform/linux-generic/include-abi/odp/api/abi/std_types.h new file mode 100644 index 00000000..91130000 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_types.h> diff --git a/platform/linux-generic/include/odp/api/std_types.h b/platform/linux-generic/include/odp/api/std_types.h index b61f33f4..c99cbf97 100644 --- a/platform/linux-generic/include/odp/api/std_types.h +++ b/platform/linux-generic/include/odp/api/std_types.h @@ -10,28 +10,15 @@ * Standard C language types and definitions for ODP. */
-#ifndef ODP_PLAT_STD_TYPES_H_ -#define ODP_PLAT_STD_TYPES_H_ +#ifndef ODP_API_STD_TYPES_H_ +#define ODP_API_STD_TYPES_H_
#ifdef __cplusplus extern "C" { #endif
-/* uint64_t, uint32_t, etc */ -#include <stdint.h>
-/* true and false for odp_bool_t */ -#include <stdbool.h> - -/** @addtogroup odp_system ODP SYSTEM - * @{ - */ - -typedef int odp_bool_t; - -/** - * @} - */ +#include <odp/api/abi/std_types.h>
#include <odp/api/spec/std_types.h>
commit 94bcafaaccc3aba545cc112da8ff9fd828a25a98 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch timer.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index aeadb2e2..51a5e717 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -76,6 +76,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/thread.h \ odp/api/abi-default/thrmask.h \ odp/api/abi-default/time.h \ + odp/api/abi-default/timer.h \ odp/api/abi-default/version.h
# Insall ABI headers only if required @@ -104,6 +105,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/thread.h \ odp/arch/arm32-linux/odp/api/abi/thrmask.h \ odp/arch/arm32-linux/odp/api/abi/time.h \ + odp/arch/arm32-linux/odp/api/abi/timer.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 @@ -128,6 +130,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/thread.h \ odp/arch/arm64-linux/odp/api/abi/thrmask.h \ odp/arch/arm64-linux/odp/api/abi/time.h \ + odp/arch/arm64-linux/odp/api/abi/timer.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 @@ -152,6 +155,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/thread.h \ odp/arch/mips64-linux/odp/api/abi/thrmask.h \ odp/arch/mips64-linux/odp/api/abi/time.h \ + odp/arch/mips64-linux/odp/api/abi/timer.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC @@ -176,6 +180,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/thread.h \ odp/arch/power64-linux/odp/api/abi/thrmask.h \ odp/arch/power64-linux/odp/api/abi/time.h \ + odp/arch/power64-linux/odp/api/abi/timer.h \ odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 @@ -200,6 +205,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/thread.h \ odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ odp/arch/x86_32-linux/odp/api/abi/time.h \ + odp/arch/x86_32-linux/odp/api/abi/timer.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 @@ -224,6 +230,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/thread.h \ odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ odp/arch/x86_64-linux/odp/api/abi/time.h \ + odp/arch/x86_64-linux/odp/api/abi/timer.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif endif # ODP_ABI_COMPAT diff --git a/include/odp/api/abi-default/timer.h b/include/odp/api/abi-default/timer.h new file mode 100644 index 00000000..36759b18 --- /dev/null +++ b/include/odp/api/abi-default/timer.h @@ -0,0 +1,54 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP timer service + */ + +#ifndef ODP_ABI_TIMER_H_ +#define ODP_ABI_TIMER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_timer_t; + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_timeout_t; + +/** @addtogroup odp_timer + * @{ + **/ + +struct timer_pool_s; /**< Forward declaration */ + +typedef struct timer_pool_s *odp_timer_pool_t; + +#define ODP_TIMER_POOL_INVALID NULL + +#define ODP_TIMER_POOL_NAME_LEN 32 + +typedef _odp_abi_timer_t *odp_timer_t; + +#define ODP_TIMER_INVALID ((odp_timer_t)0xffffffff) + +typedef _odp_abi_timeout_t *odp_timeout_t; + +#define ODP_TIMEOUT_INVALID ((odp_timeout_t)NULL) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/arm32-linux/odp/api/abi/timer.h b/include/odp/arch/arm32-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..e52a3e12 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/timer.h b/include/odp/arch/arm64-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..e52a3e12 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/timer.h b/include/odp/arch/mips64-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..e52a3e12 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/timer.h b/include/odp/arch/power64-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..e52a3e12 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/timer.h b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..e52a3e12 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/timer.h b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..e52a3e12 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 88aaaa4e..f7d27fd1 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -91,7 +91,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h \ include/odp/api/plat/ticketlock_types.h \ - include/odp/api/plat/timer_types.h \ include/odp/api/plat/traffic_mngr_types.h
nodist_odpapiplatinclude_HEADERS = \ @@ -118,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ include-abi/odp/api/abi/time.h \ + include-abi/odp/api/abi/timer.h \ include-abi/odp/api/abi/version.h endif
diff --git a/platform/linux-generic/include/odp/api/plat/timer_types.h b/platform/linux-generic/include-abi/odp/api/abi/timer.h similarity index 92% rename from platform/linux-generic/include/odp/api/plat/timer_types.h rename to platform/linux-generic/include-abi/odp/api/abi/timer.h index 9605d584..19b6a4b0 100644 --- a/platform/linux-generic/include/odp/api/plat/timer_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/timer.h @@ -11,8 +11,8 @@ * ODP timer service */
-#ifndef ODP_TIMER_TYPES_H_ -#define ODP_TIMER_TYPES_H_ +#ifndef ODP_API_ABI_TIMER_H_ +#define ODP_API_ABI_TIMER_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/timer.h b/platform/linux-generic/include/odp/api/timer.h index 2d68db79..46f25918 100644 --- a/platform/linux-generic/include/odp/api/timer.h +++ b/platform/linux-generic/include/odp/api/timer.h @@ -10,8 +10,8 @@ * ODP timer service */
-#ifndef ODP_PLAT_TIMER_H_ -#define ODP_PLAT_TIMER_H_ +#ifndef ODP_API_TIMER_H_ +#define ODP_API_TIMER_H_
#ifdef __cplusplus extern "C" { @@ -21,15 +21,7 @@ extern "C" { #include <odp/api/abi/event.h> #include <odp/api/plat/pool_types.h> #include <odp/api/abi/queue.h> -#include <odp/api/plat/timer_types.h> - -/** @ingroup odp_timer - * @{ - */ - -/** - * @} - */ +#include <odp/api/abi/timer.h>
#include <odp/api/spec/timer.h>
commit 84d5cf917d301d91246f013c3e51da35fa26b903 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch time.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 0d48219e..aeadb2e2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -75,6 +75,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/spinlock_recursive.h \ odp/api/abi-default/thread.h \ odp/api/abi-default/thrmask.h \ + odp/api/abi-default/time.h \ odp/api/abi-default/version.h
# Insall ABI headers only if required @@ -102,6 +103,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/arm32-linux/odp/api/abi/thread.h \ odp/arch/arm32-linux/odp/api/abi/thrmask.h \ + odp/arch/arm32-linux/odp/api/abi/time.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 @@ -125,6 +127,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/arm64-linux/odp/api/abi/thread.h \ odp/arch/arm64-linux/odp/api/abi/thrmask.h \ + odp/arch/arm64-linux/odp/api/abi/time.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 @@ -148,6 +151,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/mips64-linux/odp/api/abi/thread.h \ odp/arch/mips64-linux/odp/api/abi/thrmask.h \ + odp/arch/mips64-linux/odp/api/abi/time.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC @@ -171,6 +175,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/power64-linux/odp/api/abi/thread.h \ odp/arch/power64-linux/odp/api/abi/thrmask.h \ + odp/arch/power64-linux/odp/api/abi/time.h \ odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 @@ -194,6 +199,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/x86_32-linux/odp/api/abi/thread.h \ odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ + odp/arch/x86_32-linux/odp/api/abi/time.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 @@ -217,6 +223,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/x86_64-linux/odp/api/abi/thread.h \ odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ + odp/arch/x86_64-linux/odp/api/abi/time.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif endif # ODP_ABI_COMPAT diff --git a/platform/linux-generic/include/odp/api/plat/time_types.h b/include/odp/api/abi-default/time.h similarity index 93% rename from platform/linux-generic/include/odp/api/plat/time_types.h rename to include/odp/api/abi-default/time.h index e7111c8c..d3b5abda 100644 --- a/platform/linux-generic/include/odp/api/plat/time_types.h +++ b/include/odp/api/abi-default/time.h @@ -10,8 +10,8 @@ * ODP time service */
-#ifndef ODP_TIME_TYPES_H_ -#define ODP_TIME_TYPES_H_ +#ifndef ODP_ABI_TIME_H_ +#define ODP_ABI_TIME_H_
#ifdef __cplusplus extern "C" { diff --git a/include/odp/arch/arm32-linux/odp/api/abi/time.h b/include/odp/arch/arm32-linux/odp/api/abi/time.h new file mode 100644 index 00000000..2672d789 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/time.h b/include/odp/arch/arm64-linux/odp/api/abi/time.h new file mode 100644 index 00000000..2672d789 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/time.h b/include/odp/arch/mips64-linux/odp/api/abi/time.h new file mode 100644 index 00000000..2672d789 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/time.h b/include/odp/arch/power64-linux/odp/api/abi/time.h new file mode 100644 index 00000000..2672d789 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/time.h b/include/odp/arch/x86_32-linux/odp/api/abi/time.h new file mode 100644 index 00000000..2672d789 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/time.h b/include/odp/arch/x86_64-linux/odp/api/abi/time.h new file mode 100644 index 00000000..2672d789 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4bea8ab9..88aaaa4e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -91,7 +91,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h \ include/odp/api/plat/ticketlock_types.h \ - include/odp/api/plat/time_types.h \ include/odp/api/plat/timer_types.h \ include/odp/api/plat/traffic_mngr_types.h
@@ -118,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/spinlock_recursive.h \ include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/thrmask.h \ + include-abi/odp/api/abi/time.h \ include-abi/odp/api/abi/version.h endif
diff --git a/platform/linux-generic/include-abi/odp/api/abi/time.h b/platform/linux-generic/include-abi/odp/api/abi/time.h new file mode 100644 index 00000000..2672d789 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/platform/linux-generic/include/odp/api/time.h b/platform/linux-generic/include/odp/api/time.h index 8d1c33e6..629677d4 100644 --- a/platform/linux-generic/include/odp/api/time.h +++ b/platform/linux-generic/include/odp/api/time.h @@ -10,18 +10,16 @@ * ODP time */
-#ifndef ODP_PLAT_TIME_H_ -#define ODP_PLAT_TIME_H_ +#ifndef ODP_API_TIME_H_ +#define ODP_API_TIME_H_
#ifdef __cplusplus extern "C" { #endif
#include <odp/api/std_types.h> +#include <odp/api/abi/time.h>
- - -#include <odp/api/plat/time_types.h> #include <odp/api/spec/time.h>
#ifdef __cplusplus
commit 0689cde60fa90e5ddd24d07fec08ea95251d6db5 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch thrmask.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index adc13a11..0d48219e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -74,6 +74,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/spinlock.h \ odp/api/abi-default/spinlock_recursive.h \ odp/api/abi-default/thread.h \ + odp/api/abi-default/thrmask.h \ odp/api/abi-default/version.h
# Insall ABI headers only if required @@ -100,6 +101,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/spinlock.h \ odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/arm32-linux/odp/api/abi/thread.h \ + odp/arch/arm32-linux/odp/api/abi/thrmask.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 @@ -122,6 +124,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/spinlock.h \ odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/arm64-linux/odp/api/abi/thread.h \ + odp/arch/arm64-linux/odp/api/abi/thrmask.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 @@ -144,6 +147,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/spinlock.h \ odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/mips64-linux/odp/api/abi/thread.h \ + odp/arch/mips64-linux/odp/api/abi/thrmask.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC @@ -166,6 +170,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/spinlock.h \ odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/power64-linux/odp/api/abi/thread.h \ + odp/arch/power64-linux/odp/api/abi/thrmask.h \ odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 @@ -188,6 +193,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/spinlock.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/x86_32-linux/odp/api/abi/thread.h \ + odp/arch/x86_32-linux/odp/api/abi/thrmask.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 @@ -210,6 +216,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/spinlock.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/x86_64-linux/odp/api/abi/thread.h \ + odp/arch/x86_64-linux/odp/api/abi/thrmask.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif endif # ODP_ABI_COMPAT diff --git a/platform/linux-generic/include/odp/api/plat/thrmask_types.h b/include/odp/api/abi-default/thrmask.h similarity index 91% rename from platform/linux-generic/include/odp/api/plat/thrmask_types.h rename to include/odp/api/abi-default/thrmask.h index 5d93890c..1fafd229 100644 --- a/platform/linux-generic/include/odp/api/plat/thrmask_types.h +++ b/include/odp/api/abi-default/thrmask.h @@ -10,8 +10,8 @@ * ODP thread masks */
-#ifndef ODP_THRMASK_TYPES_H_ -#define ODP_THRMASK_TYPES_H_ +#ifndef ODP_ABI_THRMASK_H_ +#define ODP_ABI_THRMASK_H_
#ifdef __cplusplus extern "C" { diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..0c1dc0ce --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..0c1dc0ce --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..0c1dc0ce --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/thrmask.h b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..0c1dc0ce --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..0c1dc0ce --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..0c1dc0ce --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 308aed4c..4bea8ab9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -88,7 +88,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ - include/odp/api/plat/thrmask_types.h \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h \ include/odp/api/plat/ticketlock_types.h \ @@ -118,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/spinlock.h \ include-abi/odp/api/abi/spinlock_recursive.h \ include-abi/odp/api/abi/thread.h \ + include-abi/odp/api/abi/thrmask.h \ include-abi/odp/api/abi/version.h endif
diff --git a/platform/linux-generic/include-abi/odp/api/abi/thrmask.h b/platform/linux-generic/include-abi/odp/api/abi/thrmask.h new file mode 100644 index 00000000..0c1dc0ce --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/platform/linux-generic/include/odp/api/thrmask.h b/platform/linux-generic/include/odp/api/thrmask.h index b1c20777..568beb1c 100644 --- a/platform/linux-generic/include/odp/api/thrmask.h +++ b/platform/linux-generic/include/odp/api/thrmask.h @@ -10,22 +10,14 @@ * ODP thread masks */
-#ifndef ODP_PLAT_THRMASK_H_ -#define ODP_PLAT_THRMASK_H_ +#ifndef ODP_API_THRMASK_H_ +#define ODP_API_THRMASK_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/thrmask_types.h> - -/** @ingroup odp_thread - * @{ - */ - -/** - * @} - */ +#include <odp/api/abi/thrmask.h>
#include <odp/api/spec/thrmask.h>
commit a8ce5f13b5cbf1583fef04d687cef94d18357520 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch thread.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 4b4a9f1f..adc13a11 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -73,6 +73,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/shared_memory.h \ odp/api/abi-default/spinlock.h \ odp/api/abi-default/spinlock_recursive.h \ + odp/api/abi-default/thread.h \ odp/api/abi-default/version.h
# Insall ABI headers only if required @@ -98,6 +99,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ odp/arch/arm32-linux/odp/api/abi/spinlock.h \ odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/arm32-linux/odp/api/abi/thread.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 @@ -119,6 +121,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ odp/arch/arm64-linux/odp/api/abi/spinlock.h \ odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/arm64-linux/odp/api/abi/thread.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 @@ -140,6 +143,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ odp/arch/mips64-linux/odp/api/abi/spinlock.h \ odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/mips64-linux/odp/api/abi/thread.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC @@ -161,6 +165,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/shared_memory.h \ odp/arch/power64-linux/odp/api/abi/spinlock.h \ odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/power64-linux/odp/api/abi/thread.h \ odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 @@ -182,6 +187,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/x86_32-linux/odp/api/abi/thread.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 @@ -203,6 +209,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/x86_64-linux/odp/api/abi/thread.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif endif # ODP_ABI_COMPAT diff --git a/platform/linux-generic/include/odp/api/plat/thread_types.h b/include/odp/api/abi-default/thread.h similarity index 84% rename from platform/linux-generic/include/odp/api/plat/thread_types.h rename to include/odp/api/abi-default/thread.h index 33af4598..682d8500 100644 --- a/platform/linux-generic/include/odp/api/plat/thread_types.h +++ b/include/odp/api/abi-default/thread.h @@ -10,8 +10,8 @@ * ODP thread */
-#ifndef ODP_THREAD_TYPES_H_ -#define ODP_THREAD_TYPES_H_ +#ifndef ODP_ABI_THREAD_H_ +#define ODP_ABI_THREAD_H_
#ifdef __cplusplus extern "C" { diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thread.h b/include/odp/arch/arm32-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..dc29a7da --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thread.h b/include/odp/arch/arm64-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..dc29a7da --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thread.h b/include/odp/arch/mips64-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..dc29a7da --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/thread.h b/include/odp/arch/power64-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..dc29a7da --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..dc29a7da --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..dc29a7da --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 716f6756..308aed4c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -88,7 +88,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ - include/odp/api/plat/thread_types.h \ include/odp/api/plat/thrmask_types.h \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h \ @@ -118,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/spinlock.h \ include-abi/odp/api/abi/spinlock_recursive.h \ + include-abi/odp/api/abi/thread.h \ include-abi/odp/api/abi/version.h endif
diff --git a/platform/linux-generic/include-abi/odp/api/abi/thread.h b/platform/linux-generic/include-abi/odp/api/abi/thread.h new file mode 100644 index 00000000..dc29a7da --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/platform/linux-generic/include/odp/api/thread.h b/platform/linux-generic/include/odp/api/thread.h index c54abc89..85af314b 100644 --- a/platform/linux-generic/include/odp/api/thread.h +++ b/platform/linux-generic/include/odp/api/thread.h @@ -10,14 +10,14 @@ * ODP thread API */
-#ifndef ODP_PLAT_THREAD_H_ -#define ODP_PLAT_THREAD_H_ +#ifndef ODP_API_THREAD_H_ +#define ODP_API_THREAD_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/thread_types.h> +#include <odp/api/abi/thread.h>
#include <odp/api/spec/thread.h>
commit e93535eed4262b76597c193a169fbc94fd91bb25 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch spinlock_recursive.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 12b1c4bd..4b4a9f1f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -72,6 +72,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/rwlock_recursive.h \ odp/api/abi-default/shared_memory.h \ odp/api/abi-default/spinlock.h \ + odp/api/abi-default/spinlock_recursive.h \ odp/api/abi-default/version.h
# Insall ABI headers only if required @@ -96,6 +97,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ odp/arch/arm32-linux/odp/api/abi/spinlock.h \ + odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 @@ -116,6 +118,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ odp/arch/arm64-linux/odp/api/abi/spinlock.h \ + odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 @@ -136,6 +139,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ odp/arch/mips64-linux/odp/api/abi/spinlock.h \ + odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC @@ -156,6 +160,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/power64-linux/odp/api/abi/shared_memory.h \ odp/arch/power64-linux/odp/api/abi/spinlock.h \ + odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 @@ -176,6 +181,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_32-linux/odp/api/abi/spinlock.h \ + odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 @@ -196,6 +202,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_64-linux/odp/api/abi/spinlock.h \ + odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif endif # ODP_ABI_COMPAT diff --git a/platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h b/include/odp/api/abi-default/spinlock_recursive.h similarity index 71% rename from platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h rename to include/odp/api/abi-default/spinlock_recursive.h index c5a1adff..235f7ac6 100644 --- a/platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h +++ b/include/odp/api/abi-default/spinlock_recursive.h @@ -10,8 +10,8 @@ * ODP recursive spinlock */
-#ifndef ODP_SPINLOCK_RECURSIVE_TYPES_H_ -#define ODP_SPINLOCK_RECURSIVE_TYPES_H_ +#ifndef ODP_ABI_SPINLOCK_RECURSIVE_H_ +#define ODP_ABI_SPINLOCK_RECURSIVE_H_
#ifdef __cplusplus extern "C" { @@ -21,13 +21,11 @@ extern "C" { #include <odp/api/std_types.h>
/** @internal */ -struct odp_spinlock_recursive_s { +typedef struct odp_spinlock_recursive_s { odp_spinlock_t lock; /**< the lock */ int owner; /**< thread owning the lock */ uint32_t cnt; /**< recursion count */ -}; - -typedef struct odp_spinlock_recursive_s odp_spinlock_recursive_t; +} odp_spinlock_recursive_t;
#ifdef __cplusplus } diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..a7a49bd4 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/arm64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..a7a49bd4 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/mips64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..a7a49bd4 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/power64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..a7a49bd4 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..a7a49bd4 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..a7a49bd4 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock_recursive.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 87e187f1..716f6756 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -85,7 +85,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_types.h \ include/odp/api/plat/pool_types.h \ include/odp/api/plat/schedule_types.h \ - include/odp/api/plat/spinlock_recursive_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ @@ -118,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/rwlock_recursive.h \ include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/spinlock.h \ + include-abi/odp/api/abi/spinlock_recursive.h \ include-abi/odp/api/abi/version.h endif
diff --git a/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h b/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..a7a49bd4 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock_recursive.h> diff --git a/platform/linux-generic/include/odp/api/spinlock_recursive.h b/platform/linux-generic/include/odp/api/spinlock_recursive.h index d97b0173..23f79db2 100644 --- a/platform/linux-generic/include/odp/api/spinlock_recursive.h +++ b/platform/linux-generic/include/odp/api/spinlock_recursive.h @@ -10,14 +10,14 @@ * ODP resursive spinlock */
-#ifndef ODP_PLAT_SPINLOCK_RECURSIVE_H_ -#define ODP_PLAT_SPINLOCK_RECURSIVE_H_ +#ifndef ODP_API_SPINLOCK_RECURSIVE_H_ +#define ODP_API_SPINLOCK_RECURSIVE_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/spinlock_recursive_types.h> +#include <odp/api/abi/spinlock_recursive.h>
#include <odp/api/spec/spinlock_recursive.h>
commit b4b6cdaa390cef0e5a42e6c8fc0f605d7879bee5 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch spinlock.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 00481451..12b1c4bd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -71,6 +71,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/rwlock.h \ odp/api/abi-default/rwlock_recursive.h \ odp/api/abi-default/shared_memory.h \ + odp/api/abi-default/spinlock.h \ odp/api/abi-default/version.h
# Insall ABI headers only if required @@ -94,6 +95,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/rwlock.h \ odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ + odp/arch/arm32-linux/odp/api/abi/spinlock.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 @@ -113,6 +115,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/rwlock.h \ odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ + odp/arch/arm64-linux/odp/api/abi/spinlock.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 @@ -132,6 +135,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/rwlock.h \ odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ + odp/arch/mips64-linux/odp/api/abi/spinlock.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC @@ -151,6 +155,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/rwlock.h \ odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/power64-linux/odp/api/abi/shared_memory.h \ + odp/arch/power64-linux/odp/api/abi/spinlock.h \ odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 @@ -170,6 +175,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/rwlock.h \ odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ + odp/arch/x86_32-linux/odp/api/abi/spinlock.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 @@ -189,6 +195,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/rwlock.h \ odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ + odp/arch/x86_64-linux/odp/api/abi/spinlock.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif endif # ODP_ABI_COMPAT diff --git a/platform/linux-generic/include/odp/api/plat/spinlock_types.h b/include/odp/api/abi-default/spinlock.h similarity index 64% rename from platform/linux-generic/include/odp/api/plat/spinlock_types.h rename to include/odp/api/abi-default/spinlock.h index f38ece6a..b9703b10 100644 --- a/platform/linux-generic/include/odp/api/plat/spinlock_types.h +++ b/include/odp/api/abi-default/spinlock.h @@ -4,28 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */
- /** * @file * * ODP spinlock */
-#ifndef ODP_SPINLOCK_TYPES_H_ -#define ODP_SPINLOCK_TYPES_H_ +#ifndef ODP_ABI_SPINLOCK_H_ +#define ODP_ABI_SPINLOCK_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/std_types.h> - /** @internal */ -struct odp_spinlock_s { +typedef struct odp_spinlock_s { char lock; /**< lock flag, should match odp_atomic_flag_t */ -}; - -typedef struct odp_spinlock_s odp_spinlock_t; +} odp_spinlock_t;
#ifdef __cplusplus } diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..4894095b --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..4894095b --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..4894095b --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..4894095b --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..4894095b --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..4894095b --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 18e3b2d8..87e187f1 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -85,7 +85,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_types.h \ include/odp/api/plat/pool_types.h \ include/odp/api/plat/schedule_types.h \ - include/odp/api/plat/spinlock_types.h \ include/odp/api/plat/spinlock_recursive_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ @@ -118,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/rwlock.h \ include-abi/odp/api/abi/rwlock_recursive.h \ include-abi/odp/api/abi/shared_memory.h \ + include-abi/odp/api/abi/spinlock.h \ include-abi/odp/api/abi/version.h endif
diff --git a/platform/linux-generic/include-abi/odp/api/abi/spinlock.h b/platform/linux-generic/include-abi/odp/api/abi/spinlock.h new file mode 100644 index 00000000..4894095b --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/platform/linux-generic/include/odp/api/spinlock.h b/platform/linux-generic/include/odp/api/spinlock.h index 830f4edd..0f41216d 100644 --- a/platform/linux-generic/include/odp/api/spinlock.h +++ b/platform/linux-generic/include/odp/api/spinlock.h @@ -10,14 +10,14 @@ * ODP spinlock */
-#ifndef ODP_PLAT_SPINLOCK_H_ -#define ODP_PLAT_SPINLOCK_H_ +#ifndef ODP_API_SPINLOCK_H_ +#define ODP_API_SPINLOCK_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/spinlock_types.h> +#include <odp/api/abi/spinlock.h>
#include <odp/api/spec/spinlock.h>
commit 96ad2312bfc2d1d0d1d23e61113da55d31b7fbc1 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch rwlock_recursive.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index f4ca6d9e..00481451 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -69,6 +69,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/pool.h \ odp/api/abi-default/queue.h \ odp/api/abi-default/rwlock.h \ + odp/api/abi-default/rwlock_recursive.h \ odp/api/abi-default/shared_memory.h \ odp/api/abi-default/version.h
@@ -91,6 +92,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/pool.h \ odp/arch/arm32-linux/odp/api/abi/queue.h \ odp/arch/arm32-linux/odp/api/abi/rwlock.h \ + odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif @@ -109,6 +111,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/pool.h \ odp/arch/arm64-linux/odp/api/abi/queue.h \ odp/arch/arm64-linux/odp/api/abi/rwlock.h \ + odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif @@ -127,6 +130,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/pool.h \ odp/arch/mips64-linux/odp/api/abi/queue.h \ odp/arch/mips64-linux/odp/api/abi/rwlock.h \ + odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif @@ -145,6 +149,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/pool.h \ odp/arch/power64-linux/odp/api/abi/queue.h \ odp/arch/power64-linux/odp/api/abi/rwlock.h \ + odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/power64-linux/odp/api/abi/shared_memory.h \ odp/arch/power64-linux/odp/api/abi/version.h endif @@ -163,6 +168,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/pool.h \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ odp/arch/x86_32-linux/odp/api/abi/rwlock.h \ + odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif @@ -181,6 +187,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/pool.h \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ odp/arch/x86_64-linux/odp/api/abi/rwlock.h \ + odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif diff --git a/platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h b/include/odp/api/abi-default/rwlock_recursive.h similarity index 77% rename from platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h rename to include/odp/api/abi-default/rwlock_recursive.h index 36f9204a..f5f78bfa 100644 --- a/platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h +++ b/include/odp/api/abi-default/rwlock_recursive.h @@ -10,8 +10,8 @@ * ODP recursive read/write lock */
-#ifndef ODP_RWLOCK_RECURSIVE_TYPES_H_ -#define ODP_RWLOCK_RECURSIVE_TYPES_H_ +#ifndef ODP_ABI_RWLOCK_RECURSIVE_H_ +#define ODP_ABI_RWLOCK_RECURSIVE_H_
#ifdef __cplusplus extern "C" { @@ -22,14 +22,12 @@ extern "C" { #include <odp/api/thread.h>
/** @internal */ -struct odp_rwlock_recursive_s { +typedef struct odp_rwlock_recursive_s { odp_rwlock_t lock; /**< the lock */ int wr_owner; /**< write owner thread */ uint32_t wr_cnt; /**< write recursion count */ uint8_t rd_cnt[ODP_THREAD_COUNT_MAX]; /**< read recursion count */ -}; - -typedef struct odp_rwlock_recursive_s odp_rwlock_recursive_t; +} odp_rwlock_recursive_t;
#ifdef __cplusplus } diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..841710d3 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/arm64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..841710d3 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/mips64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..841710d3 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/power64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..841710d3 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..841710d3 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..841710d3 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock_recursive.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 6d401e9c..18e3b2d8 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -84,7 +84,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/packet_types.h \ include/odp/api/plat/pool_types.h \ - include/odp/api/plat/rwlock_recursive_types.h \ include/odp/api/plat/schedule_types.h \ include/odp/api/plat/spinlock_types.h \ include/odp/api/plat/spinlock_recursive_types.h \ @@ -117,6 +116,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/packet_io.h \ include-abi/odp/api/abi/queue.h \ include-abi/odp/api/abi/rwlock.h \ + include-abi/odp/api/abi/rwlock_recursive.h \ include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/version.h endif diff --git a/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h b/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..841710d3 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock_recursive.h> diff --git a/platform/linux-generic/include/odp/api/rwlock_recursive.h b/platform/linux-generic/include/odp/api/rwlock_recursive.h index 4a081532..f205f434 100644 --- a/platform/linux-generic/include/odp/api/rwlock_recursive.h +++ b/platform/linux-generic/include/odp/api/rwlock_recursive.h @@ -10,14 +10,14 @@ * ODP resursive read/write lock */
-#ifndef ODP_PLAT_RWLOCK_RECURSIVE_H_ -#define ODP_PLAT_RWLOCK_RECURSIVE_H_ +#ifndef ODP_API_RWLOCK_RECURSIVE_H_ +#define ODP_API_RWLOCK_RECURSIVE_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/rwlock_recursive_types.h> +#include <odp/api/abi/rwlock_recursive.h>
#include <odp/api/spec/rwlock_recursive.h>
commit 55f928652f0b6accc8ba82fc68eeaebb2fd1426d Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch rwlock.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 36015491..f4ca6d9e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -68,6 +68,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/packet_io.h \ odp/api/abi-default/pool.h \ odp/api/abi-default/queue.h \ + odp/api/abi-default/rwlock.h \ odp/api/abi-default/shared_memory.h \ odp/api/abi-default/version.h
@@ -89,6 +90,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/packet_io.h \ odp/arch/arm32-linux/odp/api/abi/pool.h \ odp/arch/arm32-linux/odp/api/abi/queue.h \ + odp/arch/arm32-linux/odp/api/abi/rwlock.h \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ odp/arch/arm32-linux/odp/api/abi/version.h endif @@ -106,6 +108,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/packet_io.h \ odp/arch/arm64-linux/odp/api/abi/pool.h \ odp/arch/arm64-linux/odp/api/abi/queue.h \ + odp/arch/arm64-linux/odp/api/abi/rwlock.h \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif @@ -123,6 +126,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/packet_io.h \ odp/arch/mips64-linux/odp/api/abi/pool.h \ odp/arch/mips64-linux/odp/api/abi/queue.h \ + odp/arch/mips64-linux/odp/api/abi/rwlock.h \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ odp/arch/mips64-linux/odp/api/abi/version.h endif @@ -140,6 +144,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/packet_io.h \ odp/arch/power64-linux/odp/api/abi/pool.h \ odp/arch/power64-linux/odp/api/abi/queue.h \ + odp/arch/power64-linux/odp/api/abi/rwlock.h \ odp/arch/power64-linux/odp/api/abi/shared_memory.h \ odp/arch/power64-linux/odp/api/abi/version.h endif @@ -157,6 +162,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/packet_io.h \ odp/arch/x86_32-linux/odp/api/abi/pool.h \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ + odp/arch/x86_32-linux/odp/api/abi/rwlock.h \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_32-linux/odp/api/abi/version.h endif @@ -174,6 +180,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/packet_io.h \ odp/arch/x86_64-linux/odp/api/abi/pool.h \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ + odp/arch/x86_64-linux/odp/api/abi/rwlock.h \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif diff --git a/platform/linux-generic/include/odp/api/plat/rwlock_types.h b/include/odp/api/abi-default/rwlock.h similarity index 75% rename from platform/linux-generic/include/odp/api/plat/rwlock_types.h rename to include/odp/api/abi-default/rwlock.h index f7dc0449..3542c388 100644 --- a/platform/linux-generic/include/odp/api/plat/rwlock_types.h +++ b/include/odp/api/abi-default/rwlock.h @@ -4,15 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */
- /** * @file * * ODP rwlock */
-#ifndef ODP_RWLOCK_TYPES_H_ -#define ODP_RWLOCK_TYPES_H_ +#ifndef ODP_ABI_RWLOCK_H_ +#define ODP_ABI_RWLOCK_H_
#ifdef __cplusplus extern "C" { @@ -21,14 +20,12 @@ extern "C" { #include <odp/api/atomic.h>
/** @internal */ -struct odp_rwlock_s { +typedef struct odp_rwlock_s { odp_atomic_u32_t cnt; /**< lock count 0 lock not taken -1 write lock taken >0 read lock(s) taken */ -}; - -typedef struct odp_rwlock_s odp_rwlock_t; +} odp_rwlock_t;
#ifdef __cplusplus } diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..cba0743e --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..cba0743e --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..cba0743e --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..cba0743e --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..cba0743e --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..cba0743e --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 64643605..6d401e9c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -84,7 +84,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/packet_types.h \ include/odp/api/plat/pool_types.h \ - include/odp/api/plat/rwlock_types.h \ include/odp/api/plat/rwlock_recursive_types.h \ include/odp/api/plat/schedule_types.h \ include/odp/api/plat/spinlock_types.h \ @@ -117,6 +116,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/ipsec.h \ include-abi/odp/api/abi/packet_io.h \ include-abi/odp/api/abi/queue.h \ + include-abi/odp/api/abi/rwlock.h \ include-abi/odp/api/abi/shared_memory.h \ include-abi/odp/api/abi/version.h endif diff --git a/platform/linux-generic/include-abi/odp/api/abi/rwlock.h b/platform/linux-generic/include-abi/odp/api/abi/rwlock.h new file mode 100644 index 00000000..cba0743e --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/platform/linux-generic/include/odp/api/rwlock.h b/platform/linux-generic/include/odp/api/rwlock.h index 4a86173f..1aab7596 100644 --- a/platform/linux-generic/include/odp/api/rwlock.h +++ b/platform/linux-generic/include/odp/api/rwlock.h @@ -10,14 +10,14 @@ * ODP RW Locks */
-#ifndef ODP_PLAT_RWLOCK_H_ -#define ODP_PLAT_RWLOCK_H_ +#ifndef ODP_API_RWLOCK_H_ +#define ODP_API_RWLOCK_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/rwlock_types.h> +#include <odp/api/abi/rwlock.h>
#include <odp/api/spec/rwlock.h>
commit 3c5a55ba323f36a255615983afdb21b17f8b1597 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch version.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 8348f019..36015491 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -68,7 +68,8 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/packet_io.h \ odp/api/abi-default/pool.h \ odp/api/abi-default/queue.h \ - odp/api/abi-default/shared_memory.h + odp/api/abi-default/shared_memory.h \ + odp/api/abi-default/version.h
# Insall ABI headers only if required if ODP_ABI_COMPAT @@ -88,7 +89,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/packet_io.h \ odp/arch/arm32-linux/odp/api/abi/pool.h \ odp/arch/arm32-linux/odp/api/abi/queue.h \ - odp/arch/arm32-linux/odp/api/abi/shared_memory.h + odp/arch/arm32-linux/odp/api/abi/shared_memory.h \ + odp/arch/arm32-linux/odp/api/abi/version.h endif if ARCH_IS_AARCH64 odpapiabiarchinclude_HEADERS = \ @@ -104,7 +106,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/packet_io.h \ odp/arch/arm64-linux/odp/api/abi/pool.h \ odp/arch/arm64-linux/odp/api/abi/queue.h \ - odp/arch/arm64-linux/odp/api/abi/shared_memory.h + odp/arch/arm64-linux/odp/api/abi/shared_memory.h \ + odp/arch/arm64-linux/odp/api/abi/version.h endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ @@ -120,7 +123,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/packet_io.h \ odp/arch/mips64-linux/odp/api/abi/pool.h \ odp/arch/mips64-linux/odp/api/abi/queue.h \ - odp/arch/mips64-linux/odp/api/abi/shared_memory.h + odp/arch/mips64-linux/odp/api/abi/shared_memory.h \ + odp/arch/mips64-linux/odp/api/abi/version.h endif if ARCH_IS_POWERPC odpapiabiarchinclude_HEADERS = \ @@ -136,7 +140,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/packet_io.h \ odp/arch/power64-linux/odp/api/abi/pool.h \ odp/arch/power64-linux/odp/api/abi/queue.h \ - odp/arch/power64-linux/odp/api/abi/shared_memory.h + odp/arch/power64-linux/odp/api/abi/shared_memory.h \ + odp/arch/power64-linux/odp/api/abi/version.h endif if ARCH_IS_X86_32 odpapiabiarchinclude_HEADERS = \ @@ -152,7 +157,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/packet_io.h \ odp/arch/x86_32-linux/odp/api/abi/pool.h \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ - odp/arch/x86_32-linux/odp/api/abi/shared_memory.h + odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \ + odp/arch/x86_32-linux/odp/api/abi/version.h endif if ARCH_IS_X86_64 odpapiabiarchinclude_HEADERS = \ @@ -168,7 +174,8 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/packet_io.h \ odp/arch/x86_64-linux/odp/api/abi/pool.h \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ - odp/arch/x86_64-linux/odp/api/abi/shared_memory.h + odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \ + odp/arch/x86_64-linux/odp/api/abi/version.h endif endif # ODP_ABI_COMPAT
diff --git a/platform/linux-generic/include/odp/api/plat/version_types.h b/include/odp/api/abi-default/version.h similarity index 91% rename from platform/linux-generic/include/odp/api/plat/version_types.h rename to include/odp/api/abi-default/version.h index e3327eb3..0f48ecc1 100644 --- a/platform/linux-generic/include/odp/api/plat/version_types.h +++ b/include/odp/api/abi-default/version.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_VERSION_TYPESH_ -#define ODP_VERSION_TYPESH_ +#ifndef ODP_ABI_VERSION_H_ +#define ODP_ABI_VERSION_H_
#ifdef __cplusplus extern "C" { diff --git a/include/odp/arch/arm32-linux/odp/api/abi/version.h b/include/odp/arch/arm32-linux/odp/api/abi/version.h new file mode 100644 index 00000000..b36d5395 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/version.h b/include/odp/arch/arm64-linux/odp/api/abi/version.h new file mode 100644 index 00000000..b36d5395 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/version.h b/include/odp/arch/mips64-linux/odp/api/abi/version.h new file mode 100644 index 00000000..b36d5395 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/version.h b/include/odp/arch/power64-linux/odp/api/abi/version.h new file mode 100644 index 00000000..b36d5395 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/version.h b/include/odp/arch/x86_32-linux/odp/api/abi/version.h new file mode 100644 index 00000000..b36d5395 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/version.h b/include/odp/arch/x86_64-linux/odp/api/abi/version.h new file mode 100644 index 00000000..b36d5395 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 6bed8d9d..64643605 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -99,8 +99,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/ticketlock_types.h \ include/odp/api/plat/time_types.h \ include/odp/api/plat/timer_types.h \ - include/odp/api/plat/traffic_mngr_types.h \ - include/odp/api/plat/version_types.h + include/odp/api/plat/traffic_mngr_types.h
nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h @@ -118,7 +117,8 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/ipsec.h \ include-abi/odp/api/abi/packet_io.h \ include-abi/odp/api/abi/queue.h \ - include-abi/odp/api/abi/shared_memory.h + include-abi/odp/api/abi/shared_memory.h \ + include-abi/odp/api/abi/version.h endif
noinst_HEADERS = \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/version.h b/platform/linux-generic/include-abi/odp/api/abi/version.h new file mode 100644 index 00000000..b36d5395 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h> diff --git a/platform/linux-generic/include/odp/api/version.h b/platform/linux-generic/include/odp/api/version.h index fc4ea586..35c844e7 100644 --- a/platform/linux-generic/include/odp/api/version.h +++ b/platform/linux-generic/include/odp/api/version.h @@ -10,14 +10,15 @@ * ODP version */
-#ifndef ODP_PLAT_VERSION_H_ -#define ODP_PLAT_VERSION_H_ +#ifndef ODP_API_VERSION_H_ +#define ODP_API_VERSION_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/version_types.h> +#include <odp/api/abi/version.h> + #include <odp/api/spec/version.h>
#ifdef __cplusplus
commit 3dc3b1fbfb71b0c81e6ce047f48f51d4e13e81dc Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch packet_io.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 7a159458..8348f019 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -65,6 +65,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/init.h \ odp/api/abi-default/ipsec.h \ odp/api/abi-default/packet.h \ + odp/api/abi-default/packet_io.h \ odp/api/abi-default/pool.h \ odp/api/abi-default/queue.h \ odp/api/abi-default/shared_memory.h @@ -84,6 +85,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/init.h \ odp/arch/arm32-linux/odp/api/abi/ipsec.h \ odp/arch/arm32-linux/odp/api/abi/packet.h \ + odp/arch/arm32-linux/odp/api/abi/packet_io.h \ odp/arch/arm32-linux/odp/api/abi/pool.h \ odp/arch/arm32-linux/odp/api/abi/queue.h \ odp/arch/arm32-linux/odp/api/abi/shared_memory.h @@ -99,6 +101,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/init.h \ odp/arch/arm64-linux/odp/api/abi/ipsec.h \ odp/arch/arm64-linux/odp/api/abi/packet.h \ + odp/arch/arm64-linux/odp/api/abi/packet_io.h \ odp/arch/arm64-linux/odp/api/abi/pool.h \ odp/arch/arm64-linux/odp/api/abi/queue.h \ odp/arch/arm64-linux/odp/api/abi/shared_memory.h @@ -114,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/init.h \ odp/arch/mips64-linux/odp/api/abi/ipsec.h \ odp/arch/mips64-linux/odp/api/abi/packet.h \ + odp/arch/mips64-linux/odp/api/abi/packet_io.h \ odp/arch/mips64-linux/odp/api/abi/pool.h \ odp/arch/mips64-linux/odp/api/abi/queue.h \ odp/arch/mips64-linux/odp/api/abi/shared_memory.h @@ -129,6 +133,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/init.h \ odp/arch/power64-linux/odp/api/abi/ipsec.h \ odp/arch/power64-linux/odp/api/abi/packet.h \ + odp/arch/power64-linux/odp/api/abi/packet_io.h \ odp/arch/power64-linux/odp/api/abi/pool.h \ odp/arch/power64-linux/odp/api/abi/queue.h \ odp/arch/power64-linux/odp/api/abi/shared_memory.h @@ -144,6 +149,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/init.h \ odp/arch/x86_32-linux/odp/api/abi/ipsec.h \ odp/arch/x86_32-linux/odp/api/abi/packet.h \ + odp/arch/x86_32-linux/odp/api/abi/packet_io.h \ odp/arch/x86_32-linux/odp/api/abi/pool.h \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ odp/arch/x86_32-linux/odp/api/abi/shared_memory.h @@ -159,6 +165,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/init.h \ odp/arch/x86_64-linux/odp/api/abi/ipsec.h \ odp/arch/x86_64-linux/odp/api/abi/packet.h \ + odp/arch/x86_64-linux/odp/api/abi/packet_io.h \ odp/arch/x86_64-linux/odp/api/abi/pool.h \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h diff --git a/platform/linux-generic/include/odp/api/plat/packet_io_types.h b/include/odp/api/abi-default/packet_io.h similarity index 71% copy from platform/linux-generic/include/odp/api/plat/packet_io_types.h copy to include/odp/api/abi-default/packet_io.h index 5a45321f..4795f8fc 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_io_types.h +++ b/include/odp/api/abi-default/packet_io.h @@ -4,29 +4,30 @@ * SPDX-License-Identifier: BSD-3-Clause */
- /** * @file * * ODP Packet IO */
-#ifndef ODP_PACKET_IO_TYPES_H_ -#define ODP_PACKET_IO_TYPES_H_ +#ifndef ODP_ABI_PACKET_IO_H_ +#define ODP_ABI_PACKET_IO_H_
#ifdef __cplusplus extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/strong_types.h> + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_pktio_t;
/** @addtogroup odp_packet_io * Operations on a packet. * @{ */
-typedef ODP_HANDLE_T(odp_pktio_t); +typedef _odp_abi_pktio_t *odp_pktio_t;
/** @internal */ typedef struct odp_pktin_queue_t { @@ -40,19 +41,13 @@ typedef struct odp_pktout_queue_t { int index; /**< @internal pktio queue index */ } odp_pktout_queue_t;
-#define ODP_PKTIO_INVALID _odp_cast_scalar(odp_pktio_t, 0) +#define ODP_PKTIO_INVALID ((odp_pktio_t)0)
#define ODP_PKTIO_MACADDR_MAXSIZE 16
#define ODP_PKTIN_NO_WAIT 0 #define ODP_PKTIN_WAIT UINT64_MAX
-/** Get printable format of odp_pktio_t */ -static inline uint64_t odp_pktio_to_u64(odp_pktio_t hdl) -{ - return _odp_pri(hdl); -} - /** * @} */ diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..79b49262 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/arm64-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..79b49262 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/mips64-linux/odp/api/abi/packet_io.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..79b49262 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/power64-linux/odp/api/abi/packet_io.h b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..79b49262 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_32-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..79b49262 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, 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/x86_64-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..79b49262 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet_io.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 2f160c08..6bed8d9d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -83,7 +83,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/packet_inlines_api.h \ include/odp/api/plat/packet_types.h \ - include/odp/api/plat/packet_io_types.h \ include/odp/api/plat/pool_types.h \ include/odp/api/plat/rwlock_types.h \ include/odp/api/plat/rwlock_recursive_types.h \ @@ -117,6 +116,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/event.h \ include-abi/odp/api/abi/init.h \ include-abi/odp/api/abi/ipsec.h \ + include-abi/odp/api/abi/packet_io.h \ include-abi/odp/api/abi/queue.h \ include-abi/odp/api/abi/shared_memory.h endif diff --git a/platform/linux-generic/include/odp/api/plat/packet_io_types.h b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h similarity index 83% rename from platform/linux-generic/include/odp/api/plat/packet_io_types.h rename to platform/linux-generic/include-abi/odp/api/abi/packet_io.h index 5a45321f..a84e858e 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_io_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h @@ -11,8 +11,8 @@ * ODP Packet IO */
-#ifndef ODP_PACKET_IO_TYPES_H_ -#define ODP_PACKET_IO_TYPES_H_ +#ifndef ODP_API_ABI_PACKET_IO_H_ +#define ODP_API_ABI_PACKET_IO_H_
#ifdef __cplusplus extern "C" { @@ -47,12 +47,6 @@ typedef struct odp_pktout_queue_t { #define ODP_PKTIN_NO_WAIT 0 #define ODP_PKTIN_WAIT UINT64_MAX
-/** Get printable format of odp_pktio_t */ -static inline uint64_t odp_pktio_to_u64(odp_pktio_t hdl) -{ - return _odp_pri(hdl); -} - /** * @} */ diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h index e610ce21..16f856d3 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/platform/linux-generic/include/odp/api/classification.h @@ -21,7 +21,7 @@ extern "C" { #include <odp/api/plat/pool_types.h> #include <odp/api/abi/classification.h> #include <odp/api/plat/packet_types.h> -#include <odp/api/plat/packet_io_types.h> +#include <odp/api/abi/packet_io.h> #include <odp/api/abi/queue.h>
#include <odp/api/spec/classification.h> diff --git a/platform/linux-generic/include/odp/api/packet.h b/platform/linux-generic/include/odp/api/packet.h index 15c99aa5..71d05a59 100644 --- a/platform/linux-generic/include/odp/api/packet.h +++ b/platform/linux-generic/include/odp/api/packet.h @@ -19,7 +19,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/abi/event.h> -#include <odp/api/plat/packet_io_types.h> +#include <odp/api/abi/packet_io.h> #include <odp/api/plat/packet_types.h> #include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h> diff --git a/platform/linux-generic/include/odp/api/packet_io.h b/platform/linux-generic/include/odp/api/packet_io.h index f6661da2..e56a929b 100644 --- a/platform/linux-generic/include/odp/api/packet_io.h +++ b/platform/linux-generic/include/odp/api/packet_io.h @@ -10,8 +10,8 @@ * ODP Packet IO */
-#ifndef ODP_PLAT_PACKET_IO_H_ -#define ODP_PLAT_PACKET_IO_H_ +#ifndef ODP_API_PACKET_IO_H_ +#define ODP_API_PACKET_IO_H_
#ifdef __cplusplus extern "C" { @@ -21,7 +21,7 @@ extern "C" { #include <odp/api/plat/pool_types.h> #include <odp/api/abi/classification.h> #include <odp/api/plat/packet_types.h> -#include <odp/api/plat/packet_io_types.h> +#include <odp/api/abi/packet_io.h> #include <odp/api/abi/queue.h>
/** @ingroup odp_packet_io diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 611a89a5..5472f7ca 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -13,10 +13,11 @@ #ifndef _ODP_PLAT_PACKET_INLINES_H_ #define _ODP_PLAT_PACKET_INLINES_H_
+#include <odp/api/plat/strong_types.h> #include <odp/api/plat/packet_types.h> #include <odp/api/pool.h> #include <odp/api/time.h> -#include <odp/api/plat/packet_io_types.h> +#include <odp/api/abi/packet_io.h> #include <odp/api/abi/buffer.h> #include <odp/api/hints.h>
diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index dd846d59..df1b29ff 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -18,6 +18,7 @@ extern "C" { #endif
+#include <odp/api/plat/strong_types.h> #include <odp/api/queue.h> #include <odp_forward_typedefs_internal.h> #include <odp_queue_if.h> diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index ddc65f60..58d64aa5 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -13,6 +13,7 @@ extern "C" { #endif
+#include <odp/api/plat/strong_types.h> #include <odp/api/queue.h> #include <odp_forward_typedefs_internal.h> #include <odp_queue_if.h> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index c599595a..b8dd7c90 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1827,3 +1827,9 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[],
return entry->s.ops->send(entry, queue.index, packets, num); } + +/** Get printable format of odp_pktio_t */ +uint64_t odp_pktio_to_u64(odp_pktio_t hdl) +{ + return _odp_pri(hdl); +}
commit 4cbcb2d11673fdde483753db67343018aa09e3ad Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch ipsec.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index efec1ff5..7a159458 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -63,6 +63,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/crypto.h \ odp/api/abi-default/event.h \ odp/api/abi-default/init.h \ + odp/api/abi-default/ipsec.h \ odp/api/abi-default/packet.h \ odp/api/abi-default/pool.h \ odp/api/abi-default/queue.h \ @@ -81,6 +82,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ odp/arch/arm32-linux/odp/api/abi/event.h \ odp/arch/arm32-linux/odp/api/abi/init.h \ + odp/arch/arm32-linux/odp/api/abi/ipsec.h \ odp/arch/arm32-linux/odp/api/abi/packet.h \ odp/arch/arm32-linux/odp/api/abi/pool.h \ odp/arch/arm32-linux/odp/api/abi/queue.h \ @@ -95,6 +97,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ odp/arch/arm64-linux/odp/api/abi/event.h \ odp/arch/arm64-linux/odp/api/abi/init.h \ + odp/arch/arm64-linux/odp/api/abi/ipsec.h \ odp/arch/arm64-linux/odp/api/abi/packet.h \ odp/arch/arm64-linux/odp/api/abi/pool.h \ odp/arch/arm64-linux/odp/api/abi/queue.h \ @@ -109,6 +112,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ odp/arch/mips64-linux/odp/api/abi/event.h \ odp/arch/mips64-linux/odp/api/abi/init.h \ + odp/arch/mips64-linux/odp/api/abi/ipsec.h \ odp/arch/mips64-linux/odp/api/abi/packet.h \ odp/arch/mips64-linux/odp/api/abi/pool.h \ odp/arch/mips64-linux/odp/api/abi/queue.h \ @@ -123,6 +127,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/crypto.h \ odp/arch/power64-linux/odp/api/abi/event.h \ odp/arch/power64-linux/odp/api/abi/init.h \ + odp/arch/power64-linux/odp/api/abi/ipsec.h \ odp/arch/power64-linux/odp/api/abi/packet.h \ odp/arch/power64-linux/odp/api/abi/pool.h \ odp/arch/power64-linux/odp/api/abi/queue.h \ @@ -137,6 +142,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ odp/arch/x86_32-linux/odp/api/abi/event.h \ odp/arch/x86_32-linux/odp/api/abi/init.h \ + odp/arch/x86_32-linux/odp/api/abi/ipsec.h \ odp/arch/x86_32-linux/odp/api/abi/packet.h \ odp/arch/x86_32-linux/odp/api/abi/pool.h \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ @@ -151,6 +157,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ odp/arch/x86_64-linux/odp/api/abi/event.h \ odp/arch/x86_64-linux/odp/api/abi/init.h \ + odp/arch/x86_64-linux/odp/api/abi/ipsec.h \ odp/arch/x86_64-linux/odp/api/abi/packet.h \ odp/arch/x86_64-linux/odp/api/abi/pool.h \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ diff --git a/platform/linux-generic/include/odp/api/plat/ipsec_types.h b/include/odp/api/abi-default/ipsec.h similarity index 55% copy from platform/linux-generic/include/odp/api/plat/ipsec_types.h copy to include/odp/api/abi-default/ipsec.h index a36cdada..dbd66d9d 100644 --- a/platform/linux-generic/include/odp/api/plat/ipsec_types.h +++ b/include/odp/api/abi-default/ipsec.h @@ -10,23 +10,25 @@ * ODP IPSEC API - platform specific types */
-#ifndef ODP_PLAT_IPSEC_TYPES_H_ -#define ODP_PLAT_IPSEC_TYPES_H_ +#ifndef ODP_ABI_IPSEC_H_ +#define ODP_ABI_IPSEC_H_
#ifdef __cplusplus extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/strong_types.h> + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_ipsec_sa_t;
/** @ingroup odp_ipsec * @{ */
-typedef ODP_HANDLE_T(odp_ipsec_sa_t); +typedef _odp_abi_ipsec_sa_t *odp_ipsec_sa_t;
-#define ODP_IPSEC_SA_INVALID _odp_cast_scalar(odp_ipsec_sa_t, 0xffffffff) +#define ODP_IPSEC_SA_INVALID ((odp_ipsec_sa_t)0xffffffff)
/** * @} diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..b6747d29 --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..b6747d29 --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..b6747d29 --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/ipsec.h b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..b6747d29 --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..b6747d29 --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..b6747d29 --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 6a9359d0..2f160c08 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -78,7 +78,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ - include/odp/api/plat/ipsec_types.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inlines.h \ @@ -117,6 +116,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/crypto.h \ include-abi/odp/api/abi/event.h \ include-abi/odp/api/abi/init.h \ + include-abi/odp/api/abi/ipsec.h \ include-abi/odp/api/abi/queue.h \ include-abi/odp/api/abi/shared_memory.h endif diff --git a/platform/linux-generic/include/odp/api/plat/ipsec_types.h b/platform/linux-generic/include-abi/odp/api/abi/ipsec.h similarity index 88% rename from platform/linux-generic/include/odp/api/plat/ipsec_types.h rename to platform/linux-generic/include-abi/odp/api/abi/ipsec.h index a36cdada..75d84c43 100644 --- a/platform/linux-generic/include/odp/api/plat/ipsec_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ipsec.h @@ -10,8 +10,8 @@ * ODP IPSEC API - platform specific types */
-#ifndef ODP_PLAT_IPSEC_TYPES_H_ -#define ODP_PLAT_IPSEC_TYPES_H_ +#ifndef ODP_API_ABI_IPSEC_H_ +#define ODP_API_ABI_IPSEC_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/ipsec.h b/platform/linux-generic/include/odp/api/ipsec.h index 44c5d025..cb39750e 100644 --- a/platform/linux-generic/include/odp/api/ipsec.h +++ b/platform/linux-generic/include/odp/api/ipsec.h @@ -10,22 +10,14 @@ * ODP IPSEC API - platform specific header */
-#ifndef ODP_PLAT_IPSEC_H_ -#define ODP_PLAT_IPSEC_H_ +#ifndef ODP_API_IPSEC_H_ +#define ODP_API_IPSEC_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/ipsec_types.h> - -/** @ingroup odp_ipsec - * @{ - */ - -/** - * @} - */ +#include <odp/api/abi/ipsec.h>
#include <odp/api/spec/ipsec.h>
commit 14156f2feae2aa5a2835cf6ff0a3b4a2d7dae4df Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch init.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 5e60cec0..efec1ff5 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -62,6 +62,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/cpumask.h \ odp/api/abi-default/crypto.h \ odp/api/abi-default/event.h \ + odp/api/abi-default/init.h \ odp/api/abi-default/packet.h \ odp/api/abi-default/pool.h \ odp/api/abi-default/queue.h \ @@ -79,6 +80,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/cpumask.h \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ odp/arch/arm32-linux/odp/api/abi/event.h \ + odp/arch/arm32-linux/odp/api/abi/init.h \ odp/arch/arm32-linux/odp/api/abi/packet.h \ odp/arch/arm32-linux/odp/api/abi/pool.h \ odp/arch/arm32-linux/odp/api/abi/queue.h \ @@ -92,6 +94,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/cpumask.h \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ odp/arch/arm64-linux/odp/api/abi/event.h \ + odp/arch/arm64-linux/odp/api/abi/init.h \ odp/arch/arm64-linux/odp/api/abi/packet.h \ odp/arch/arm64-linux/odp/api/abi/pool.h \ odp/arch/arm64-linux/odp/api/abi/queue.h \ @@ -105,6 +108,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/cpumask.h \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ odp/arch/mips64-linux/odp/api/abi/event.h \ + odp/arch/mips64-linux/odp/api/abi/init.h \ odp/arch/mips64-linux/odp/api/abi/packet.h \ odp/arch/mips64-linux/odp/api/abi/pool.h \ odp/arch/mips64-linux/odp/api/abi/queue.h \ @@ -118,6 +122,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/cpumask.h \ odp/arch/power64-linux/odp/api/abi/crypto.h \ odp/arch/power64-linux/odp/api/abi/event.h \ + odp/arch/power64-linux/odp/api/abi/init.h \ odp/arch/power64-linux/odp/api/abi/packet.h \ odp/arch/power64-linux/odp/api/abi/pool.h \ odp/arch/power64-linux/odp/api/abi/queue.h \ @@ -131,6 +136,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/cpumask.h \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ odp/arch/x86_32-linux/odp/api/abi/event.h \ + odp/arch/x86_32-linux/odp/api/abi/init.h \ odp/arch/x86_32-linux/odp/api/abi/packet.h \ odp/arch/x86_32-linux/odp/api/abi/pool.h \ odp/arch/x86_32-linux/odp/api/abi/queue.h \ @@ -144,6 +150,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/cpumask.h \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ odp/arch/x86_64-linux/odp/api/abi/event.h \ + odp/arch/x86_64-linux/odp/api/abi/init.h \ odp/arch/x86_64-linux/odp/api/abi/packet.h \ odp/arch/x86_64-linux/odp/api/abi/pool.h \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ diff --git a/platform/linux-generic/include/odp/api/plat/init_types.h b/include/odp/api/abi-default/init.h similarity index 79% rename from platform/linux-generic/include/odp/api/plat/init_types.h rename to include/odp/api/abi-default/init.h index 888b04a7..b478310f 100644 --- a/platform/linux-generic/include/odp/api/plat/init_types.h +++ b/include/odp/api/abi-default/init.h @@ -10,8 +10,8 @@ * ODP initialization. */
-#ifndef ODP_INIT_TYPES_H_ -#define ODP_INIT_TYPES_H_ +#ifndef ODP_ABI_INIT_H_ +#define ODP_ABI_INIT_H_
#ifdef __cplusplus extern "C" { @@ -25,7 +25,7 @@ typedef uint64_t odp_instance_t; * @internal platform specific data */ typedef struct odp_platform_init_t { - int ipc_ns; /**< Name space for ipc shared objects. */ + char dummy; /**< @internal Dummy */ } odp_platform_init_t;
#ifdef __cplusplus diff --git a/include/odp/arch/arm32-linux/odp/api/abi/init.h b/include/odp/arch/arm32-linux/odp/api/abi/init.h new file mode 100644 index 00000000..81eafefe --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/init.h b/include/odp/arch/arm64-linux/odp/api/abi/init.h new file mode 100644 index 00000000..81eafefe --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/init.h b/include/odp/arch/mips64-linux/odp/api/abi/init.h new file mode 100644 index 00000000..81eafefe --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/init.h b/include/odp/arch/power64-linux/odp/api/abi/init.h new file mode 100644 index 00000000..81eafefe --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/init.h b/include/odp/arch/x86_32-linux/odp/api/abi/init.h new file mode 100644 index 00000000..81eafefe --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/init.h b/include/odp/arch/x86_64-linux/odp/api/abi/init.h new file mode 100644 index 00000000..81eafefe --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 55279f65..6a9359d0 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -78,7 +78,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ - include/odp/api/plat/init_types.h \ include/odp/api/plat/ipsec_types.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ @@ -117,6 +116,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/cpumask.h \ include-abi/odp/api/abi/crypto.h \ include-abi/odp/api/abi/event.h \ + include-abi/odp/api/abi/init.h \ include-abi/odp/api/abi/queue.h \ include-abi/odp/api/abi/shared_memory.h endif diff --git a/platform/linux-generic/include-abi/odp/api/abi/init.h b/platform/linux-generic/include-abi/odp/api/abi/init.h new file mode 100644 index 00000000..81eafefe --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/platform/linux-generic/include/odp/api/init.h b/platform/linux-generic/include/odp/api/init.h index 1d9f59a6..af3f1f74 100644 --- a/platform/linux-generic/include/odp/api/init.h +++ b/platform/linux-generic/include/odp/api/init.h @@ -10,22 +10,14 @@ * ODP initialization. */
-#ifndef ODP_PLAT_INIT_H_ -#define ODP_PLAT_INIT_H_ +#ifndef ODP_API_INIT_H_ +#define ODP_API_INIT_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/init_types.h> - -/** @ingroup odp_initialization - * @{ - */ - -/** - * @} - */ +#include <odp/api/abi/init.h>
#include <odp/api/spec/init.h>
commit 5399f2f78624599910c574e3c7247378118a8af4 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch cpumask.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index dd5dbd82..5e60cec0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -59,6 +59,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/barrier.h \ odp/api/abi-default/buffer.h \ odp/api/abi-default/classification.h \ + odp/api/abi-default/cpumask.h \ odp/api/abi-default/crypto.h \ odp/api/abi-default/event.h \ odp/api/abi-default/packet.h \ @@ -75,6 +76,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/barrier.h \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ odp/arch/arm32-linux/odp/api/abi/classification.h \ + odp/arch/arm32-linux/odp/api/abi/cpumask.h \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ odp/arch/arm32-linux/odp/api/abi/event.h \ odp/arch/arm32-linux/odp/api/abi/packet.h \ @@ -87,6 +89,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/barrier.h \ odp/arch/arm64-linux/odp/api/abi/buffer.h \ odp/arch/arm64-linux/odp/api/abi/classification.h \ + odp/arch/arm64-linux/odp/api/abi/cpumask.h \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ odp/arch/arm64-linux/odp/api/abi/event.h \ odp/arch/arm64-linux/odp/api/abi/packet.h \ @@ -99,6 +102,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/barrier.h \ odp/arch/mips64-linux/odp/api/abi/buffer.h \ odp/arch/mips64-linux/odp/api/abi/classification.h \ + odp/arch/mips64-linux/odp/api/abi/cpumask.h \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ odp/arch/mips64-linux/odp/api/abi/event.h \ odp/arch/mips64-linux/odp/api/abi/packet.h \ @@ -111,6 +115,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/power64-linux/odp/api/abi/barrier.h \ odp/arch/power64-linux/odp/api/abi/buffer.h \ odp/arch/power64-linux/odp/api/abi/classification.h \ + odp/arch/power64-linux/odp/api/abi/cpumask.h \ odp/arch/power64-linux/odp/api/abi/crypto.h \ odp/arch/power64-linux/odp/api/abi/event.h \ odp/arch/power64-linux/odp/api/abi/packet.h \ @@ -123,6 +128,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_32-linux/odp/api/abi/barrier.h \ odp/arch/x86_32-linux/odp/api/abi/buffer.h \ odp/arch/x86_32-linux/odp/api/abi/classification.h \ + odp/arch/x86_32-linux/odp/api/abi/cpumask.h \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ odp/arch/x86_32-linux/odp/api/abi/event.h \ odp/arch/x86_32-linux/odp/api/abi/packet.h \ @@ -135,6 +141,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/barrier.h \ odp/arch/x86_64-linux/odp/api/abi/buffer.h \ odp/arch/x86_64-linux/odp/api/abi/classification.h \ + odp/arch/x86_64-linux/odp/api/abi/cpumask.h \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ odp/arch/x86_64-linux/odp/api/abi/event.h \ odp/arch/x86_64-linux/odp/api/abi/packet.h \ diff --git a/platform/linux-generic/include/odp/api/plat/cpumask_types.h b/include/odp/api/abi-default/cpumask.h similarity index 92% rename from platform/linux-generic/include/odp/api/plat/cpumask_types.h rename to include/odp/api/abi-default/cpumask.h index c2727a46..69f4c162 100644 --- a/platform/linux-generic/include/odp/api/plat/cpumask_types.h +++ b/include/odp/api/abi-default/cpumask.h @@ -4,15 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */
- /** * @file * * ODP CPU masks and enumeration */
-#ifndef ODP_CPUMASK_TYPES_H_ -#define ODP_CPUMASK_TYPES_H_ +#ifndef ODP_ABI_CPUMASK_H_ +#define ODP_ABI_CPUMASK_H_
#ifdef __cplusplus extern "C" { diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..d991896d --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..d991896d --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..d991896d --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..d991896d --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..d991896d --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..d991896d --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 5231c2e2..55279f65 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -78,7 +78,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ - include/odp/api/plat/cpumask_types.h \ include/odp/api/plat/init_types.h \ include/odp/api/plat/ipsec_types.h \ include/odp/api/plat/packet_flag_inlines.h \ @@ -115,6 +114,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ include-abi/odp/api/abi/classification.h \ + include-abi/odp/api/abi/cpumask.h \ include-abi/odp/api/abi/crypto.h \ include-abi/odp/api/abi/event.h \ include-abi/odp/api/abi/queue.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/cpumask.h b/platform/linux-generic/include-abi/odp/api/abi/cpumask.h new file mode 100644 index 00000000..d991896d --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/platform/linux-generic/include/odp/api/cpumask.h b/platform/linux-generic/include/odp/api/cpumask.h index 325ea52e..f5140df1 100644 --- a/platform/linux-generic/include/odp/api/cpumask.h +++ b/platform/linux-generic/include/odp/api/cpumask.h @@ -10,14 +10,14 @@ * ODP CPU masks and enumeration */
-#ifndef ODP_PLAT_CPUMASK_H_ -#define ODP_PLAT_CPUMASK_H_ +#ifndef ODP_API_CPUMASK_H_ +#define ODP_API_CPUMASK_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/cpumask_types.h> +#include <odp/api/abi/cpumask.h>
#include <odp/api/spec/cpumask.h>
commit cd2dfa966f8c08c99feda2d0622ecc27c0361245 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch barrier.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index ac7239a2..dd5dbd82 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -56,6 +56,7 @@ nodist_odpapispecinclude_HEADERS = \
odpapiabidefaultincludedir= $(includedir)/odp/api/abi-default odpapiabidefaultinclude_HEADERS = \ + odp/api/abi-default/barrier.h \ odp/api/abi-default/buffer.h \ odp/api/abi-default/classification.h \ odp/api/abi-default/crypto.h \ @@ -71,6 +72,7 @@ if ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ + odp/arch/arm32-linux/odp/api/abi/barrier.h \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ odp/arch/arm32-linux/odp/api/abi/classification.h \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ @@ -82,6 +84,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_AARCH64 odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/barrier.h \ odp/arch/arm64-linux/odp/api/abi/buffer.h \ odp/arch/arm64-linux/odp/api/abi/classification.h \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ @@ -93,6 +96,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/barrier.h \ odp/arch/mips64-linux/odp/api/abi/buffer.h \ odp/arch/mips64-linux/odp/api/abi/classification.h \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ @@ -104,6 +108,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_POWERPC odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/barrier.h \ odp/arch/power64-linux/odp/api/abi/buffer.h \ odp/arch/power64-linux/odp/api/abi/classification.h \ odp/arch/power64-linux/odp/api/abi/crypto.h \ @@ -115,6 +120,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_X86_32 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/barrier.h \ odp/arch/x86_32-linux/odp/api/abi/buffer.h \ odp/arch/x86_32-linux/odp/api/abi/classification.h \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ @@ -126,6 +132,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_X86_64 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/barrier.h \ odp/arch/x86_64-linux/odp/api/abi/buffer.h \ odp/arch/x86_64-linux/odp/api/abi/classification.h \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ diff --git a/platform/linux-generic/include/odp/api/plat/barrier_types.h b/include/odp/api/abi-default/barrier.h similarity index 89% copy from platform/linux-generic/include/odp/api/plat/barrier_types.h copy to include/odp/api/abi-default/barrier.h index 00b383cc..51d91377 100644 --- a/platform/linux-generic/include/odp/api/plat/barrier_types.h +++ b/include/odp/api/abi-default/barrier.h @@ -10,8 +10,8 @@ * ODP barrier */
-#ifndef ODP_BARRIER_TYPES_H_ -#define ODP_BARRIER_TYPES_H_ +#ifndef ODP_ABI_BARRIER_H_ +#define ODP_ABI_BARRIER_H_
#ifdef __cplusplus extern "C" { diff --git a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..9d6c256e --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..9d6c256e --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..9d6c256e --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/barrier.h b/include/odp/arch/power64-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..9d6c256e --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..9d6c256e --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..9d6c256e --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7289eda8..5231c2e2 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -76,7 +76,6 @@ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/atomic_types.h \ - include/odp/api/plat/barrier_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/cpumask_types.h \ @@ -113,6 +112,7 @@ nodist_odpapiplatinclude_HEADERS = \ if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ + include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ include-abi/odp/api/abi/classification.h \ include-abi/odp/api/abi/crypto.h \ diff --git a/platform/linux-generic/include/odp/api/plat/barrier_types.h b/platform/linux-generic/include-abi/odp/api/abi/barrier.h similarity index 89% rename from platform/linux-generic/include/odp/api/plat/barrier_types.h rename to platform/linux-generic/include-abi/odp/api/abi/barrier.h index 00b383cc..51d91377 100644 --- a/platform/linux-generic/include/odp/api/plat/barrier_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/barrier.h @@ -10,8 +10,8 @@ * ODP barrier */
-#ifndef ODP_BARRIER_TYPES_H_ -#define ODP_BARRIER_TYPES_H_ +#ifndef ODP_ABI_BARRIER_H_ +#define ODP_ABI_BARRIER_H_
#ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/include/odp/api/barrier.h b/platform/linux-generic/include/odp/api/barrier.h index 44e59155..7101b4c6 100644 --- a/platform/linux-generic/include/odp/api/barrier.h +++ b/platform/linux-generic/include/odp/api/barrier.h @@ -10,8 +10,8 @@ * ODP execution barriers */
-#ifndef ODP_PLAT_BARRIER_H_ -#define ODP_PLAT_BARRIER_H_ +#ifndef ODP_API_BARRIER_H_ +#define ODP_API_BARRIER_H_
#ifdef __cplusplus extern "C" { @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/atomic.h> #include <odp/api/abi/shared_memory.h> -#include <odp/api/plat/barrier_types.h> +#include <odp/api/abi/barrier.h>
#include <odp/api/spec/barrier.h>
commit f831c691a20ca2d0ffbbf707f43eee7600bca6b6 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch queue.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7271927e..7289eda8 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -89,7 +89,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_types.h \ include/odp/api/plat/packet_io_types.h \ include/odp/api/plat/pool_types.h \ - include/odp/api/plat/queue_types.h \ include/odp/api/plat/rwlock_types.h \ include/odp/api/plat/rwlock_recursive_types.h \ include/odp/api/plat/schedule_types.h \ @@ -118,6 +117,7 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/classification.h \ include-abi/odp/api/abi/crypto.h \ include-abi/odp/api/abi/event.h \ + include-abi/odp/api/abi/queue.h \ include-abi/odp/api/abi/shared_memory.h endif
diff --git a/platform/linux-generic/include/odp/api/plat/queue_types.h b/platform/linux-generic/include-abi/odp/api/abi/queue.h similarity index 74% rename from platform/linux-generic/include/odp/api/plat/queue_types.h rename to platform/linux-generic/include-abi/odp/api/abi/queue.h index 1561e223..28c721a7 100644 --- a/platform/linux-generic/include/odp/api/plat/queue_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/queue.h @@ -10,18 +10,13 @@ * ODP queue */
-#ifndef ODP_QUEUE_TYPES_H_ -#define ODP_QUEUE_TYPES_H_ +#ifndef ODP_API_ABI_QUEUE_H_ +#define ODP_API_ABI_QUEUE_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/abi/queue.h> -#else - #include <odp/api/std_types.h> #include <odp/api/plat/strong_types.h>
@@ -39,8 +34,6 @@ typedef ODP_HANDLE_T(odp_queue_t); * @} */
-#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h index 9f55e1ab..e610ce21 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/platform/linux-generic/include/odp/api/classification.h @@ -22,7 +22,7 @@ extern "C" { #include <odp/api/abi/classification.h> #include <odp/api/plat/packet_types.h> #include <odp/api/plat/packet_io_types.h> -#include <odp/api/plat/queue_types.h> +#include <odp/api/abi/queue.h>
#include <odp/api/spec/classification.h>
diff --git a/platform/linux-generic/include/odp/api/packet_io.h b/platform/linux-generic/include/odp/api/packet_io.h index 548ad08e..f6661da2 100644 --- a/platform/linux-generic/include/odp/api/packet_io.h +++ b/platform/linux-generic/include/odp/api/packet_io.h @@ -22,7 +22,7 @@ extern "C" { #include <odp/api/abi/classification.h> #include <odp/api/plat/packet_types.h> #include <odp/api/plat/packet_io_types.h> -#include <odp/api/plat/queue_types.h> +#include <odp/api/abi/queue.h>
/** @ingroup odp_packet_io * @{ diff --git a/platform/linux-generic/include/odp/api/queue.h b/platform/linux-generic/include/odp/api/queue.h index a867740a..2fccabcd 100644 --- a/platform/linux-generic/include/odp/api/queue.h +++ b/platform/linux-generic/include/odp/api/queue.h @@ -10,8 +10,8 @@ * ODP queue */
-#ifndef ODP_PLAT_QUEUE_H_ -#define ODP_PLAT_QUEUE_H_ +#ifndef ODP_API_QUEUE_H_ +#define ODP_API_QUEUE_H_
#ifdef __cplusplus extern "C" { @@ -19,7 +19,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/abi/event.h> -#include <odp/api/plat/queue_types.h> +#include <odp/api/abi/queue.h> #include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h>
diff --git a/platform/linux-generic/include/odp/api/timer.h b/platform/linux-generic/include/odp/api/timer.h index fa38ed5c..2d68db79 100644 --- a/platform/linux-generic/include/odp/api/timer.h +++ b/platform/linux-generic/include/odp/api/timer.h @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/abi/event.h> #include <odp/api/plat/pool_types.h> -#include <odp/api/plat/queue_types.h> +#include <odp/api/abi/queue.h> #include <odp/api/plat/timer_types.h>
/** @ingroup odp_timer
commit e1883c9e050a5cc3ad838c02f943113f3b1e2383 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch shared_memory.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e551a8c3..7271927e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -93,7 +93,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/rwlock_types.h \ include/odp/api/plat/rwlock_recursive_types.h \ include/odp/api/plat/schedule_types.h \ - include/odp/api/plat/shared_memory_types.h \ include/odp/api/plat/spinlock_types.h \ include/odp/api/plat/spinlock_recursive_types.h \ include/odp/api/plat/std_clib_inlines.h \ @@ -118,7 +117,8 @@ odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/buffer.h \ include-abi/odp/api/abi/classification.h \ include-abi/odp/api/abi/crypto.h \ - include-abi/odp/api/abi/event.h + include-abi/odp/api/abi/event.h \ + include-abi/odp/api/abi/shared_memory.h endif
noinst_HEADERS = \ diff --git a/platform/linux-generic/include/odp/api/plat/shared_memory_types.h b/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h similarity index 73% rename from platform/linux-generic/include/odp/api/plat/shared_memory_types.h rename to platform/linux-generic/include-abi/odp/api/abi/shared_memory.h index 2c5b4ed2..05922238 100644 --- a/platform/linux-generic/include/odp/api/plat/shared_memory_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h @@ -11,18 +11,13 @@ * ODP shared memory */
-#ifndef ODP_SHARED_MEMORY_TYPES_H_ -#define ODP_SHARED_MEMORY_TYPES_H_ +#ifndef ODP_API_ABI_SHARED_MEMORY_H_ +#define ODP_API_ABI_SHARED_MEMORY_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/abi/shared_memory.h> -#else - #include <odp/api/std_types.h> #include <odp/api/plat/strong_types.h>
@@ -41,8 +36,6 @@ typedef ODP_HANDLE_T(odp_shm_t); * @} */
-#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/barrier.h b/platform/linux-generic/include/odp/api/barrier.h index ab1b7756..44e59155 100644 --- a/platform/linux-generic/include/odp/api/barrier.h +++ b/platform/linux-generic/include/odp/api/barrier.h @@ -19,7 +19,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/atomic.h> -#include <odp/api/plat/shared_memory_types.h> +#include <odp/api/abi/shared_memory.h> #include <odp/api/plat/barrier_types.h>
#include <odp/api/spec/barrier.h> diff --git a/platform/linux-generic/include/odp/api/pool.h b/platform/linux-generic/include/odp/api/pool.h index 8789d6df..91c56ad3 100644 --- a/platform/linux-generic/include/odp/api/pool.h +++ b/platform/linux-generic/include/odp/api/pool.h @@ -26,7 +26,7 @@ extern "C" { */
#include <odp/api/plat/pool_types.h> -#include <odp/api/plat/shared_memory_types.h> +#include <odp/api/abi/shared_memory.h> #include <odp/api/abi/event.h> #include <odp/api/spec/pool.h>
diff --git a/platform/linux-generic/include/odp/api/shared_memory.h b/platform/linux-generic/include/odp/api/shared_memory.h index affc290e..94012648 100644 --- a/platform/linux-generic/include/odp/api/shared_memory.h +++ b/platform/linux-generic/include/odp/api/shared_memory.h @@ -10,22 +10,14 @@ * ODP shared memory */
-#ifndef ODP_PLAT_SHARED_MEMORY_H_ -#define ODP_PLAT_SHARED_MEMORY_H_ +#ifndef ODP_API_SHARED_MEMORY_H_ +#define ODP_API_SHARED_MEMORY_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/shared_memory_types.h> - -/** @ingroup odp_shared_memory - * @{ - */ - -/** - * @} - */ +#include <odp/api/abi/shared_memory.h>
#include <odp/api/spec/shared_memory.h>
commit 627c9f51e2de51c3bb20f59161ac8ea1b6c2703f Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch event.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 86b5a294..e551a8c3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -80,7 +80,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/cpumask_types.h \ - include/odp/api/plat/event_types.h \ include/odp/api/plat/init_types.h \ include/odp/api/plat/ipsec_types.h \ include/odp/api/plat/packet_flag_inlines.h \ @@ -118,7 +117,8 @@ odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/buffer.h \ include-abi/odp/api/abi/classification.h \ - include-abi/odp/api/abi/crypto.h + include-abi/odp/api/abi/crypto.h \ + include-abi/odp/api/abi/event.h endif
noinst_HEADERS = \ diff --git a/platform/linux-generic/include/odp/api/plat/event_types.h b/platform/linux-generic/include-abi/odp/api/abi/event.h similarity index 80% rename from platform/linux-generic/include/odp/api/plat/event_types.h rename to platform/linux-generic/include-abi/odp/api/abi/event.h index 9bff607a..802e431f 100644 --- a/platform/linux-generic/include/odp/api/plat/event_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/event.h @@ -11,19 +11,13 @@ * ODP event */
-#ifndef ODP_EVENT_TYPES_H_ -#define ODP_EVENT_TYPES_H_ +#ifndef ODP_API_ABI_EVENT_H_ +#define ODP_API_ABI_EVENT_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/abi/event.h> -#else - -#include <odp/api/std_types.h> #include <odp/api/plat/strong_types.h>
/** @ingroup odp_event @@ -53,8 +47,6 @@ typedef enum odp_event_subtype_t { * @} */
-#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/buffer.h b/platform/linux-generic/include/odp/api/buffer.h index 3c726869..787a26eb 100644 --- a/platform/linux-generic/include/odp/api/buffer.h +++ b/platform/linux-generic/include/odp/api/buffer.h @@ -18,7 +18,7 @@ extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/event_types.h> +#include <odp/api/abi/event.h> #include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h>
diff --git a/platform/linux-generic/include/odp/api/event.h b/platform/linux-generic/include/odp/api/event.h index 55931b62..71c64eb9 100644 --- a/platform/linux-generic/include/odp/api/event.h +++ b/platform/linux-generic/include/odp/api/event.h @@ -10,22 +10,14 @@ * ODP event */
-#ifndef ODP_PLAT_EVENT_H_ -#define ODP_PLAT_EVENT_H_ +#ifndef ODP_API_EVENT_H_ +#define ODP_API_EVENT_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/event_types.h> - -/** @ingroup odp_event - * @{ - */ - -/** - * @} - */ +#include <odp/api/abi/event.h>
#include <odp/api/spec/event.h>
diff --git a/platform/linux-generic/include/odp/api/packet.h b/platform/linux-generic/include/odp/api/packet.h index 7fe53834..15c99aa5 100644 --- a/platform/linux-generic/include/odp/api/packet.h +++ b/platform/linux-generic/include/odp/api/packet.h @@ -18,7 +18,7 @@ extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/event_types.h> +#include <odp/api/abi/event.h> #include <odp/api/plat/packet_io_types.h> #include <odp/api/plat/packet_types.h> #include <odp/api/abi/buffer.h> diff --git a/platform/linux-generic/include/odp/api/plat/pool_types.h b/platform/linux-generic/include/odp/api/plat/pool_types.h index 9a26dde5..d02e505d 100644 --- a/platform/linux-generic/include/odp/api/plat/pool_types.h +++ b/platform/linux-generic/include/odp/api/plat/pool_types.h @@ -24,7 +24,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/plat/strong_types.h> -#include <odp/api/plat/event_types.h> +#include <odp/api/abi/event.h>
/** @ingroup odp_pool * @{ diff --git a/platform/linux-generic/include/odp/api/plat/strong_types.h b/platform/linux-generic/include/odp/api/plat/strong_types.h index 2e3070f8..ce920285 100644 --- a/platform/linux-generic/include/odp/api/plat/strong_types.h +++ b/platform/linux-generic/include/odp/api/plat/strong_types.h @@ -15,6 +15,8 @@ #ifndef STRONG_TYPES_H_ #define STRONG_TYPES_H_
+#include <odp/api/std_types.h> + /** Use strong typing for ODP types */ #ifdef __cplusplus /* Allow type to be expanded before concatenation with underscore */ diff --git a/platform/linux-generic/include/odp/api/pool.h b/platform/linux-generic/include/odp/api/pool.h index d712b650..8789d6df 100644 --- a/platform/linux-generic/include/odp/api/pool.h +++ b/platform/linux-generic/include/odp/api/pool.h @@ -27,7 +27,7 @@ extern "C" {
#include <odp/api/plat/pool_types.h> #include <odp/api/plat/shared_memory_types.h> -#include <odp/api/plat/event_types.h> +#include <odp/api/abi/event.h> #include <odp/api/spec/pool.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/queue.h b/platform/linux-generic/include/odp/api/queue.h index c78eacfd..a867740a 100644 --- a/platform/linux-generic/include/odp/api/queue.h +++ b/platform/linux-generic/include/odp/api/queue.h @@ -18,7 +18,7 @@ extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/event_types.h> +#include <odp/api/abi/event.h> #include <odp/api/plat/queue_types.h> #include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h> diff --git a/platform/linux-generic/include/odp/api/timer.h b/platform/linux-generic/include/odp/api/timer.h index 1450727f..fa38ed5c 100644 --- a/platform/linux-generic/include/odp/api/timer.h +++ b/platform/linux-generic/include/odp/api/timer.h @@ -18,7 +18,7 @@ extern "C" { #endif
#include <odp/api/std_types.h> -#include <odp/api/plat/event_types.h> +#include <odp/api/abi/event.h> #include <odp/api/plat/pool_types.h> #include <odp/api/plat/queue_types.h> #include <odp/api/plat/timer_types.h>
commit edf998617f1744a9a92ed0ebb4905149f5731ed5 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch crypto.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 349df692..86b5a294 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -80,7 +80,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/cpumask_types.h \ - include/odp/api/plat/crypto_types.h \ include/odp/api/plat/event_types.h \ include/odp/api/plat/init_types.h \ include/odp/api/plat/ipsec_types.h \ @@ -118,7 +117,8 @@ if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ include-abi/odp/api/abi/buffer.h \ - include-abi/odp/api/abi/classification.h + include-abi/odp/api/abi/classification.h \ + include-abi/odp/api/abi/crypto.h endif
noinst_HEADERS = \ diff --git a/platform/linux-generic/include/odp/api/plat/crypto_types.h b/platform/linux-generic/include-abi/odp/api/abi/crypto.h similarity index 71% rename from platform/linux-generic/include/odp/api/plat/crypto_types.h rename to platform/linux-generic/include-abi/odp/api/abi/crypto.h index 2cc747eb..fe3a9212 100644 --- a/platform/linux-generic/include/odp/api/plat/crypto_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/crypto.h @@ -11,18 +11,13 @@ * ODP crypto */
-#ifndef ODP_CRYPTO_TYPES_H_ -#define ODP_CRYPTO_TYPES_H_ +#ifndef ODP_API_ABI_CRYPTO_H_ +#define ODP_API_ABI_CRYPTO_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/abi/crypto.h> -#else - /** @ingroup odp_crypto * @{ */ @@ -36,8 +31,6 @@ typedef ODP_HANDLE_T(odp_crypto_compl_t); * @} */
-#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/crypto.h b/platform/linux-generic/include/odp/api/crypto.h index 6a11fb05..c4fdb884 100644 --- a/platform/linux-generic/include/odp/api/crypto.h +++ b/platform/linux-generic/include/odp/api/crypto.h @@ -10,8 +10,8 @@ * ODP crypto */
-#ifndef ODP_PLAT_CRYPTO_H_ -#define ODP_PLAT_CRYPTO_H_ +#ifndef ODP_API_CRYPTO_H_ +#define ODP_API_CRYPTO_H_
#ifdef __cplusplus extern "C" { @@ -19,7 +19,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/plat/packet_types.h> -#include <odp/api/plat/crypto_types.h> +#include <odp/api/abi/crypto.h> #include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h> #include <odp/api/queue.h>
commit bece10957f7d85107a71662e308dba8fc1d6c578 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch classification.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index a59e9160..349df692 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -79,7 +79,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/barrier_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ - include/odp/api/plat/classification_types.h \ include/odp/api/plat/cpumask_types.h \ include/odp/api/plat/crypto_types.h \ include/odp/api/plat/event_types.h \ @@ -118,7 +117,8 @@ nodist_odpapiplatinclude_HEADERS = \ if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ - include-abi/odp/api/abi/buffer.h + include-abi/odp/api/abi/buffer.h \ + include-abi/odp/api/abi/classification.h endif
noinst_HEADERS = \ diff --git a/platform/linux-generic/include/odp/api/plat/classification_types.h b/platform/linux-generic/include-abi/odp/api/abi/classification.h similarity index 74% rename from platform/linux-generic/include/odp/api/plat/classification_types.h rename to platform/linux-generic/include-abi/odp/api/abi/classification.h index d210feb0..3f866c67 100644 --- a/platform/linux-generic/include/odp/api/plat/classification_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/classification.h @@ -10,18 +10,13 @@ * ODP classification descriptor */
-#ifndef ODP_CLASSIFICATION_TYPES_H_ -#define ODP_CLASSIFICATION_TYPES_H_ +#ifndef ODP_API_ABI_CLASSIFICATION_H_ +#define ODP_API_ABI_CLASSIFICATION_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/abi/classification.h> -#else - #include <odp/api/plat/strong_types.h>
/** @ingroup odp_classification @@ -40,8 +35,6 @@ typedef ODP_HANDLE_T(odp_pmr_t); * @} */
-#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h index 377d1a02..9f55e1ab 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/platform/linux-generic/include/odp/api/classification.h @@ -10,8 +10,8 @@ * ODP classification descriptor */
-#ifndef ODP_PLAT_CLASSIFICATION_H_ -#define ODP_PLAT_CLASSIFICATION_H_ +#ifndef ODP_API_CLASSIFICATION_H_ +#define ODP_API_CLASSIFICATION_H_
#ifdef __cplusplus extern "C" { @@ -19,7 +19,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/plat/pool_types.h> -#include <odp/api/plat/classification_types.h> +#include <odp/api/abi/classification.h> #include <odp/api/plat/packet_types.h> #include <odp/api/plat/packet_io_types.h> #include <odp/api/plat/queue_types.h> diff --git a/platform/linux-generic/include/odp/api/packet_io.h b/platform/linux-generic/include/odp/api/packet_io.h index 76c7dfed..548ad08e 100644 --- a/platform/linux-generic/include/odp/api/packet_io.h +++ b/platform/linux-generic/include/odp/api/packet_io.h @@ -19,7 +19,7 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/plat/pool_types.h> -#include <odp/api/plat/classification_types.h> +#include <odp/api/abi/classification.h> #include <odp/api/plat/packet_types.h> #include <odp/api/plat/packet_io_types.h> #include <odp/api/plat/queue_types.h>
commit 08d0c1658cd13bb174cc9c01f132bc98d004efa7 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:41:56 2017 +0300
linux-gen, include: switch buffer.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index fff683ff..a59e9160 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -77,7 +77,6 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/atomic_types.h \ include/odp/api/plat/barrier_types.h \ - include/odp/api/plat/buffer_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/classification_types.h \ @@ -118,6 +117,8 @@ nodist_odpapiplatinclude_HEADERS = \
if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi +odpapiabiarchinclude_HEADERS = \ + include-abi/odp/api/abi/buffer.h endif
noinst_HEADERS = \ diff --git a/platform/linux-generic/include/odp/api/plat/buffer_types.h b/platform/linux-generic/include-abi/odp/api/abi/buffer.h similarity index 73% rename from platform/linux-generic/include/odp/api/plat/buffer_types.h rename to platform/linux-generic/include-abi/odp/api/abi/buffer.h index 8b79bb52..90b6653a 100644 --- a/platform/linux-generic/include/odp/api/plat/buffer_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/buffer.h @@ -10,18 +10,13 @@ * ODP buffer descriptor */
-#ifndef ODP_BUFFER_TYPES_H_ -#define ODP_BUFFER_TYPES_H_ +#ifndef ODP_API_ABI_BUFFER_H_ +#define ODP_API_ABI_BUFFER_H_
#ifdef __cplusplus extern "C" { #endif
-#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 1 -#include <odp/api/abi/buffer.h> -#else - #include <odp/api/std_types.h> #include <odp/api/plat/strong_types.h>
@@ -37,8 +32,6 @@ typedef ODP_HANDLE_T(odp_buffer_t); * @} */
-#endif - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/buffer.h b/platform/linux-generic/include/odp/api/buffer.h index 81dbf128..3c726869 100644 --- a/platform/linux-generic/include/odp/api/buffer.h +++ b/platform/linux-generic/include/odp/api/buffer.h @@ -10,8 +10,8 @@ * ODP buffer descriptor */
-#ifndef ODP_PLAT_BUFFER_H_ -#define ODP_PLAT_BUFFER_H_ +#ifndef ODP_API_BUFFER_H_ +#define ODP_API_BUFFER_H_
#ifdef __cplusplus extern "C" { @@ -19,17 +19,9 @@ extern "C" {
#include <odp/api/std_types.h> #include <odp/api/plat/event_types.h> -#include <odp/api/plat/buffer_types.h> +#include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h>
-/** @ingroup odp_buffer - * @{ - */ - -/** - * @} - */ - #include <odp/api/spec/buffer.h>
#ifdef __cplusplus diff --git a/platform/linux-generic/include/odp/api/crypto.h b/platform/linux-generic/include/odp/api/crypto.h index 4f65932a..6a11fb05 100644 --- a/platform/linux-generic/include/odp/api/crypto.h +++ b/platform/linux-generic/include/odp/api/crypto.h @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/plat/packet_types.h> #include <odp/api/plat/crypto_types.h> -#include <odp/api/plat/buffer_types.h> +#include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h> #include <odp/api/queue.h>
diff --git a/platform/linux-generic/include/odp/api/packet.h b/platform/linux-generic/include/odp/api/packet.h index eff40803..7fe53834 100644 --- a/platform/linux-generic/include/odp/api/packet.h +++ b/platform/linux-generic/include/odp/api/packet.h @@ -21,7 +21,7 @@ extern "C" { #include <odp/api/plat/event_types.h> #include <odp/api/plat/packet_io_types.h> #include <odp/api/plat/packet_types.h> -#include <odp/api/plat/buffer_types.h> +#include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h>
#include <odp/api/plat/static_inline.h> diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index b00b9c92..611a89a5 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -17,7 +17,7 @@ #include <odp/api/pool.h> #include <odp/api/time.h> #include <odp/api/plat/packet_io_types.h> -#include <odp/api/plat/buffer_types.h> +#include <odp/api/abi/buffer.h> #include <odp/api/hints.h>
/** @internal Inline function @param pkt_ptr @param offset @param seg_len diff --git a/platform/linux-generic/include/odp/api/queue.h b/platform/linux-generic/include/odp/api/queue.h index f958ff51..c78eacfd 100644 --- a/platform/linux-generic/include/odp/api/queue.h +++ b/platform/linux-generic/include/odp/api/queue.h @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/plat/event_types.h> #include <odp/api/plat/queue_types.h> -#include <odp/api/plat/buffer_types.h> +#include <odp/api/abi/buffer.h> #include <odp/api/plat/pool_types.h>
#include <odp/api/spec/queue.h>
commit 60feb6af342d581f798308563b975974986d9a3c Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Tue Nov 21 22:09:38 2017 +0300
build, linux-gen: provide optional dir for arch includes
To enable multi-arch installs, provide a way to separate arch-specific files from arch-independent ones.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/configure.ac b/configure.ac index cc8eee81..31e798b0 100644 --- a/configure.ac +++ b/configure.ac @@ -101,6 +101,16 @@ AX_VALGRIND_DFLT([helgrind], [off]) AX_VALGRIND_DFLT([drd], [off]) AX_VALGRIND_CHECK
+########################################################################## +# Architecture-specific dir +########################################################################## +AC_ARG_WITH([archincludedir], + [AS_HELP_STRING([--with-archincludedir=DIR], + [directory to hold arch-specific headers (${includedir})])], + [archincludedir=$with_archincludedir], + [archincludedir="${includedir}"]) +AC_SUBST([archincludedir]) + ########################################################################## # Which architecture optimizations will we use ########################################################################## diff --git a/include/Makefile.am b/include/Makefile.am index cc45f908..ac7239a2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -68,7 +68,7 @@ odpapiabidefaultinclude_HEADERS = \ # Insall ABI headers only if required if ODP_ABI_COMPAT
-odpapiabiarchincludedir= $(includedir)/odp/api/abi +odpapiabiarchincludedir = $(archincludedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 27a8b94f..fff683ff 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -117,7 +117,7 @@ nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h
if !ODP_ABI_COMPAT -odpapiabiarchincludedir= $(includedir)/odp/api/abi +odpapiabiarchincludedir = $(archincludedir)/odp/api/abi endif
noinst_HEADERS = \ @@ -296,7 +296,8 @@ endif
noinst_HEADERS += arch/default/odp/api/cpu_arch.h
-odpapiinclude_HEADERS += $(arch_odp_headers) +odpapiarchincludedir = $(archincludedir)/odp/api +odpapiarchinclude_HEADERS = $(arch_odp_headers)
if HAVE_PCAP __LIB__libodp_linux_la_SOURCES += pktio/pcap.c
commit 503bc79ee960ea4caa72d639cbc5a42c7524a790 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Wed Nov 22 17:19:31 2017 +0300
build: add platform dir for non-ABI-compat headers
If platform is built in non-ABI-compat mode, it provides its own set of type and enum definitions. Add directory that will hold platform optimized ABI files.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/Makefile.inc b/Makefile.inc index 11fc7c75..91be46bc 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -8,6 +8,9 @@ ODP_INCLUDES = \ if ODP_ABI_COMPAT ODP_INCLUDES += \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +else +ODP_INCLUDES += \ + -I$(top_srcdir)/platform/@with_platform@/include-abi endif
HELPER_INCLUDES = \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 56b358ea..27a8b94f 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -116,6 +116,10 @@ odpapiplatinclude_HEADERS = \ nodist_odpapiplatinclude_HEADERS = \ include/odp/api/plat/static_inline.h
+if !ODP_ABI_COMPAT +odpapiabiarchincludedir= $(includedir)/odp/api/abi +endif + noinst_HEADERS = \ arch/odp_arch_time_internal.h \ include/_fdserver_internal.h \
commit cfeb9fa2519ede1f34e3a814079a62095f23e64e Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 13:24:41 2017 +0300
api: schedule: remove duplication between schedule and schedule_types
Move the rest of ODP_SCHED_GROUP_* defines to schedule_types.h to remove duplication between headers.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index 52444964..8c55b4ec 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -45,26 +45,6 @@ extern "C" { * Maximum schedule group name length in chars including null char */
-/** - * @def ODP_SCHED_GROUP_INVALID - * Invalid scheduler group - */ - -/** - * @def ODP_SCHED_GROUP_ALL - * Predefined scheduler group of all threads - */ - -/** - * @def ODP_SCHED_GROUP_WORKER - * Predefined scheduler group of all worker threads - */ - -/** - * @def ODP_SCHED_GROUP_CONTROL - * Predefined scheduler group of all control threads - */ - /** * Schedule wait time * diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h index e0dc4027..a13cc4f1 100644 --- a/include/odp/api/spec/schedule_types.h +++ b/include/odp/api/spec/schedule_types.h @@ -112,6 +112,11 @@ extern "C" { * Scheduler thread group */
+/** + * @def ODP_SCHED_GROUP_INVALID + * Invalid scheduler group + */ + /** * @def ODP_SCHED_GROUP_ALL * Group of all threads. All active worker and control threads belong to this @@ -126,6 +131,11 @@ extern "C" { * old threads exit ODP. */
+/** + * @def ODP_SCHED_GROUP_CONTROL + * Predefined scheduler group of all control threads + */ + /** Scheduler parameters */ typedef struct odp_schedule_param_t { /** Priority level
commit bd9ab1c7a6ba3ecf4532e36b7d431a6c2df2c72b Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 11:58:24 2017 +0300
abi: classification: drop two unused types
odp_flowsig_t and odp_cos_flow_set_t are leftovers, they were defined previously, but they are not used by current API, so drop them finally.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 2378fd50..d90d9658 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -31,11 +31,6 @@ extern "C" { * ODP Class of service handle */
-/** - * @typedef odp_flowsig_t - * flow signature type, only used for packet metadata field. - */ - /** * @def ODP_COS_INVALID * This value is returned from odp_cls_cos_create() on failure, @@ -454,12 +449,6 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, odp_cos_t cos_table[], odp_bool_t l3_preference);
-/** - * @typedef odp_cos_flow_set_t - * Set of header fields that take part in flow signature hash calculation: - * bit positions per odp_cos_hdr_flow_fields_t enumeration. - */ - /** * @typedef odp_pmr_t * PMR - Packet Matching Rule diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h index 2ba6eb0e..377d1a02 100644 --- a/platform/linux-generic/include/odp/api/classification.h +++ b/platform/linux-generic/include/odp/api/classification.h @@ -24,19 +24,6 @@ extern "C" { #include <odp/api/plat/packet_io_types.h> #include <odp/api/plat/queue_types.h>
-/** @ingroup odp_classification - * @{ - */ - -/* REMOVE THESE FROM API SPEC. Typedefs needed only for suppressing Doxygen - * warning. */ -typedef void odp_flowsig_t; -typedef void odp_cos_flow_set_t; - -/** - * @} - */ - #include <odp/api/spec/classification.h>
#ifdef __cplusplus
commit 4d2c80472c0623b406f25c07fcca42849f41d847 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 11:58:24 2017 +0300
abi: queue: drop unused odp_queue_group_t
odp_queue_group_t is a leftover, it was defined previously, but it is not used by current API, so drop it finally.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index c45cf730..f83dea9f 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -32,11 +32,6 @@ extern "C" { * ODP queue */
-/** - * @typedef odp_queue_group_t - * Queue group instance type - */ - /** * @def ODP_QUEUE_INVALID * Invalid queue diff --git a/platform/linux-generic/include/odp/api/queue.h b/platform/linux-generic/include/odp/api/queue.h index adceafbd..f958ff51 100644 --- a/platform/linux-generic/include/odp/api/queue.h +++ b/platform/linux-generic/include/odp/api/queue.h @@ -23,18 +23,6 @@ extern "C" { #include <odp/api/plat/buffer_types.h> #include <odp/api/plat/pool_types.h>
-/** @ingroup odp_queue - * @{ - */ - -/* REMOVE FROM API SPEC. Typedef needed only for suppressing Doxygen - * warning. */ -typedef void odp_queue_group_t; - -/** - * @} - */ - #include <odp/api/spec/queue.h>
#ifdef __cplusplus
commit 3d10b69994b9a4629ae5858c4f13b8fc73137fc3 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 11:02:28 2017 +0300
include: install and use ABI headers only in ABI-compat mode
There is no need to install ABI headers (or to have them in include path) in non-ABI-compat mode, they should not be used at all. Still provide default ABI headers, because platform may depend on them.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/Makefile.inc b/Makefile.inc index 10e4041f..11fc7c75 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -3,9 +3,13 @@ ODP_INCLUDES = \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/include
+if ODP_ABI_COMPAT +ODP_INCLUDES += \ + -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +endif + HELPER_INCLUDES = \ -I$(top_srcdir)/helper/include
diff --git a/include/Makefile.am b/include/Makefile.am index 11e80eb7..cc45f908 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -65,6 +65,9 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/queue.h \ odp/api/abi-default/shared_memory.h
+# Insall ABI headers only if required +if ODP_ABI_COMPAT + odpapiabiarchincludedir= $(includedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ @@ -132,6 +135,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/queue.h \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h endif +endif # ODP_ABI_COMPAT
# Rerefence all nodist_*_HEADERS here .PHONY: $(nodist_odpapispecinclude_HEADERS)
commit 96874082fe02560068588af59817fa2152982638 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 10:59:16 2017 +0300
include: install ABI headers without additional ARCH_ABI level
Install ABI headers directly to odp/api/abi, removing the need for extra symlink.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index e94b5c9b..11e80eb7 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -65,7 +65,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/queue.h \ odp/api/abi-default/shared_memory.h
-odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi +odpapiabiarchincludedir= $(includedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ @@ -133,16 +133,6 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/shared_memory.h endif
-# Create symlink for ABI header files. Application does not need to use the arch -# specific include path for installed files. -install-data-hook: - if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ - : ; \ - else \ - $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ - $(DESTDIR)$(prefix)/include/odp/api/abi; \ - fi - # Rerefence all nodist_*_HEADERS here .PHONY: $(nodist_odpapispecinclude_HEADERS) $(nodist_odpapispecinclude_HEADERS):
commit ad317cdf97c0f19d27bca380d06617937a0e548d Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 10:53:03 2017 +0300
include: move default ABI headers
Reduce amount of directory levels by moving default ABI headers to odp/api/abi-default.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/Makefile.am b/include/Makefile.am index 02f9c44a..e94b5c9b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -54,16 +54,16 @@ nodist_odpapispecinclude_HEADERS = \ odp/api/spec/deprecated.h \ odp/api/spec/version.h
-odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi +odpapiabidefaultincludedir= $(includedir)/odp/api/abi-default odpapiabidefaultinclude_HEADERS = \ - odp/arch/default/api/abi/buffer.h \ - odp/arch/default/api/abi/classification.h \ - odp/arch/default/api/abi/crypto.h \ - odp/arch/default/api/abi/event.h \ - odp/arch/default/api/abi/packet.h \ - odp/arch/default/api/abi/pool.h \ - odp/arch/default/api/abi/queue.h \ - odp/arch/default/api/abi/shared_memory.h + odp/api/abi-default/buffer.h \ + odp/api/abi-default/classification.h \ + odp/api/abi-default/crypto.h \ + odp/api/abi-default/event.h \ + odp/api/abi-default/packet.h \ + odp/api/abi-default/pool.h \ + odp/api/abi-default/queue.h \ + odp/api/abi-default/shared_memory.h
odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi if ARCH_IS_ARM diff --git a/include/odp/arch/default/api/abi/buffer.h b/include/odp/api/abi-default/buffer.h similarity index 100% rename from include/odp/arch/default/api/abi/buffer.h rename to include/odp/api/abi-default/buffer.h diff --git a/include/odp/arch/default/api/abi/classification.h b/include/odp/api/abi-default/classification.h similarity index 100% rename from include/odp/arch/default/api/abi/classification.h rename to include/odp/api/abi-default/classification.h diff --git a/include/odp/arch/default/api/abi/crypto.h b/include/odp/api/abi-default/crypto.h similarity index 100% rename from include/odp/arch/default/api/abi/crypto.h rename to include/odp/api/abi-default/crypto.h diff --git a/include/odp/arch/default/api/abi/event.h b/include/odp/api/abi-default/event.h similarity index 100% rename from include/odp/arch/default/api/abi/event.h rename to include/odp/api/abi-default/event.h diff --git a/include/odp/arch/default/api/abi/packet.h b/include/odp/api/abi-default/packet.h similarity index 100% rename from include/odp/arch/default/api/abi/packet.h rename to include/odp/api/abi-default/packet.h diff --git a/include/odp/arch/default/api/abi/pool.h b/include/odp/api/abi-default/pool.h similarity index 100% rename from include/odp/arch/default/api/abi/pool.h rename to include/odp/api/abi-default/pool.h diff --git a/include/odp/arch/default/api/abi/queue.h b/include/odp/api/abi-default/queue.h similarity index 100% rename from include/odp/arch/default/api/abi/queue.h rename to include/odp/api/abi-default/queue.h diff --git a/include/odp/arch/default/api/abi/shared_memory.h b/include/odp/api/abi-default/shared_memory.h similarity index 100% rename from include/odp/arch/default/api/abi/shared_memory.h rename to include/odp/api/abi-default/shared_memory.h diff --git a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h index d9c31930..68a67896 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/buffer.h> +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/arm32-linux/odp/api/abi/classification.h b/include/odp/arch/arm32-linux/odp/api/abi/classification.h index d48a4733..5a0cac98 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/classification.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/classification.h> +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h index 9a9d2dc1..d33a777b 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/crypto.h> +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/arm32-linux/odp/api/abi/event.h b/include/odp/arch/arm32-linux/odp/api/abi/event.h index 5d2ac75e..cbbf47f1 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/event.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/event.h> +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet.h b/include/odp/arch/arm32-linux/odp/api/abi/packet.h index f44cb536..ca28eed2 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/packet.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/packet.h> +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/arm32-linux/odp/api/abi/pool.h b/include/odp/arch/arm32-linux/odp/api/abi/pool.h index b354afbf..b59365eb 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/pool.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/pool.h> +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/arm32-linux/odp/api/abi/queue.h b/include/odp/arch/arm32-linux/odp/api/abi/queue.h index 6027cee2..66e2a341 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/queue.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/queue.h> +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h b/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h index d2036785..e80c4f32 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/shared_memory.h> +#include <odp/api/abi-default/shared_memory.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h index d9c31930..68a67896 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/buffer.h> +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/classification.h b/include/odp/arch/arm64-linux/odp/api/abi/classification.h index d48a4733..5a0cac98 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/classification.h> +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h index 9a9d2dc1..d33a777b 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/crypto.h> +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/event.h b/include/odp/arch/arm64-linux/odp/api/abi/event.h index 5d2ac75e..cbbf47f1 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/event.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/event.h> +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet.h b/include/odp/arch/arm64-linux/odp/api/abi/packet.h index f44cb536..ca28eed2 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/packet.h> +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/pool.h b/include/odp/arch/arm64-linux/odp/api/abi/pool.h index b354afbf..b59365eb 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/pool.h> +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/queue.h b/include/odp/arch/arm64-linux/odp/api/abi/queue.h index 6027cee2..66e2a341 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/queue.h> +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h index d2036785..e80c4f32 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/shared_memory.h> +#include <odp/api/abi-default/shared_memory.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h index d9c31930..68a67896 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/buffer.h> +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/classification.h b/include/odp/arch/mips64-linux/odp/api/abi/classification.h index d48a4733..5a0cac98 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/classification.h> +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h b/include/odp/arch/mips64-linux/odp/api/abi/crypto.h index 9a9d2dc1..d33a777b 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/crypto.h> +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/event.h b/include/odp/arch/mips64-linux/odp/api/abi/event.h index 5d2ac75e..cbbf47f1 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/event.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/event.h> +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet.h b/include/odp/arch/mips64-linux/odp/api/abi/packet.h index f44cb536..ca28eed2 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/packet.h> +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/pool.h b/include/odp/arch/mips64-linux/odp/api/abi/pool.h index b354afbf..b59365eb 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/pool.h> +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/queue.h b/include/odp/arch/mips64-linux/odp/api/abi/queue.h index 6027cee2..66e2a341 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/queue.h> +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h index d2036785..e80c4f32 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/shared_memory.h> +#include <odp/api/abi-default/shared_memory.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/buffer.h b/include/odp/arch/power64-linux/odp/api/abi/buffer.h index d9c31930..68a67896 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/power64-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/buffer.h> +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/classification.h b/include/odp/arch/power64-linux/odp/api/abi/classification.h index d48a4733..5a0cac98 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/power64-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/classification.h> +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/crypto.h b/include/odp/arch/power64-linux/odp/api/abi/crypto.h index 9a9d2dc1..d33a777b 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/power64-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/crypto.h> +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/event.h b/include/odp/arch/power64-linux/odp/api/abi/event.h index 5d2ac75e..cbbf47f1 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/event.h +++ b/include/odp/arch/power64-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/event.h> +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet.h b/include/odp/arch/power64-linux/odp/api/abi/packet.h index f44cb536..ca28eed2 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/power64-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/packet.h> +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/pool.h b/include/odp/arch/power64-linux/odp/api/abi/pool.h index b354afbf..b59365eb 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/power64-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/pool.h> +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/queue.h b/include/odp/arch/power64-linux/odp/api/abi/queue.h index 6027cee2..66e2a341 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/power64-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/queue.h> +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h index d2036785..e80c4f32 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/shared_memory.h> +#include <odp/api/abi-default/shared_memory.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h b/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h index d9c31930..68a67896 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/buffer.h> +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/classification.h b/include/odp/arch/x86_32-linux/odp/api/abi/classification.h index d48a4733..5a0cac98 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/classification.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/classification.h> +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h b/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h index 9a9d2dc1..d33a777b 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/crypto.h> +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/event.h b/include/odp/arch/x86_32-linux/odp/api/abi/event.h index 5d2ac75e..cbbf47f1 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/event.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/event.h> +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet.h index f44cb536..ca28eed2 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/packet.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/packet.h> +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/pool.h b/include/odp/arch/x86_32-linux/odp/api/abi/pool.h index b354afbf..b59365eb 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/pool.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/pool.h> +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h index 6027cee2..66e2a341 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/queue.h> +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h b/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h index d2036785..e80c4f32 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/shared_memory.h> +#include <odp/api/abi-default/shared_memory.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h b/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h index d9c31930..68a67896 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/buffer.h> +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/classification.h b/include/odp/arch/x86_64-linux/odp/api/abi/classification.h index d48a4733..5a0cac98 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/classification.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/classification.h> +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h b/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h index 9a9d2dc1..d33a777b 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/crypto.h> +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/event.h b/include/odp/arch/x86_64-linux/odp/api/abi/event.h index 5d2ac75e..cbbf47f1 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/event.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/event.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/event.h> +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet.h index f44cb536..ca28eed2 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/packet.h> +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/pool.h b/include/odp/arch/x86_64-linux/odp/api/abi/pool.h index b354afbf..b59365eb 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/pool.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/pool.h> +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h index 6027cee2..66e2a341 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/queue.h> +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h index d2036785..e80c4f32 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#include <odp/arch/default/api/abi/shared_memory.h> +#include <odp/api/abi-default/shared_memory.h>
commit 7f1ea3704569c50a48f1029c0bd8f3f0bf84f43e Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 11:23:53 2017 +0300
build: move ODP include path to common Makefile.inc
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/Makefile.inc b/Makefile.inc new file mode 100644 index 00000000..10e4041f --- /dev/null +++ b/Makefile.inc @@ -0,0 +1,12 @@ +ODP_INCLUDES = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ + -I$(top_srcdir)/include + +HELPER_INCLUDES = \ + -I$(top_srcdir)/helper/include + +LIB = $(top_builddir)/lib diff --git a/example/Makefile.inc b/example/Makefile.inc index fa122433..4a15ee7e 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,16 +1,12 @@ +include $(top_srcdir)/Makefile.inc + TESTS_ENVIRONMENT = EXEEXT=${EXEEXT}
-LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_LIBS_LT) AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/include/ \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/helper/include \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include + $(ODP_INCLUDES) \ + $(HELPER_INCLUDES)
AM_LDFLAGS = -L$(LIB) -static diff --git a/helper/Makefile.am b/helper/Makefile.am index ebb67346..d1b0359c 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,15 +1,11 @@ +include $(top_srcdir)/Makefile.inc + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libodphelper.pc
-LIB = $(top_builddir)/lib AM_CPPFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include + $(ODP_INCLUDES) \ + $(HELPER_INCLUDES) AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 0086db77..4714de0e 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -1,4 +1,4 @@ -LIB = $(top_builddir)/lib +include $(top_srcdir)/Makefile.inc
pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libodp-linux.pc diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index b7a8ff25..56b358ea 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,13 +3,8 @@
include $(top_srcdir)/platform/Makefile.inc
-AM_CPPFLAGS = -I$(srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS = $(ODP_INCLUDES) AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch -AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CPPFLAGS += -I$(top_builddir)/include -AM_CPPFLAGS += -Iinclude -AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default
AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) diff --git a/test/Makefile.inc b/test/Makefile.inc index b0a8749d..83004f0c 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,4 +1,4 @@ -LIB = $(top_builddir)/lib +include $(top_srcdir)/Makefile.inc
COMMON_DIR = $(top_builddir)/test/common
@@ -14,18 +14,10 @@ LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la LDADD = $(PRELDADD) $(LIBODP) $(DPDK_LIBS_LT) PRELDADD =
-INCFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_srcdir)/test/common \ - -I$(top_builddir)/include - -AM_CPPFLAGS = $(INCFLAGS) -AM_CPPFLAGS += -I$(top_srcdir)/test/common +AM_CPPFLAGS = \ + $(ODP_INCLUDES) \ + $(HELPER_INCLUDES) \ + -I$(top_srcdir)/test/common AM_CFLAGS = $(CUNIT_CFLAGS)
AM_LDFLAGS = -L$(LIB) -static
commit c99bed8f3a710d25d824cdcb1d109f974650906d Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 10:48:03 2017 +0300
configure: provide conditional for ABI-compat mode
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/configure.ac b/configure.ac index 177881a5..cc8eee81 100644 --- a/configure.ac +++ b/configure.ac @@ -270,6 +270,7 @@ AC_ARG_ENABLE([abi-compat], ODP_LIBSO_VERSION=0:0:0 fi]) AC_SUBST(ODP_ABI_COMPAT) +AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"])
########################################################################## # Enable/disable deprecated API definitions
commit cd46d6263073efb18c69a621d9cc6c50da76359d Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 12:53:27 2017 +0300
include: change spec guarding define from ODP_API to ODP_API_SPEC
Change defines guarding inclusion of ODP API spec files from ODP_API_FOO to ODP_API_SPEC_FOO, as they are placed in odp/api/spec/foo.h path.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/include/odp/api/spec/align.h b/include/odp/api/spec/align.h index fdf8c29e..0a9db348 100644 --- a/include/odp/api/spec/align.h +++ b/include/odp/api/spec/align.h @@ -11,8 +11,8 @@ * ODP alignments */
-#ifndef ODP_API_ALIGN_H_ -#define ODP_API_ALIGN_H_ +#ifndef ODP_API_SPEC_ALIGN_H_ +#define ODP_API_SPEC_ALIGN_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/atomic.h b/include/odp/api/spec/atomic.h index 408829df..d828ea47 100644 --- a/include/odp/api/spec/atomic.h +++ b/include/odp/api/spec/atomic.h @@ -10,8 +10,8 @@ * ODP atomic operations */
-#ifndef ODP_API_ATOMIC_H_ -#define ODP_API_ATOMIC_H_ +#ifndef ODP_API_SPEC_ATOMIC_H_ +#define ODP_API_SPEC_ATOMIC_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/barrier.h b/include/odp/api/spec/barrier.h index 6de683c7..8351ef88 100644 --- a/include/odp/api/spec/barrier.h +++ b/include/odp/api/spec/barrier.h @@ -10,8 +10,8 @@ * ODP execution barriers */
-#ifndef ODP_API_BARRIER_H_ -#define ODP_API_BARRIER_H_ +#ifndef ODP_API_SPEC_BARRIER_H_ +#define ODP_API_SPEC_BARRIER_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/buffer.h b/include/odp/api/spec/buffer.h index 94829b32..b2f90f94 100644 --- a/include/odp/api/spec/buffer.h +++ b/include/odp/api/spec/buffer.h @@ -11,8 +11,8 @@ * ODP buffer descriptor */
-#ifndef ODP_API_BUFFER_H_ -#define ODP_API_BUFFER_H_ +#ifndef ODP_API_SPEC_BUFFER_H_ +#define ODP_API_SPEC_BUFFER_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/byteorder.h b/include/odp/api/spec/byteorder.h index 38c0bdbf..814438d3 100644 --- a/include/odp/api/spec/byteorder.h +++ b/include/odp/api/spec/byteorder.h @@ -10,8 +10,8 @@ * ODP byteorder */
-#ifndef ODP_API_BYTEORDER_H_ -#define ODP_API_BYTEORDER_H_ +#ifndef ODP_API_SPEC_BYTEORDER_H_ +#define ODP_API_SPEC_BYTEORDER_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/chksum.h b/include/odp/api/spec/chksum.h index e523ac28..8f35e253 100644 --- a/include/odp/api/spec/chksum.h +++ b/include/odp/api/spec/chksum.h @@ -10,8 +10,8 @@ * ODP Hash functions */
-#ifndef ODP_API_CHKSUM_H_ -#define ODP_API_CHKSUM_H_ +#ifndef ODP_API_SPEC_CHKSUM_H_ +#define ODP_API_SPEC_CHKSUM_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 4db046fc..2378fd50 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -10,8 +10,8 @@ * ODP classification descriptor */
-#ifndef ODP_API_CLASSIFY_H_ -#define ODP_API_CLASSIFY_H_ +#ifndef ODP_API_SPEC_CLASSIFY_H_ +#define ODP_API_SPEC_CLASSIFY_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/compiler.h b/include/odp/api/spec/compiler.h index c88350e2..443607fb 100644 --- a/include/odp/api/spec/compiler.h +++ b/include/odp/api/spec/compiler.h @@ -11,8 +11,8 @@ * Compiler related */
-#ifndef ODP_API_COMPILER_H_ -#define ODP_API_COMPILER_H_ +#ifndef ODP_API_SPEC_COMPILER_H_ +#define ODP_API_SPEC_COMPILER_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/cpu.h b/include/odp/api/spec/cpu.h index 0f47e479..04fbbe90 100644 --- a/include/odp/api/spec/cpu.h +++ b/include/odp/api/spec/cpu.h @@ -11,8 +11,8 @@ * ODP CPU API */
-#ifndef ODP_CPU_H_ -#define ODP_CPU_H_ +#ifndef ODP_API_SPEC_CPU_H_ +#define ODP_API_SPEC_CPU_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/cpumask.h b/include/odp/api/spec/cpumask.h index 22d8e8f2..68a705d2 100644 --- a/include/odp/api/spec/cpumask.h +++ b/include/odp/api/spec/cpumask.h @@ -11,8 +11,8 @@ * ODP CPU masks and enumeration */
-#ifndef ODP_API_CPUMASK_H_ -#define ODP_API_CPUMASK_H_ +#ifndef ODP_API_SPEC_CPUMASK_H_ +#define ODP_API_SPEC_CPUMASK_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 81fecbc3..4fa7a1c9 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -11,8 +11,8 @@ * ODP crypto */
-#ifndef ODP_API_CRYPTO_H_ -#define ODP_API_CRYPTO_H_ +#ifndef ODP_API_SPEC_CRYPTO_H_ +#define ODP_API_SPEC_CRYPTO_H_ #include <odp/visibility_begin.h>
#include <odp/api/deprecated.h> diff --git a/include/odp/api/spec/debug.h b/include/odp/api/spec/debug.h index b3b170f3..c2896a82 100644 --- a/include/odp/api/spec/debug.h +++ b/include/odp/api/spec/debug.h @@ -9,8 +9,8 @@ * ODP debug */
-#ifndef ODP_API_DEBUG_H_ -#define ODP_API_DEBUG_H_ +#ifndef ODP_API_SPEC_DEBUG_H_ +#define ODP_API_SPEC_DEBUG_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/deprecated.h.in b/include/odp/api/spec/deprecated.h.in index 224f60ff..25520b9d 100644 --- a/include/odp/api/spec/deprecated.h.in +++ b/include/odp/api/spec/deprecated.h.in @@ -10,8 +10,8 @@ * Macro for deprecated API definitions */
-#ifndef ODP_API_DEPRECATED_H_ -#define ODP_API_DEPRECATED_H_ +#ifndef ODP_API_SPEC_DEPRECATED_H_ +#define ODP_API_SPEC_DEPRECATED_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/errno.h b/include/odp/api/spec/errno.h index 9b60a98b..ca74f741 100644 --- a/include/odp/api/spec/errno.h +++ b/include/odp/api/spec/errno.h @@ -10,8 +10,8 @@ * ODP errno API */
-#ifndef ODP_ERRNO_H_ -#define ODP_ERRNO_H_ +#ifndef ODP_API_SPEC_ERRNO_H_ +#define ODP_API_SPEC_ERRNO_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/event.h b/include/odp/api/spec/event.h index 2228c596..49cfdf82 100644 --- a/include/odp/api/spec/event.h +++ b/include/odp/api/spec/event.h @@ -11,8 +11,8 @@ * ODP event */
-#ifndef ODP_API_EVENT_H_ -#define ODP_API_EVENT_H_ +#ifndef ODP_API_SPEC_EVENT_H_ +#define ODP_API_SPEC_EVENT_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h index 0cfc141d..b64b2c7d 100644 --- a/include/odp/api/spec/feature.h +++ b/include/odp/api/spec/feature.h @@ -12,8 +12,8 @@ * components. */
-#ifndef ODP_API_FEATURE_H_ -#define ODP_API_FEATURE_H_ +#ifndef ODP_API_SPEC_FEATURE_H_ +#define ODP_API_SPEC_FEATURE_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/hash.h b/include/odp/api/spec/hash.h index 66b740e2..e86b2c6d 100644 --- a/include/odp/api/spec/hash.h +++ b/include/odp/api/spec/hash.h @@ -10,8 +10,8 @@ * ODP Hash functions */
-#ifndef ODP_API_HASH_H_ -#define ODP_API_HASH_H_ +#ifndef ODP_API_SPEC_HASH_H_ +#define ODP_API_SPEC_HASH_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/hints.h b/include/odp/api/spec/hints.h index 7434c6a5..64995737 100644 --- a/include/odp/api/spec/hints.h +++ b/include/odp/api/spec/hints.h @@ -11,8 +11,8 @@ * ODP compiler hints */
-#ifndef ODP_API_HINTS_H_ -#define ODP_API_HINTS_H_ +#ifndef ODP_API_SPEC_HINTS_H_ +#define ODP_API_SPEC_HINTS_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h index e8ec4113..56c86740 100644 --- a/include/odp/api/spec/init.h +++ b/include/odp/api/spec/init.h @@ -19,8 +19,8 @@ * - odp_term_local() */
-#ifndef ODP_API_INIT_H_ -#define ODP_API_INIT_H_ +#ifndef ODP_API_SPEC_INIT_H_ +#define ODP_API_SPEC_INIT_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 4c3c498c..b7852903 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -10,8 +10,8 @@ * ODP IPSEC API */
-#ifndef ODP_API_IPSEC_H_ -#define ODP_API_IPSEC_H_ +#ifndef ODP_API_SPEC_IPSEC_H_ +#define ODP_API_SPEC_IPSEC_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 3655f589..474309b3 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -11,8 +11,8 @@ * ODP packet descriptor */
-#ifndef ODP_API_PACKET_H_ -#define ODP_API_PACKET_H_ +#ifndef ODP_API_SPEC_PACKET_H_ +#define ODP_API_SPEC_PACKET_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/packet_flags.h b/include/odp/api/spec/packet_flags.h index dfbed4bb..1007a360 100644 --- a/include/odp/api/spec/packet_flags.h +++ b/include/odp/api/spec/packet_flags.h @@ -11,8 +11,8 @@ * ODP packet flags */
-#ifndef ODP_API_PACKET_FLAGS_H_ -#define ODP_API_PACKET_FLAGS_H_ +#ifndef ODP_API_SPEC_PACKET_FLAGS_H_ +#define ODP_API_SPEC_PACKET_FLAGS_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index bf30877f..8f48dc80 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -11,8 +11,8 @@ * ODP Packet IO */
-#ifndef ODP_API_PACKET_IO_H_ -#define ODP_API_PACKET_IO_H_ +#ifndef ODP_API_SPEC_PACKET_IO_H_ +#define ODP_API_SPEC_PACKET_IO_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/packet_io_stats.h b/include/odp/api/spec/packet_io_stats.h index 299ecd0e..18619143 100644 --- a/include/odp/api/spec/packet_io_stats.h +++ b/include/odp/api/spec/packet_io_stats.h @@ -10,8 +10,8 @@ * ODP Packet IO */
-#ifndef ODP_API_PACKET_IO_STATS_H_ -#define ODP_API_PACKET_IO_STATS_H_ +#ifndef ODP_API_SPEC_PACKET_IO_STATS_H_ +#define ODP_API_SPEC_PACKET_IO_STATS_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index 05f019f3..67367753 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -11,8 +11,8 @@ * ODP pool */
-#ifndef ODP_API_POOL_H_ -#define ODP_API_POOL_H_ +#ifndef ODP_API_SPEC_POOL_H_ +#define ODP_API_SPEC_POOL_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index 79a26df3..c45cf730 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -11,8 +11,8 @@ * ODP queue */
-#ifndef ODP_API_QUEUE_H_ -#define ODP_API_QUEUE_H_ +#ifndef ODP_API_SPEC_QUEUE_H_ +#define ODP_API_SPEC_QUEUE_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/random.h b/include/odp/api/spec/random.h index 4765475c..8bed969b 100644 --- a/include/odp/api/spec/random.h +++ b/include/odp/api/spec/random.h @@ -11,8 +11,8 @@ * ODP random number API */
-#ifndef ODP_API_RANDOM_H_ -#define ODP_API_RANDOM_H_ +#ifndef ODP_API_SPEC_RANDOM_H_ +#define ODP_API_SPEC_RANDOM_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/rwlock.h b/include/odp/api/spec/rwlock.h index ff8a3f27..3e5c47ba 100644 --- a/include/odp/api/spec/rwlock.h +++ b/include/odp/api/spec/rwlock.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_API_RWLOCK_H_ -#define ODP_API_RWLOCK_H_ +#ifndef ODP_API_SPEC_RWLOCK_H_ +#define ODP_API_SPEC_RWLOCK_H_ #include <odp/visibility_begin.h>
/** diff --git a/include/odp/api/spec/rwlock_recursive.h b/include/odp/api/spec/rwlock_recursive.h index 1c19c721..03a4dce4 100644 --- a/include/odp/api/spec/rwlock_recursive.h +++ b/include/odp/api/spec/rwlock_recursive.h @@ -10,8 +10,8 @@ * ODP recursive read/write lock */
-#ifndef ODP_API_RWLOCK_RECURSIVE_H_ -#define ODP_API_RWLOCK_RECURSIVE_H_ +#ifndef ODP_API_SPEC_RWLOCK_RECURSIVE_H_ +#define ODP_API_SPEC_RWLOCK_RECURSIVE_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index fe2300db..52444964 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -11,8 +11,8 @@ * ODP schedule */
-#ifndef ODP_API_SCHEDULE_H_ -#define ODP_API_SCHEDULE_H_ +#ifndef ODP_API_SPEC_SCHEDULE_H_ +#define ODP_API_SPEC_SCHEDULE_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h index 397f98fc..e0dc4027 100644 --- a/include/odp/api/spec/schedule_types.h +++ b/include/odp/api/spec/schedule_types.h @@ -10,8 +10,8 @@ * ODP schedule types */
-#ifndef ODP_API_SCHEDULE_TYPES_H_ -#define ODP_API_SCHEDULE_TYPES_H_ +#ifndef ODP_API_SPEC_SCHEDULE_TYPES_H_ +#define ODP_API_SPEC_SCHEDULE_TYPES_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 38c82a10..08bfef24 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -11,8 +11,8 @@ * ODP shared memory */
-#ifndef ODP_API_SHARED_MEMORY_H_ -#define ODP_API_SHARED_MEMORY_H_ +#ifndef ODP_API_SPEC_SHARED_MEMORY_H_ +#define ODP_API_SPEC_SHARED_MEMORY_H_ #include <odp/visibility_begin.h> #include <odp/api/init.h>
diff --git a/include/odp/api/spec/spinlock.h b/include/odp/api/spec/spinlock.h index 11b7339b..fc7629dd 100644 --- a/include/odp/api/spec/spinlock.h +++ b/include/odp/api/spec/spinlock.h @@ -10,8 +10,8 @@ * ODP spinlock */
-#ifndef ODP_API_SPINLOCK_H_ -#define ODP_API_SPINLOCK_H_ +#ifndef ODP_API_SPEC_SPINLOCK_H_ +#define ODP_API_SPEC_SPINLOCK_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/spinlock_recursive.h b/include/odp/api/spec/spinlock_recursive.h index c9c7ddb0..7546e75e 100644 --- a/include/odp/api/spec/spinlock_recursive.h +++ b/include/odp/api/spec/spinlock_recursive.h @@ -10,8 +10,8 @@ * ODP recursive spinlock */
-#ifndef ODP_API_SPINLOCK_RECURSIVE_H_ -#define ODP_API_SPINLOCK_RECURSIVE_H_ +#ifndef ODP_API_SPEC_SPINLOCK_RECURSIVE_H_ +#define ODP_API_SPEC_SPINLOCK_RECURSIVE_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/std_clib.h b/include/odp/api/spec/std_clib.h index 33e9db53..d3084420 100644 --- a/include/odp/api/spec/std_clib.h +++ b/include/odp/api/spec/std_clib.h @@ -10,8 +10,8 @@ * ODP version of often used C library calls */
-#ifndef ODP_API_STD_CLIB_H_ -#define ODP_API_STD_CLIB_H_ +#ifndef ODP_API_SPEC_STD_CLIB_H_ +#define ODP_API_SPEC_STD_CLIB_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/std_types.h b/include/odp/api/spec/std_types.h index 9b4f894d..83fa3bd1 100644 --- a/include/odp/api/spec/std_types.h +++ b/include/odp/api/spec/std_types.h @@ -12,8 +12,8 @@ * */
-#ifndef ODP_API_STD_TYPES_H_ -#define ODP_API_STD_TYPES_H_ +#ifndef ODP_API_SPEC_STD_TYPES_H_ +#define ODP_API_SPEC_STD_TYPES_H_ #include <odp/visibility_begin.h> /* uint64_t, uint32_t, etc */ #include <stdint.h> diff --git a/include/odp/api/spec/support.h b/include/odp/api/spec/support.h index cc43b6f0..df732d18 100644 --- a/include/odp/api/spec/support.h +++ b/include/odp/api/spec/support.h @@ -10,8 +10,8 @@ * ODP support API */
-#ifndef ODP_API_SUPPORT_H_ -#define ODP_API_SUPPORT_H_ +#ifndef ODP_API_SPEC_SUPPORT_H_ +#define ODP_API_SPEC_SUPPORT_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/sync.h b/include/odp/api/spec/sync.h index 6f87db55..1306687c 100644 --- a/include/odp/api/spec/sync.h +++ b/include/odp/api/spec/sync.h @@ -10,8 +10,8 @@ * ODP memory barriers */
-#ifndef ODP_API_SYNC_H_ -#define ODP_API_SYNC_H_ +#ifndef ODP_API_SPEC_SYNC_H_ +#define ODP_API_SPEC_SYNC_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h index 140db7b4..38767640 100644 --- a/include/odp/api/spec/system_info.h +++ b/include/odp/api/spec/system_info.h @@ -11,8 +11,8 @@ * ODP system information */
-#ifndef ODP_API_SYSTEM_INFO_H_ -#define ODP_API_SYSTEM_INFO_H_ +#ifndef ODP_API_SPEC_SYSTEM_INFO_H_ +#define ODP_API_SPEC_SYSTEM_INFO_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/thread.h b/include/odp/api/spec/thread.h index 689ba59b..5fe74c69 100644 --- a/include/odp/api/spec/thread.h +++ b/include/odp/api/spec/thread.h @@ -11,8 +11,8 @@ * ODP thread API */
-#ifndef ODP_API_THREAD_H_ -#define ODP_API_THREAD_H_ +#ifndef ODP_API_SPEC_THREAD_H_ +#define ODP_API_SPEC_THREAD_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/threshold.h b/include/odp/api/spec/threshold.h index 38c2430a..721fcc8e 100644 --- a/include/odp/api/spec/threshold.h +++ b/include/odp/api/spec/threshold.h @@ -10,8 +10,9 @@ * ODP threshold descriptor */
-#ifndef ODP_API_THRESHOLD_H_ -#define ODP_API_THRESHOLD_H_ +#ifndef ODP_API_SPEC_THRESHOLD_H_ +#define ODP_API_SPEC_THRESHOLD_H_ + #include <odp/visibility_begin.h> #include <odp/api/std_types.h>
diff --git a/include/odp/api/spec/thrmask.h b/include/odp/api/spec/thrmask.h index 3986769a..cd37e614 100644 --- a/include/odp/api/spec/thrmask.h +++ b/include/odp/api/spec/thrmask.h @@ -10,8 +10,8 @@ * ODP thread masks */
-#ifndef ODP_API_THRMASK_H_ -#define ODP_API_THRMASK_H_ +#ifndef ODP_API_SPEC_THRMASK_H_ +#define ODP_API_SPEC_THRMASK_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/ticketlock.h b/include/odp/api/spec/ticketlock.h index b23253b5..bf706cb3 100644 --- a/include/odp/api/spec/ticketlock.h +++ b/include/odp/api/spec/ticketlock.h @@ -11,8 +11,8 @@ * ODP ticketlock */
-#ifndef ODP_API_TICKETLOCK_H_ -#define ODP_API_TICKETLOCK_H_ +#ifndef ODP_API_SPEC_TICKETLOCK_H_ +#define ODP_API_SPEC_TICKETLOCK_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/time.h b/include/odp/api/spec/time.h index 50082f53..2bdb31fa 100644 --- a/include/odp/api/spec/time.h +++ b/include/odp/api/spec/time.h @@ -11,8 +11,8 @@ * ODP time */
-#ifndef ODP_API_TIME_H_ -#define ODP_API_TIME_H_ +#ifndef ODP_API_SPEC_TIME_H_ +#define ODP_API_SPEC_TIME_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 17daafc7..a85edda5 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -11,8 +11,8 @@ * ODP timer service */
-#ifndef ODP_API_TIMER_H_ -#define ODP_API_TIMER_H_ +#ifndef ODP_API_SPEC_TIMER_H_ +#define ODP_API_SPEC_TIMER_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index b956f002..d31b7b60 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */
-#ifndef ODP_TRAFFIC_MNGR_H_ -#define ODP_TRAFFIC_MNGR_H_ +#ifndef ODP_API_SPEC_TRAFFIC_MNGR_H_ +#define ODP_API_SPEC_TRAFFIC_MNGR_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus diff --git a/include/odp/api/spec/version.h.in b/include/odp/api/spec/version.h.in index f5e9e9c8..1a9a83f9 100644 --- a/include/odp/api/spec/version.h.in +++ b/include/odp/api/spec/version.h.in @@ -11,8 +11,8 @@ * ODP version */
-#ifndef ODP_API_VERSION_H_ -#define ODP_API_VERSION_H_ +#ifndef ODP_API_SPEC_VERSION_H_ +#define ODP_API_SPEC_VERSION_H_ #include <odp/visibility_begin.h>
#ifdef __cplusplus
commit 3768a6331899a4b17dcd89ec82b0295fb1ef667a Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:37:53 2017 +0300
linux-gen: atomic: simplify locked 64-bit support
Rewrite atomic_types.h/atomic_inlines.h to clearly separate simple (common) and locked 64-bit cases. This allows us to ease switching of atomic.h header to api+abi setup.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h index 03b2884f..1c58c77d 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h @@ -109,177 +109,254 @@ _ODP_INLINE void odp_atomic_min_u32(odp_atomic_u32_t *atom, uint32_t new_min) } }
+#ifdef ODP_ATOMIC_U64_LOCK + +/** + * @internal + * CAS operation expression for the ATOMIC_OP macro + */ +#define ATOMIC_CAS_OP(ret_ptr, old_val, new_val) \ +({ \ + if (atom->v == (old_val)) { \ + atom->v = (new_val); \ + *(ret_ptr) = 1; \ + } else { \ + *(ret_ptr) = 0; \ + } \ +}) + +/** + * @internal + * Helper macro for lock-based atomic operations on 64-bit integers + * @param[in,out] atom Pointer to the 64-bit atomic variable + * @param expr Expression used update the variable. + * @return The old value of the variable. + */ +#define ATOMIC_OP(atom, expr) \ +({ \ + uint64_t _old_val; \ + /* Loop while lock is already taken, stop when lock becomes clear */ \ + while (__atomic_test_and_set(&(atom)->lock, __ATOMIC_ACQUIRE)) \ + (void)0; \ + _old_val = (atom)->v; \ + (expr); /* Perform whatever update is desired */ \ + __atomic_clear(&(atom)->lock, __ATOMIC_RELEASE); \ + _old_val; /* Return old value */ \ +}) + _ODP_INLINE void odp_atomic_init_u64(odp_atomic_u64_t *atom, uint64_t val) { atom->v = val; -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 __atomic_clear(&atom->lock, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE uint64_t odp_atomic_load_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, (void)0); -#else - return __atomic_load_n(&atom->v, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE void odp_atomic_store_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v = val); -#else - __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE uint64_t odp_atomic_fetch_add_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v += val); -#else - return __atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE void odp_atomic_add_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v += val); -#else - (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE uint64_t odp_atomic_fetch_sub_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v -= val); -#else - return __atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE void odp_atomic_sub_u64(odp_atomic_u64_t *atom, uint64_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v -= val); -#else - (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE uint64_t odp_atomic_fetch_inc_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v++); -#else - return __atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE void odp_atomic_inc_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v++); -#else - (void)__atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE uint64_t odp_atomic_fetch_dec_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v--); -#else - return __atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE void odp_atomic_dec_u64(odp_atomic_u64_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP(atom, atom->v--); -#else - (void)__atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); -#endif }
_ODP_INLINE int odp_atomic_cas_u64(odp_atomic_u64_t *atom, uint64_t *old_val, uint64_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 int ret; *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); return ret; -#else - return __atomic_compare_exchange_n(&atom->v, old_val, new_val, - 0 /* strong */, - __ATOMIC_RELAXED, - __ATOMIC_RELAXED); -#endif }
_ODP_INLINE uint64_t odp_atomic_xchg_u64(odp_atomic_u64_t *atom, uint64_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP(atom, atom->v = new_val); -#else - return __atomic_exchange_n(&atom->v, new_val, __ATOMIC_RELAXED); -#endif }
-_ODP_INLINE void odp_atomic_max_u64(odp_atomic_u64_t *atom, uint64_t new_max) +_ODP_INLINE uint64_t odp_atomic_load_acq_u64(odp_atomic_u64_t *atom) { - uint64_t old_val; + return ATOMIC_OP(atom, (void)0); +}
- old_val = odp_atomic_load_u64(atom); +_ODP_INLINE void odp_atomic_store_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + (void)ATOMIC_OP(atom, atom->v = val); +}
- while (new_max > old_val) { - if (odp_atomic_cas_u64(atom, &old_val, new_max)) - break; - } +_ODP_INLINE void odp_atomic_add_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + (void)ATOMIC_OP(atom, atom->v += val); }
-_ODP_INLINE void odp_atomic_min_u64(odp_atomic_u64_t *atom, uint64_t new_min) +_ODP_INLINE void odp_atomic_sub_rel_u64(odp_atomic_u64_t *atom, uint64_t val) { - uint64_t old_val; + (void)ATOMIC_OP(atom, atom->v -= val); +}
- old_val = odp_atomic_load_u64(atom); +_ODP_INLINE int odp_atomic_cas_acq_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, uint64_t new_val) +{ + int ret; + *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); + return ret; +}
- while (new_min < old_val) { - if (odp_atomic_cas_u64(atom, &old_val, new_min)) - break; - } +_ODP_INLINE int odp_atomic_cas_rel_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, uint64_t new_val) +{ + int ret; + *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); + return ret; }
-_ODP_INLINE uint32_t odp_atomic_load_acq_u32(odp_atomic_u32_t *atom) +_ODP_INLINE int odp_atomic_cas_acq_rel_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, + uint64_t new_val) +{ + int ret; + *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); + return ret; +} + +#else /* !ODP_ATOMIC_U64_LOCK */ + +_ODP_INLINE void odp_atomic_init_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + atom->v = val; +} + +_ODP_INLINE uint64_t odp_atomic_load_u64(odp_atomic_u64_t *atom) +{ + return __atomic_load_n(&atom->v, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_store_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + __atomic_store_n(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_fetch_add_u64(odp_atomic_u64_t *atom, + uint64_t val) +{ + return __atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_add_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_fetch_sub_u64(odp_atomic_u64_t *atom, + uint64_t val) +{ + return __atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_sub_u64(odp_atomic_u64_t *atom, uint64_t val) +{ + (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_fetch_inc_u64(odp_atomic_u64_t *atom) +{ + return __atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_inc_u64(odp_atomic_u64_t *atom) +{ + (void)__atomic_fetch_add(&atom->v, 1, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_fetch_dec_u64(odp_atomic_u64_t *atom) +{ + return __atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); +} + +_ODP_INLINE void odp_atomic_dec_u64(odp_atomic_u64_t *atom) +{ + (void)__atomic_fetch_sub(&atom->v, 1, __ATOMIC_RELAXED); +} + +_ODP_INLINE int odp_atomic_cas_u64(odp_atomic_u64_t *atom, uint64_t *old_val, + uint64_t new_val) +{ + return __atomic_compare_exchange_n(&atom->v, old_val, new_val, + 0 /* strong */, + __ATOMIC_RELAXED, + __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_xchg_u64(odp_atomic_u64_t *atom, + uint64_t new_val) +{ + return __atomic_exchange_n(&atom->v, new_val, __ATOMIC_RELAXED); +} + +_ODP_INLINE uint64_t odp_atomic_load_acq_u64(odp_atomic_u64_t *atom) { return __atomic_load_n(&atom->v, __ATOMIC_ACQUIRE); }
-_ODP_INLINE void odp_atomic_store_rel_u32(odp_atomic_u32_t *atom, uint32_t val) +_ODP_INLINE void odp_atomic_store_rel_u64(odp_atomic_u64_t *atom, uint64_t val) { __atomic_store_n(&atom->v, val, __ATOMIC_RELEASE); }
-_ODP_INLINE void odp_atomic_add_rel_u32(odp_atomic_u32_t *atom, uint32_t val) +_ODP_INLINE void odp_atomic_add_rel_u64(odp_atomic_u64_t *atom, uint64_t val) { (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELEASE); }
-_ODP_INLINE void odp_atomic_sub_rel_u32(odp_atomic_u32_t *atom, uint32_t val) +_ODP_INLINE void odp_atomic_sub_rel_u64(odp_atomic_u64_t *atom, uint64_t val) { (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELEASE); }
-_ODP_INLINE int odp_atomic_cas_acq_u32(odp_atomic_u32_t *atom, - uint32_t *old_val, uint32_t new_val) +_ODP_INLINE int odp_atomic_cas_acq_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, uint64_t new_val) { return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, @@ -287,8 +364,8 @@ _ODP_INLINE int odp_atomic_cas_acq_u32(odp_atomic_u32_t *atom, __ATOMIC_RELAXED); }
-_ODP_INLINE int odp_atomic_cas_rel_u32(odp_atomic_u32_t *atom, - uint32_t *old_val, uint32_t new_val) +_ODP_INLINE int odp_atomic_cas_rel_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, uint64_t new_val) { return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, @@ -296,9 +373,9 @@ _ODP_INLINE int odp_atomic_cas_rel_u32(odp_atomic_u32_t *atom, __ATOMIC_RELAXED); }
-_ODP_INLINE int odp_atomic_cas_acq_rel_u32(odp_atomic_u32_t *atom, - uint32_t *old_val, - uint32_t new_val) +_ODP_INLINE int odp_atomic_cas_acq_rel_u64(odp_atomic_u64_t *atom, + uint64_t *old_val, + uint64_t new_val) { return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, @@ -306,86 +383,78 @@ _ODP_INLINE int odp_atomic_cas_acq_rel_u32(odp_atomic_u32_t *atom, __ATOMIC_RELAXED); }
-_ODP_INLINE uint64_t odp_atomic_load_acq_u64(odp_atomic_u64_t *atom) +#endif /* !ODP_ATOMIC_U64_LOCK */ + +_ODP_INLINE void odp_atomic_max_u64(odp_atomic_u64_t *atom, uint64_t new_max) +{ + uint64_t old_val; + + old_val = odp_atomic_load_u64(atom); + + while (new_max > old_val) { + if (odp_atomic_cas_u64(atom, &old_val, new_max)) + break; + } +} + +_ODP_INLINE void odp_atomic_min_u64(odp_atomic_u64_t *atom, uint64_t new_min) +{ + uint64_t old_val; + + old_val = odp_atomic_load_u64(atom); + + while (new_min < old_val) { + if (odp_atomic_cas_u64(atom, &old_val, new_min)) + break; + } +} + +_ODP_INLINE uint32_t odp_atomic_load_acq_u32(odp_atomic_u32_t *atom) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - return ATOMIC_OP(atom, (void)0); -#else return __atomic_load_n(&atom->v, __ATOMIC_ACQUIRE); -#endif }
-_ODP_INLINE void odp_atomic_store_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +_ODP_INLINE void odp_atomic_store_rel_u32(odp_atomic_u32_t *atom, uint32_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v = val); -#else __atomic_store_n(&atom->v, val, __ATOMIC_RELEASE); -#endif }
-_ODP_INLINE void odp_atomic_add_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +_ODP_INLINE void odp_atomic_add_rel_u32(odp_atomic_u32_t *atom, uint32_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v += val); -#else (void)__atomic_fetch_add(&atom->v, val, __ATOMIC_RELEASE); -#endif }
-_ODP_INLINE void odp_atomic_sub_rel_u64(odp_atomic_u64_t *atom, uint64_t val) +_ODP_INLINE void odp_atomic_sub_rel_u32(odp_atomic_u32_t *atom, uint32_t val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - (void)ATOMIC_OP(atom, atom->v -= val); -#else (void)__atomic_fetch_sub(&atom->v, val, __ATOMIC_RELEASE); -#endif }
-_ODP_INLINE int odp_atomic_cas_acq_u64(odp_atomic_u64_t *atom, - uint64_t *old_val, uint64_t new_val) +_ODP_INLINE int odp_atomic_cas_acq_u32(odp_atomic_u32_t *atom, + uint32_t *old_val, uint32_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED); -#endif }
-_ODP_INLINE int odp_atomic_cas_rel_u64(odp_atomic_u64_t *atom, - uint64_t *old_val, uint64_t new_val) +_ODP_INLINE int odp_atomic_cas_rel_u32(odp_atomic_u32_t *atom, + uint32_t *old_val, uint32_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, __ATOMIC_RELEASE, __ATOMIC_RELAXED); -#endif }
-_ODP_INLINE int odp_atomic_cas_acq_rel_u64(odp_atomic_u64_t *atom, - uint64_t *old_val, - uint64_t new_val) +_ODP_INLINE int odp_atomic_cas_acq_rel_u32(odp_atomic_u32_t *atom, + uint32_t *old_val, + uint32_t new_val) { -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - int ret; - *old_val = ATOMIC_OP(atom, ATOMIC_CAS_OP(&ret, *old_val, new_val)); - return ret; -#else return __atomic_compare_exchange_n(&atom->v, old_val, new_val, 0 /* strong */, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); -#endif }
#endif diff --git a/platform/linux-generic/include/odp/api/plat/atomic_types.h b/platform/linux-generic/include/odp/api/plat/atomic_types.h index a674ac99..c0803bf1 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_types.h @@ -20,61 +20,39 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/align.h>
-/** - * @internal - * Atomic 64-bit unsigned integer - */ -struct odp_atomic_u64_s { - uint64_t v; /**< Actual storage for the atomic variable */ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - /* Some architectures do not support lock-free operations on 64-bit - * data types. We use a spin lock to ensure atomicity. */ - char lock; /**< Spin lock (if needed) used to ensure atomic access */ -#endif -} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignement! */ - /** * @internal * Atomic 32-bit unsigned integer */ struct odp_atomic_u32_s { uint32_t v; /**< Actual storage for the atomic variable */ -} ODP_ALIGNED(sizeof(uint32_t)); /* Enforce alignement! */ +} ODP_ALIGNED(sizeof(uint32_t)); /* Enforce alignment! */
-#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 +#if __GCC_ATOMIC_LLONG_LOCK_FREE >= 2
/** * @internal - * CAS operation expression for the ATOMIC_OP macro + * Atomic 64-bit unsigned integer */ -#define ATOMIC_CAS_OP(ret_ptr, old_val, new_val) \ -({ \ - if (atom->v == (old_val)) { \ - atom->v = (new_val); \ - *(ret_ptr) = 1; \ - } else { \ - *(ret_ptr) = 0; \ - } \ -}) +struct odp_atomic_u64_s { + uint64_t v; /**< Actual storage for the atomic variable */ +} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignment! */ + +#else + +#define ODP_ATOMIC_U64_LOCK 1
/** * @internal - * Helper macro for lock-based atomic operations on 64-bit integers - * @param[in,out] atom Pointer to the 64-bit atomic variable - * @param expr Expression used update the variable. - * @return The old value of the variable. + * Atomic 64-bit unsigned integer */ -#define ATOMIC_OP(atom, expr) \ -({ \ - uint64_t _old_val; \ - /* Loop while lock is already taken, stop when lock becomes clear */ \ - while (__atomic_test_and_set(&(atom)->lock, __ATOMIC_ACQUIRE)) \ - (void)0; \ - _old_val = (atom)->v; \ - (expr); /* Perform whatever update is desired */ \ - __atomic_clear(&(atom)->lock, __ATOMIC_RELEASE); \ - _old_val; /* Return old value */ \ -}) +struct odp_atomic_u64_s { + uint64_t v; /**< Actual storage for the atomic variable */ + /* Some architectures do not support lock-free operations on 64-bit + * data types. We use a spin lock to ensure atomicity. */ + char lock; /**< Spin lock (if needed) used to ensure atomic access */ +} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignment! */ + #endif
typedef struct odp_atomic_u64_s odp_atomic_u64_t; diff --git a/platform/linux-generic/include/odp_atomic_internal.h b/platform/linux-generic/include/odp_atomic_internal.h index dca2175c..f3696a99 100644 --- a/platform/linux-generic/include/odp_atomic_internal.h +++ b/platform/linux-generic/include/odp_atomic_internal.h @@ -223,7 +223,7 @@ static inline void _odp_atomic_u32_sub_mm(odp_atomic_u32_t *atom, *****************************************************************************/
/* Check if the compiler support lock-less atomic operations on 64-bit types */ -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 +#ifdef ODP_ATOMIC_U64_LOCK /** * @internal * Helper macro for lock-based atomic operations on 64-bit integers @@ -247,7 +247,6 @@ static inline void _odp_atomic_u32_sub_mm(odp_atomic_u32_t *atom, __ATOMIC_SEQ_CST : __ATOMIC_RELEASE); \ old_val; /* Return old value */ \ }) -#endif
/** * Atomic load of 64-bit atomic variable @@ -258,13 +257,9 @@ static inline void _odp_atomic_u32_sub_mm(odp_atomic_u32_t *atom, * @return Value of the variable */ static inline uint64_t _odp_atomic_u64_load_mm(odp_atomic_u64_t *atom, - _odp_memmodel_t mmodel) + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP_MM(atom, (void)0, mmodel); -#else - return __atomic_load_n(&atom->v, mmodel); -#endif }
/** @@ -275,14 +270,10 @@ static inline uint64_t _odp_atomic_u64_load_mm(odp_atomic_u64_t *atom, * @param mmodel Memory order associated with the store operation */ static inline void _odp_atomic_u64_store_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP_MM(atom, atom->v = val, mmodel); -#else - __atomic_store_n(&atom->v, val, mmodel); -#endif }
/** @@ -295,15 +286,11 @@ static inline void _odp_atomic_u64_store_mm(odp_atomic_u64_t *atom, * @return Old value of variable */ static inline uint64_t _odp_atomic_u64_xchg_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel)
{ -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP_MM(atom, atom->v = val, mmodel); -#else - return __atomic_exchange_n(&atom->v, val, mmodel); -#endif }
/** @@ -322,12 +309,11 @@ static inline uint64_t _odp_atomic_u64_xchg_mm(odp_atomic_u64_t *atom, * @retval 0 exchange failed and '*exp' updated with current value */ static inline int _odp_atomic_u64_cmp_xchg_strong_mm(odp_atomic_u64_t *atom, - uint64_t *exp, - uint64_t val, - _odp_memmodel_t success, - _odp_memmodel_t failure) + uint64_t *exp, + uint64_t val, + _odp_memmodel_t success, + _odp_memmodel_t failure) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 /* Possibly we are a bit pessimistic with the memory models */ odp_bool_t ret_succ; /* Loop while lock is already taken, stop when lock becomes clear */ @@ -346,10 +332,6 @@ static inline int _odp_atomic_u64_cmp_xchg_strong_mm(odp_atomic_u64_t *atom, (ret_succ ? success : failure) == _ODP_MEMMODEL_SC ? __ATOMIC_SEQ_CST : __ATOMIC_RELEASE); return ret_succ; -#else - return __atomic_compare_exchange_n(&atom->v, exp, val, - false/*strong*/, success, failure); -#endif }
/** @@ -362,14 +344,10 @@ static inline int _odp_atomic_u64_cmp_xchg_strong_mm(odp_atomic_u64_t *atom, * @return Value of the atomic variable before the addition */ static inline uint64_t _odp_atomic_u64_fetch_add_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP_MM(atom, atom->v += val, mmodel); -#else - return __atomic_fetch_add(&atom->v, val, mmodel); -#endif }
/** @@ -380,15 +358,11 @@ static inline uint64_t _odp_atomic_u64_fetch_add_mm(odp_atomic_u64_t *atom, * @param mmodel Memory order associated with the add operation. */ static inline void _odp_atomic_u64_add_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel)
{ -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP_MM(atom, atom->v += val, mmodel); -#else - (void)__atomic_fetch_add(&atom->v, val, mmodel); -#endif }
/** @@ -401,14 +375,10 @@ static inline void _odp_atomic_u64_add_mm(odp_atomic_u64_t *atom, * @return Value of the atomic variable before the subtraction */ static inline uint64_t _odp_atomic_u64_fetch_sub_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel) { -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 return ATOMIC_OP_MM(atom, atom->v -= val, mmodel); -#else - return __atomic_fetch_sub(&atom->v, val, mmodel); -#endif }
/** @@ -419,20 +389,150 @@ static inline uint64_t _odp_atomic_u64_fetch_sub_mm(odp_atomic_u64_t *atom, * @param mmodel Memory order associated with the subtract operation */ static inline void _odp_atomic_u64_sub_mm(odp_atomic_u64_t *atom, - uint64_t val, - _odp_memmodel_t mmodel) + uint64_t val, + _odp_memmodel_t mmodel)
{ -#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 (void)ATOMIC_OP_MM(atom, atom->v -= val, mmodel); -#else - (void)__atomic_fetch_sub(&atom->v, val, mmodel); -#endif }
-#if !defined __GCC_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LLONG_LOCK_FREE < 2 #undef ATOMIC_OP_MM -#endif + +#else /* ! ODP_ATOMIC_U64_LOCK */ + +/** + * Atomic load of 64-bit atomic variable + * + * @param atom Pointer to a 64-bit atomic variable + * @param mmodel Memory order associated with the load operation + * + * @return Value of the variable + */ +static inline uint64_t _odp_atomic_u64_load_mm(odp_atomic_u64_t *atom, + _odp_memmodel_t mmodel) +{ + return __atomic_load_n(&atom->v, mmodel); +} + +/** + * Atomic store to 64-bit atomic variable + * + * @param[out] atom Pointer to a 64-bit atomic variable + * @param val Value to write to the atomic variable + * @param mmodel Memory order associated with the store operation + */ +static inline void _odp_atomic_u64_store_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) +{ + __atomic_store_n(&atom->v, val, mmodel); +} + +/** + * Atomic exchange (swap) of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val New value to write to the atomic variable + * @param mmodel Memory order associated with the exchange operation + * + * @return Old value of variable + */ +static inline uint64_t _odp_atomic_u64_xchg_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) + +{ + return __atomic_exchange_n(&atom->v, val, mmodel); +} + +/** + * Atomic compare and exchange (swap) of 64-bit atomic variable + * "Strong" semantics, will not fail spuriously. + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param[in,out] exp Pointer to expected value (updated on failure) + * @param val New value to write + * @param success Memory order associated with a successful compare-and-swap + * operation + * @param failure Memory order associated with a failed compare-and-swap + * operation + * + * @retval 1 exchange successful + * @retval 0 exchange failed and '*exp' updated with current value + */ +static inline int _odp_atomic_u64_cmp_xchg_strong_mm(odp_atomic_u64_t *atom, + uint64_t *exp, + uint64_t val, + _odp_memmodel_t success, + _odp_memmodel_t failure) +{ + return __atomic_compare_exchange_n(&atom->v, exp, val, + false/*strong*/, success, failure); +} + +/** + * Atomic fetch and add of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val Value to add to the atomic variable + * @param mmodel Memory order associated with the add operation + * + * @return Value of the atomic variable before the addition + */ +static inline uint64_t _odp_atomic_u64_fetch_add_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) +{ + return __atomic_fetch_add(&atom->v, val, mmodel); +} + +/** + * Atomic add of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val Value to add to the atomic variable + * @param mmodel Memory order associated with the add operation. + */ +static inline void _odp_atomic_u64_add_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) + +{ + (void)__atomic_fetch_add(&atom->v, val, mmodel); +} + +/** + * Atomic fetch and subtract of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val Value to subtract from the atomic variable + * @param mmodel Memory order associated with the subtract operation + * + * @return Value of the atomic variable before the subtraction + */ +static inline uint64_t _odp_atomic_u64_fetch_sub_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) +{ + return __atomic_fetch_sub(&atom->v, val, mmodel); +} + +/** + * Atomic subtract of 64-bit atomic variable + * + * @param[in,out] atom Pointer to a 64-bit atomic variable + * @param val Value to subtract from the atomic variable + * @param mmodel Memory order associated with the subtract operation + */ +static inline void _odp_atomic_u64_sub_mm(odp_atomic_u64_t *atom, + uint64_t val, + _odp_memmodel_t mmodel) + +{ + (void)__atomic_fetch_sub(&atom->v, val, mmodel); +} + +#endif /* ! ODP_ATOMIC_U64_LOCK */
/***************************************************************************** * Operations on pointer atomics
commit 6a7c5313178504d4c0d211de231c52b795e26c5f Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Mon Oct 23 13:37:51 2017 +0300
travis: add cross-compiling tests with ABI compatibility disabled
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/.travis.yml b/.travis.yml index 786f01ae..b614668c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,6 +78,10 @@ env: - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" - CROSS_ARCH="i386" + - CROSS_ARCH="arm64" CONF="--disable-abi-compat" + - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" CONF="--disable-abi-compat" + - CROSS_ARCH="powerpc" CONF="--disable-abi-compat" + - CROSS_ARCH="i386" CONF="--disable-abi-compat"
before_install:
commit c9528e9576a391ee865f7efb3df5fb9a69602c40 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Oct 22 14:18:44 2017 +0300
travis: also run make distcheck in non-ABI-compat mode
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/.travis.yml b/.travis.yml index fa352b57..786f01ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -294,6 +294,14 @@ jobs: - ./configure --prefix=$HOME/odp-install --enable-user-guides - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck + - stage: test + env: TEST=distcheck-non-abi + compiler: gcc + script: + - ./bootstrap + - ./configure --prefix=$HOME/odp-install + --enable-user-guides + - sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck DISTCHECK__CONFIGURE_FLAGS=--disable-abi-compat - stage: "build only" env: TEST=doxygen compiler: gcc
-----------------------------------------------------------------------
Summary of changes: .travis.yml | 12 + Makefile.inc | 18 ++ configure.ac | 12 +- example/Makefile.inc | 12 +- example/ipfragreass/odp_ipfragreass.c | 4 +- example/l3fwd/odp_l3fwd_db.h | 4 +- example/switch/odp_switch.c | 4 +- example/traffic_mgmt/odp_traffic_mgmt.c | 1 + helper/Makefile.am | 12 +- helper/cuckootable.c | 8 +- helper/iplookuptable.c | 4 +- helper/test/linux/process.c | 2 + helper/test/linux/pthread.c | 2 + helper/threads.c | 1 + include/Makefile.am | 290 +++++++++++++++++-- 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 | 0 .../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 | 0 .../odp/api/abi-default/init.h | 6 +- .../odp/api/abi-default/ipsec.h | 12 +- .../default/api/abi => api/abi-default}/packet.h | 0 .../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 | 6 +- .../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 | 4 +- 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 | 4 +- 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 | 6 +- .../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 +- .../abi/pool.h => arm32-linux/odp/api/abi/align.h} | 2 +- .../pool.h => arm32-linux/odp/api/abi/atomic.h} | 2 +- .../pool.h => arm32-linux/odp/api/abi/barrier.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/buffer.h | 2 +- .../pool.h => arm32-linux/odp/api/abi/byteorder.h} | 2 +- .../arch/arm32-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/cpu.h | 6 +- .../pool.h => arm32-linux/odp/api/abi/cpumask.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/crypto.h | 2 +- .../abi/pool.h => arm32-linux/odp/api/abi/debug.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/event.h | 2 +- .../abi/pool.h => arm32-linux/odp/api/abi/init.h} | 2 +- .../abi/pool.h => arm32-linux/odp/api/abi/ipsec.h} | 2 +- include/odp/arch/arm32-linux/odp/api/abi/packet.h | 2 +- .../odp/api/abi/{event.h => packet_flags.h} | 2 +- .../pool.h => arm32-linux/odp/api/abi/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 +- .../pool.h => arm32-linux/odp/api/abi/rwlock.h} | 2 +- .../odp/api/abi/{event.h => rwlock_recursive.h} | 2 +- .../pool.h => arm32-linux/odp/api/abi/schedule.h} | 2 +- .../odp/api/abi/{event.h => schedule_types.h} | 2 +- .../arch/arm32-linux/odp/api/abi/shared_memory.h | 2 +- .../pool.h => arm32-linux/odp/api/abi/spinlock.h} | 2 +- .../odp/api/abi/{event.h => spinlock_recursive.h} | 2 +- .../pool.h => arm32-linux/odp/api/abi/std_clib.h} | 2 +- .../pool.h => arm32-linux/odp/api/abi/std_types.h} | 2 +- .../abi/pool.h => arm32-linux/odp/api/abi/sync.h} | 2 +- .../pool.h => arm32-linux/odp/api/abi/thread.h} | 2 +- .../pool.h => arm32-linux/odp/api/abi/thrmask.h} | 2 +- .../odp/api/abi/{event.h => ticketlock.h} | 2 +- .../abi/pool.h => arm32-linux/odp/api/abi/time.h} | 2 +- .../abi/pool.h => arm32-linux/odp/api/abi/timer.h} | 2 +- .../odp/api/abi/{event.h => traffic_mngr.h} | 2 +- .../arm32-linux/odp/api/abi/{pool.h => version.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => align.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => atomic.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => barrier.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/buffer.h | 2 +- .../odp/api/abi/{pool.h => byteorder.h} | 2 +- .../arch/arm64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/cpu.h | 6 +- .../arm64-linux/odp/api/abi/{pool.h => cpumask.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/crypto.h | 2 +- .../arm64-linux/odp/api/abi/{pool.h => debug.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/event.h | 2 +- .../arm64-linux/odp/api/abi/{pool.h => init.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => ipsec.h} | 2 +- include/odp/arch/arm64-linux/odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h} | 2 +- .../odp/api/abi/{pool.h => 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 +- .../arm64-linux/odp/api/abi/{pool.h => rwlock.h} | 2 +- .../odp/api/abi/rwlock_recursive.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => schedule.h} | 2 +- .../odp/api/abi/schedule_types.h} | 2 +- .../arch/arm64-linux/odp/api/abi/shared_memory.h | 2 +- .../arm64-linux/odp/api/abi/{pool.h => spinlock.h} | 2 +- .../odp/api/abi/spinlock_recursive.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => std_clib.h} | 2 +- .../odp/api/abi/{pool.h => std_types.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => sync.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => thread.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => thrmask.h} | 2 +- .../odp/api/abi/ticketlock.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => time.h} | 2 +- .../arm64-linux/odp/api/abi/{pool.h => timer.h} | 2 +- .../odp/api/abi/traffic_mngr.h} | 2 +- .../pool.h => arm64-linux/odp/api/abi/version.h} | 2 +- .../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 +- .../event.h => power64-linux/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 - platform/Makefile.inc | 2 +- platform/linux-generic/.gitignore | 1 - platform/linux-generic/Makefile.am | 174 +++++------- .../api/cpu_arch.h => aarch64/odp/api/abi/cpu.h} | 6 +- .../arch/arm/odp/api/{cpu_arch.h => abi/cpu.h} | 6 +- .../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} | 11 +- .../odp/api/abi/byteorder.h} | 15 +- .../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} | 12 +- .../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} | 10 +- .../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/hash.h => include-abi/odp/api/abi/sync.h} | 13 +- .../linux-generic/include-abi/odp/api/abi/thread.h | 2 +- .../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 | 22 ++ .../include/odp/api/plat/packet_flag_inlines.h | 19 +- .../plat/{packet_types.h => packet_inline_types.h} | 53 +--- .../include/odp/api/plat/packet_inlines.h | 30 +- .../include/odp/api/plat/pool_inline_types.h | 37 +++ .../plat/{static_inline.h.in => static_inline.h} | 2 +- .../include/odp/api/plat/std_clib_inlines.h | 1 - .../include/odp/api/plat/strong_types.h | 2 + .../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_buffer_internal.h | 4 +- .../linux-generic/include/odp_ipsec_internal.h | 2 +- platform/linux-generic/include/odp_packet_dpdk.h | 8 +- .../linux-generic/include/odp_packet_internal.h | 7 +- .../include/odp_packet_io_ring_internal.h | 10 +- platform/linux-generic/include/odp_packet_netmap.h | 4 +- platform/linux-generic/include/odp_packet_socket.h | 6 +- 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 +- platform/linux-generic/m4/configure.m4 | 1 - platform/linux-generic/odp_atomic.c | 3 - platform/linux-generic/odp_atomic_api.c | 13 + platform/linux-generic/odp_byteorder.c | 5 +- platform/linux-generic/odp_name_table.c | 8 +- platform/linux-generic/odp_packet.c | 9 +- platform/linux-generic/odp_packet_api.c | 28 ++ platform/linux-generic/odp_packet_flags.c | 5 - platform/linux-generic/odp_packet_flags_api.c | 15 + platform/linux-generic/odp_packet_io.c | 6 + platform/linux-generic/odp_pkt_queue.c | 9 +- platform/linux-generic/odp_pool.c | 3 +- platform/linux-generic/odp_queue_scalable.c | 1 + 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_std_clib.c | 5 +- platform/linux-generic/odp_sync.c | 5 +- platform/linux-generic/odp_ticketlock.c | 12 +- platform/linux-generic/odp_timer.c | 12 +- platform/linux-generic/pktio/dpdk.c | 2 +- platform/linux-generic/pktio/netmap.c | 2 +- platform/linux-generic/pktio/socket_mmap.c | 7 +- platform/linux-generic/test/ring/Makefile.am | 3 + scripts/checkpatch.pl | 1 + test/Makefile.inc | 18 +- test/performance/odp_l2fwd.c | 4 +- test/performance/odp_pktio_ordered.c | 4 +- test/performance/odp_sched_latency.c | 4 +- test/performance/odp_scheduling.c | 4 +- test/validation/api/chksum/chksum.c | 6 +- 464 files changed, 2196 insertions(+), 1980 deletions(-) create mode 100644 Makefile.inc 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 (100%) 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%) rename 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 (100%) 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 (100%) 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 (76%) 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%) rename {platform/linux-generic/include => include}/odp/api/event.h (65%) rename {platform/linux-generic/include => include}/odp/api/feature.h (71%) copy {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 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 (74%) 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/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/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/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{event.h => packet_flags.h} (71%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{event.h => rwlock_recursive.h} (69%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{event.h => schedule_types.h} (70%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{event.h => spinlock_recursive.h} (68%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{event.h => ticketlock.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => arm32-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/arm32-linux/odp/api/abi/{event.h => traffic_mngr.h} (71%) copy include/odp/arch/arm32-linux/odp/api/abi/{pool.h => version.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => align.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => atomic.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => barrier.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => 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/arm64-linux/odp/api/abi/{pool.h => cpumask.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => debug.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => init.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => arm64-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => packet_io.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => arm64-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => arm64-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => arm64-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => std_clib.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => std_types.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => sync.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => thread.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => arm64-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => time.h} (72%) copy include/odp/arch/arm64-linux/odp/api/abi/{pool.h => timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.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%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm64-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/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => mips64-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => mips64-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => mips64-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => mips64-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => mips64-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => mips64-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.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/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/byteorder.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => power64-linux/odp/api/abi/cpu.h} (61%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => power64-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => power64-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => power64-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => power64-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => power64-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => power64-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.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/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm64-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/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_32-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_32-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_32-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_32-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_32-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_32-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.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/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/align.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/atomic.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/barrier.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/byteorder.h} (72%) rename 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/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/cpumask.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/debug.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/init.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/ipsec.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_64-linux/odp/api/abi/packet_flags.h} (71%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/packet_io.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/rwlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_64-linux/odp/api/abi/rwlock_recursive.h} (69%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/schedule.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_64-linux/odp/api/abi/schedule_types.h} (70%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/spinlock.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_64-linux/odp/api/abi/spinlock_recursive.h} (68%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/std_clib.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/std_types.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/sync.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/thread.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/thrmask.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.h => x86_64-linux/odp/api/abi/ticketlock.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/time.h} (72%) copy include/odp/arch/{arm64-linux/odp/api/abi/pool.h => x86_64-linux/odp/api/abi/timer.h} (72%) copy include/odp/arch/{arm32-linux/odp/api/abi/event.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%) 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/mips64/odp/api/{cpu_arch.h => abi/cpu.h} (83%) copy include/odp/arch/arm32-linux/odp/api/abi/event.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/arm64-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} (73%) rename platform/linux-generic/{include/odp/api/plat/byteorder_types.h => include-abi/odp/api/abi/byteorder.h} (85%) rename platform/linux-generic/{include/odp/api/plat/classification_types.h => include-abi/odp/api/abi/classification.h} (74%) copy include/odp/arch/arm64-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} (80%) copy include/odp/arch/arm64-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/arm64-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/event.h => platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h (69%) copy include/odp/arch/arm64-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/event.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/arm64-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/event.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/arm64-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/hash.h => include-abi/odp/api/abi/sync.h} (58%) copy include/odp/arch/arm64-linux/odp/api/abi/pool.h => platform/linux-generic/include-abi/odp/api/abi/thread.h (72%) copy include/odp/arch/arm64-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/arm64-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/event.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 rename platform/linux-generic/include/odp/api/plat/{packet_types.h => packet_inline_types.h} (78%) create mode 100644 platform/linux-generic/include/odp/api/plat/pool_inline_types.h rename platform/linux-generic/include/odp/api/plat/{static_inline.h.in => static_inline.h} (96%) delete mode 100644 platform/linux-generic/include/odp/api/queue.h delete mode 100644 platform/linux-generic/include/odp/api/sync.h 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
hooks/post-receive