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 bb3400df72401d88aa8e79fb0244a2b90f3bd138 (commit) via 2bbf95311cb8136b7e769deda6254a9e9b26250b (commit) via 4ce95649367da9edd140ba9c25daaaf292edf883 (commit) via 03aa7c3572865dc03df1cf8c33b969ca4b17c7e8 (commit) via dca4f5bd8218f30a593f6fb37c060de41d1ca9b1 (commit) via 5a6d8798bc436fa3a7e90fcf105362eabb21db0c (commit) via cd15a2125781f4eefdab1f765999a59504fb2939 (commit) via 757439849936bb76885f27677fc8997a67fa2a3c (commit) via 92ad20c03bf4737558265a1ff942666d7c4ec3d8 (commit) via fd2ca1209dc19c8e8199ee556ad2c9a786eabf78 (commit) from e76b25aa5cafbf96133fcbd83b856090b0e95f33 (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 bb3400df72401d88aa8e79fb0244a2b90f3bd138 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:37:49 2017 +0300
linux-gen: sched iquery: mark thread_local as static
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/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index ee2be031..c38c7c01 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -226,7 +226,7 @@ struct sched_thread_local { static sched_global_t *sched;
/* Thread local scheduler context */ -__thread sched_thread_local_t thread_local; +static __thread sched_thread_local_t thread_local;
static int schedule_init_global(void) {
commit 2bbf95311cb8136b7e769deda6254a9e9b26250b Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:37:49 2017 +0300
linux-gen: sched: mark sched_local as static
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/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 4c99f602..79b21ac7 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -264,7 +264,7 @@ typedef struct { static sched_global_t *sched;
/* Thread local scheduler context */ -__thread sched_local_t sched_local; +static __thread sched_local_t sched_local;
/* Function prototypes */ static inline void schedule_release_context(void);
commit 4ce95649367da9edd140ba9c25daaaf292edf883 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:29:34 2017 +0300
linux-gen: queue: drop two unused functions
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_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index c5ff1e7d..dd846d59 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -61,9 +61,6 @@ union queue_entry_u { uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))]; };
-void queue_lock(queue_entry_t *queue); -void queue_unlock(queue_entry_t *queue); - static inline uint32_t queue_to_id(odp_queue_t handle) { return _odp_typeval(handle) - 1; diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index e2f8c067..7ad346ad 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -593,16 +593,6 @@ static int queue_init(queue_entry_t *queue, const char *name, return 0; }
-void queue_lock(queue_entry_t *queue) -{ - LOCK(&queue->s.lock); -} - -void queue_unlock(queue_entry_t *queue) -{ - UNLOCK(&queue->s.lock); -} - static void queue_param_init(odp_queue_param_t *params) { memset(params, 0, sizeof(odp_queue_param_t));
commit 03aa7c3572865dc03df1cf8c33b969ca4b17c7e8 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:26:28 2017 +0300
linux-gen: pktio: mark pktio_tbl as static
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/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 7958786d..9419adf6 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -36,7 +36,7 @@ * Must be power of two. */ #define SLEEP_CHECK 32
-pktio_table_t *pktio_tbl; +static pktio_table_t *pktio_tbl;
/* pktio pointer entries ( for inlines) */ void *pktio_entry_ptr[ODP_CONFIG_PKTIO_ENTRIES];
commit dca4f5bd8218f30a593f6fb37c060de41d1ca9b1 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:25:41 2017 +0300
linux-gen: pktio: drop/staticize leftovers from single queue shim
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_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 20a86557..1a4e345f 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -252,19 +252,6 @@ static inline void pktio_cls_enabled_set(pktio_entry_t *entry, int ena) entry->s.cls_enabled = ena; }
-/* - * Dummy single queue implementations of multi-queue API - */ -int single_capability(odp_pktio_capability_t *capa); -int single_input_queues_config(pktio_entry_t *entry, - const odp_pktin_queue_param_t *param); -int single_output_queues_config(pktio_entry_t *entry, - const odp_pktout_queue_param_t *param); -int single_recv_queue(pktio_entry_t *entry, int index, odp_packet_t packets[], - int num); -int single_send_queue(pktio_entry_t *entry, int index, - const odp_packet_t packets[], int num); - extern const pktio_if_ops_t netmap_pktio_ops; extern const pktio_if_ops_t dpdk_pktio_ops; extern const pktio_if_ops_t sock_mmsg_pktio_ops; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index f78f70ae..7958786d 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1070,6 +1070,17 @@ int odp_pktio_term_global(void) return ret; }
+static +int single_capability(odp_pktio_capability_t *capa) +{ + memset(capa, 0, sizeof(odp_pktio_capability_t)); + capa->max_input_queues = 1; + capa->max_output_queues = 1; + capa->set_op.op.promisc_mode = 1; + + return 0; +} + int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa) { pktio_entry_t *entry; @@ -1675,13 +1686,3 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[],
return entry->s.ops->send(entry, queue.index, packets, num); } - -int single_capability(odp_pktio_capability_t *capa) -{ - memset(capa, 0, sizeof(odp_pktio_capability_t)); - capa->max_input_queues = 1; - capa->max_output_queues = 1; - capa->set_op.op.promisc_mode = 1; - - return 0; -}
commit 5a6d8798bc436fa3a7e90fcf105362eabb21db0c Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:25:05 2017 +0300
linux-gen: scheduler: drop unused callback
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_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 4cd8c3e5..e842fb46 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -67,7 +67,6 @@ extern const schedule_fn_t *sched_fn; /* Interface for the scheduler */ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]); void sched_cb_pktio_stop_finalize(int pktio_index); -int sched_cb_num_pktio(void); odp_queue_t sched_cb_queue_handle(uint32_t queue_index); void sched_cb_queue_destroy_finalize(uint32_t queue_index); int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], int num); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index b4523389..f78f70ae 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -727,11 +727,6 @@ void sched_cb_pktio_stop_finalize(int pktio_index) unlock_entry(entry); }
-int sched_cb_num_pktio(void) -{ - return ODP_CONFIG_PKTIO_ENTRIES; -} - uint32_t odp_pktio_mtu(odp_pktio_t hdl) { pktio_entry_t *entry;
commit cd15a2125781f4eefdab1f765999a59504fb2939 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:23:39 2017 +0300
linux-gen: classification: mark several functions as static
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_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h index 78eaac90..369636d5 100644 --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@ -30,16 +30,6 @@ extern "C" {
/** @internal -match_qos_cos - -Select a CoS for the given Packet based on QoS values -This function returns the COS object matching the L2 and L3 QoS -based on the l3_preference value of the pktio -**/ -cos_t *match_qos_cos(pktio_entry_t *entry, const uint8_t *pkt_addr, - odp_packet_hdr_t *hdr); -/** -@internal
Packet Classifier
@@ -61,34 +51,6 @@ int pktio_classifier_init(pktio_entry_t *pktio);
/** @internal -match_pmr_cos - -Match a PMR chain with a Packet and return matching CoS -This function gets called recursively to check the chained PMR Term value -with the packet. - -**/ -cos_t *match_pmr_cos(cos_t *cos, const uint8_t *pkt_addr, pmr_t *pmr, - odp_packet_hdr_t *hdr); -/** -@internal -CoS associated with L3 QoS value - -This function returns the CoS associated with L3 QoS value -**/ -cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, - odp_packet_hdr_t *hdr); - -/** -@internal -CoS associated with L2 QoS value - -This function returns the CoS associated with L2 QoS value -**/ -cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, - odp_packet_hdr_t *hdr); -/** -@internal Flow Signature Calculation
This function calculates the Flow Signature for a packet based on @@ -96,48 +58,6 @@ CoS and updates in Packet Meta Data **/ int update_flow_signature(uint8_t *pkt_addr, cos_t *cos);
-/** -@internal -Allocate a odp_pmr_t Handle -*/ -odp_pmr_t alloc_pmr(pmr_t **pmr); - -/** -@internal -Pointer to pmr_t Handle -This function checks for validity of odp_pmr_t Handle -*/ -pmr_t *get_pmr_entry(odp_pmr_t pmr_id); - -/** -@internal -Pointer to pmr_t Handle -*/ -pmr_t *get_pmr_entry_internal(odp_pmr_t pmr_id); - -/** -@internal -Pointer to odp_cos_t Handle -*/ -cos_t *get_cos_entry(odp_cos_t cos_id); - -/** -@internal -Pointer to odp_cos_t Handle -This function checks for validity of odp_cos_t Handle -*/ -cos_t *get_cos_entry_internal(odp_cos_t cos_id); - -/** -@internal -Verify PMR with a Packet - -This function goes through each PMR_TERM value in pmr_t structure and -calls verification function for each term.Returns 1 if PMR matches or 0 -Otherwise. -**/ -int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr); - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 08b09078..5e9173dc 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -31,11 +31,13 @@ static cos_tbl_t *cos_tbl; static pmr_tbl_t *pmr_tbl;
+static cos_t *get_cos_entry_internal(odp_cos_t cos_id) { return &cos_tbl->cos_entry[_odp_typeval(cos_id)]; }
+static pmr_t *get_pmr_entry_internal(odp_pmr_t pmr_id) { return &pmr_tbl->pmr[_odp_typeval(pmr_id)]; @@ -200,6 +202,10 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) return ODP_COS_INVALID; }
+/* + * Allocate an odp_pmr_t Handle + */ +static odp_pmr_t alloc_pmr(pmr_t **pmr) { int i; @@ -220,6 +226,7 @@ odp_pmr_t alloc_pmr(pmr_t **pmr) return ODP_PMR_INVAL; }
+static cos_t *get_cos_entry(odp_cos_t cos_id) { if (_odp_typeval(cos_id) >= ODP_COS_MAX_ENTRY || @@ -230,6 +237,7 @@ cos_t *get_cos_entry(odp_cos_t cos_id) return &cos_tbl->cos_entry[_odp_typeval(cos_id)]; }
+static pmr_t *get_pmr_entry(odp_pmr_t pmr_id) { if (_odp_typeval(pmr_id) >= ODP_PMR_MAX_ENTRY || @@ -599,6 +607,11 @@ odp_pool_t odp_cls_cos_pool(odp_cos_t cos_id) return cos->s.pool; }
+/* + * This function goes through each PMR_TERM value in pmr_t structure and calls + * verification function for each term.Returns 1 if PMR matches or 0 otherwise. + */ +static int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr) { int pmr_failure = 0; @@ -717,6 +730,12 @@ int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr) return true; }
+/* + * Match a PMR chain with a Packet and return matching CoS + * This function gets called recursively to check the chained PMR Term value + * with the packet. + */ +static cos_t *match_pmr_cos(cos_t *cos, const uint8_t *pkt_addr, pmr_t *pmr, odp_packet_hdr_t *hdr) { @@ -763,6 +782,10 @@ int pktio_classifier_init(pktio_entry_t *entry) return 0; }
+static +cos_t *match_qos_cos(pktio_entry_t *entry, const uint8_t *pkt_addr, + odp_packet_hdr_t *hdr); + /** Select a CoS for the given Packet based on pktio
@@ -848,6 +871,7 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, return 0; }
+static cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) { @@ -869,6 +893,7 @@ cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr, return cos; }
+static cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) { @@ -888,6 +913,12 @@ cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, return cos; }
+/* + * Select a CoS for the given Packet based on QoS values + * This function returns the COS object matching the L2 and L3 QoS + * based on the l3_preference value of the pktio +*/ +static cos_t *match_qos_cos(pktio_entry_t *entry, const uint8_t *pkt_addr, odp_packet_hdr_t *hdr) {
commit 757439849936bb76885f27677fc8997a67fa2a3c Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:23:13 2017 +0300
linux-gen: fdserver: mark client_lock as static
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/_fdserver.c b/platform/linux-generic/_fdserver.c index 4f74c614..d1b16f62 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -69,7 +69,7 @@ #endif
/* when accessing the client functions, clients should be mutexed: */ -odp_spinlock_t *client_lock; +static odp_spinlock_t *client_lock;
/* define the tables of file descriptors handled by this server: */ #define FDSERVER_MAX_ENTRIES 256
commit 92ad20c03bf4737558265a1ff942666d7c4ec3d8 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:22:44 2017 +0300
linux-gen: pool: drop two unused functions
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_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 20127004..a580c82d 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -107,10 +107,6 @@ ODP_STATIC_ASSERT(CONFIG_PACKET_MAX_SEGS < 256,
ODP_STATIC_ASSERT(BUFFER_BURST_SIZE < 256, "BUFFER_BURST_SIZE_TOO_LARGE");
-/* Forward declarations */ -int seg_alloc_tail(odp_buffer_hdr_t *buf_hdr, int segcount); -void seg_free_tail(odp_buffer_hdr_t *buf_hdr, int segcount); - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index f2410b6e..c739adbc 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -890,19 +890,6 @@ uint64_t odp_pool_to_u64(odp_pool_t hdl) return _odp_pri(hdl); }
-int seg_alloc_tail(odp_buffer_hdr_t *buf_hdr, int segcount) -{ - (void)buf_hdr; - (void)segcount; - return 0; -} - -void seg_free_tail(odp_buffer_hdr_t *buf_hdr, int segcount) -{ - (void)buf_hdr; - (void)segcount; -} - int odp_buffer_is_valid(odp_buffer_t buf) { pool_t *pool;
commit fd2ca1209dc19c8e8199ee556ad2c9a786eabf78 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:21:31 2017 +0300
linux-gen: hide get_qentry
Replace two last index->qentry lookups with pointers to quentry, thus making it possible to make get_qentry static in odp_queue.c
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_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 032dde88..c5ff1e7d 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -61,8 +61,6 @@ union queue_entry_u { uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))]; };
-queue_entry_t *get_qentry(uint32_t queue_id); - void queue_lock(queue_entry_t *queue); void queue_unlock(queue_entry_t *queue);
diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 904c9ef2..e2f8c067 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -43,6 +43,9 @@ typedef struct queue_table_t {
static queue_table_t *queue_tbl;
+static +queue_entry_t *get_qentry(uint32_t queue_id); + static inline queue_entry_t *handle_to_qentry(odp_queue_t handle) { uint32_t queue_id; @@ -56,6 +59,7 @@ static inline odp_queue_t queue_from_id(uint32_t queue_id) return _odp_cast_scalar(odp_queue_t, queue_id + 1); }
+static queue_entry_t *get_qentry(uint32_t queue_id) { return &queue_tbl->queue[queue_id]; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index bbcc85a5..4c99f602 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -130,7 +130,7 @@ ODP_STATIC_ASSERT((8 * sizeof(pri_mask_t)) >= QUEUES_PER_PRIO, /* Storage for stashed enqueue operation arguments */ typedef struct { odp_buffer_hdr_t *buf_hdr[QUEUE_MULTI_MAX]; - uint32_t queue_index; + queue_entry_t *queue_entry; int num; } ordered_stash_t;
@@ -682,12 +682,10 @@ static inline void ordered_stash_release(void)
for (i = 0; i < sched_local.ordered.stash_num; i++) { queue_entry_t *queue_entry; - uint32_t queue_index; odp_buffer_hdr_t **buf_hdr; int num;
- queue_index = sched_local.ordered.stash[i].queue_index; - queue_entry = get_qentry(queue_index); + queue_entry = sched_local.ordered.stash[i].queue_entry; buf_hdr = sched_local.ordered.stash[i].buf_hdr; num = sched_local.ordered.stash[i].num;
@@ -788,7 +786,7 @@ static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[], return 0; }
- sched_local.ordered.stash[stash_num].queue_index = dst_queue->s.index; + sched_local.ordered.stash[stash_num].queue_entry = dst_queue; sched_local.ordered.stash[stash_num].num = num; for (i = 0; i < num; i++) sched_local.ordered.stash[stash_num].buf_hdr[i] = buf_hdr[i]; diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index d374dedd..ee2be031 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -170,7 +170,7 @@ typedef struct { /* Storage for stashed enqueue operation arguments */ typedef struct { odp_buffer_hdr_t *buf_hdr[QUEUE_MULTI_MAX]; - uint32_t queue_index; + queue_entry_t *queue_entry; int num; } ordered_stash_t;
@@ -1127,12 +1127,10 @@ static inline void ordered_stash_release(void)
for (i = 0; i < thread_local.ordered.stash_num; i++) { queue_entry_t *queue_entry; - uint32_t queue_index; odp_buffer_hdr_t **buf_hdr; int num;
- queue_index = thread_local.ordered.stash[i].queue_index; - queue_entry = get_qentry(queue_index); + queue_entry = thread_local.ordered.stash[i].queue_entry; buf_hdr = thread_local.ordered.stash[i].buf_hdr; num = thread_local.ordered.stash[i].num;
@@ -1219,7 +1217,7 @@ static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[], return 0; }
- thread_local.ordered.stash[stash_num].queue_index = dst_queue->s.index; + thread_local.ordered.stash[stash_num].queue_entry = dst_queue; thread_local.ordered.stash[stash_num].num = num; for (i = 0; i < num; i++) thread_local.ordered.stash[stash_num].buf_hdr[i] = buf_hdr[i];
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/_fdserver.c | 2 +- .../linux-generic/include/odp_buffer_internal.h | 4 -- .../include/odp_classification_internal.h | 80 ---------------------- .../linux-generic/include/odp_packet_io_internal.h | 13 ---- .../linux-generic/include/odp_queue_internal.h | 5 -- platform/linux-generic/include/odp_schedule_if.h | 1 - platform/linux-generic/odp_classification.c | 31 +++++++++ platform/linux-generic/odp_packet_io.c | 28 ++++---- platform/linux-generic/odp_pool.c | 13 ---- platform/linux-generic/odp_queue.c | 14 ++-- platform/linux-generic/odp_schedule.c | 10 ++- platform/linux-generic/odp_schedule_iquery.c | 10 ++- 12 files changed, 56 insertions(+), 155 deletions(-)
hooks/post-receive
-
git＠git-us.linaro.org