aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorMatias Elo <matias.elo@nokia.com>2019-01-07 15:54:30 +0200
committerMatias Elo <matias.elo@nokia.com>2019-01-07 15:54:30 +0200
commit5da10be46bbe23a41f638aae554ca4278a9129fc (patch)
tree0cca0ddac750ff2246d2fadf4055d6c4bf8656d8 /platform
parent8b769677cfe9c307db0880ffea6ba4fa0879ab03 (diff)
Port 930b00426 "linux-gen: queue, schedule: move scheduler capabilities to scheduler"
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'platform')
-rw-r--r--platform/linux-dpdk/odp_queue_basic.c4
-rw-r--r--platform/linux-dpdk/odp_schedule_if.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/platform/linux-dpdk/odp_queue_basic.c b/platform/linux-dpdk/odp_queue_basic.c
index 7a453417e..0afca7eed 100644
--- a/platform/linux-dpdk/odp_queue_basic.c
+++ b/platform/linux-dpdk/odp_queue_basic.c
@@ -47,7 +47,7 @@ static int queue_init(queue_entry_t *queue, const char *name,
queue_global_t *queue_glb;
extern _odp_queue_inline_offset_t _odp_queue_inline_offset;
-static int queue_capa(odp_queue_capability_t *capa, int sched)
+static int queue_capa(odp_queue_capability_t *capa, int sched ODP_UNUSED)
{
memset(capa, 0, sizeof(odp_queue_capability_t));
@@ -60,11 +60,13 @@ static int queue_capa(odp_queue_capability_t *capa, int sched)
capa->sched.max_num = capa->max_queues;
capa->sched.max_size = queue_glb->config.max_queue_size;
+#if ODP_DEPRECATED_API
if (sched) {
capa->max_ordered_locks = sched_fn->max_ordered_locks();
capa->max_sched_groups = sched_fn->num_grps();
capa->sched_prios = odp_schedule_num_prio();
}
+#endif
return 0;
}
diff --git a/platform/linux-dpdk/odp_schedule_if.c b/platform/linux-dpdk/odp_schedule_if.c
index 3b6d13ba5..5bd5d943e 100644
--- a/platform/linux-dpdk/odp_schedule_if.c
+++ b/platform/linux-dpdk/odp_schedule_if.c
@@ -27,6 +27,11 @@ uint64_t odp_schedule_wait_time(uint64_t ns)
return sched_api->schedule_wait_time(ns);
}
+int odp_schedule_capability(odp_schedule_capability_t *capa)
+{
+ return sched_api->schedule_capability(capa);
+}
+
odp_event_t odp_schedule(odp_queue_t *from, uint64_t wait)
{
return sched_api->schedule(from, wait);