aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Savolainen <petri.savolainen@linaro.org>2018-10-15 10:00:06 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2018-10-16 16:12:31 +0300
commit79f23e85b2c7e8f977efc2d10bb06639f08edbaf (patch)
treeaba4f325fec1e0116851f7218acabf5ca5c652d6
parent602e207726055100b068eff1442c28fba95b8fac (diff)
linux-gen: sched: remove unused schedule interface functions
These functions are not needed after iquery scheduler was removed. Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r--platform/linux-generic/include/odp_schedule_if.h5
-rw-r--r--platform/linux-generic/odp_queue_basic.c10
-rw-r--r--platform/linux-generic/odp_schedule_basic.c5
-rw-r--r--platform/linux-generic/odp_schedule_sp.c5
4 files changed, 3 insertions, 22 deletions
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index 30481773d..13e209f2c 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -47,7 +47,6 @@ typedef uint32_t (*schedule_max_ordered_locks_fn_t)(void);
typedef void (*schedule_save_context_fn_t)(uint32_t queue_index);
typedef struct schedule_fn_t {
- int status_sync;
schedule_pktio_start_fn_t pktio_start;
schedule_thr_add_fn_t thr_add;
schedule_thr_rem_fn_t thr_rem;
@@ -67,10 +66,6 @@ typedef struct schedule_fn_t {
schedule_order_unlock_lock_fn_t order_unlock_lock;
schedule_max_ordered_locks_fn_t max_ordered_locks;
- /* Called only when status_sync is set */
- schedule_unsched_queue_fn_t unsched_queue;
- schedule_save_context_fn_t save_context;
-
} schedule_fn_t;
/* Interface towards the scheduler */
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index 96409b753..ccd97da1e 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -698,7 +698,6 @@ int sched_queue_deq(uint32_t queue_index, odp_event_t ev[], int max_num,
int num_deq, status;
ring_st_t *ring_st;
queue_entry_t *queue = qentry_from_index(queue_index);
- int status_sync = sched_fn->status_sync;
uint32_t buf_idx[max_num];
ring_st = &queue->s.ring_st;
@@ -724,21 +723,14 @@ int sched_queue_deq(uint32_t queue_index, odp_event_t ev[], int max_num,
if (num_deq == 0) {
/* Already empty queue */
- if (update_status && status == QUEUE_STATUS_SCHED) {
+ if (update_status && status == QUEUE_STATUS_SCHED)
queue->s.status = QUEUE_STATUS_NOTSCHED;
- if (odp_unlikely(status_sync))
- sched_fn->unsched_queue(queue->s.index);
- }
-
UNLOCK(queue);
return 0;
}
- if (odp_unlikely(status_sync))
- sched_fn->save_context(queue->s.index);
-
UNLOCK(queue);
buffer_index_to_buf((odp_buffer_hdr_t **)ev, buf_idx, num_deq);
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index f9f456707..a2eea6b1a 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -1469,7 +1469,6 @@ static int schedule_num_grps(void)
/* Fill in scheduler interface */
const schedule_fn_t schedule_basic_fn = {
- .status_sync = 0,
.pktio_start = schedule_pktio_start,
.thr_add = schedule_thr_add,
.thr_rem = schedule_thr_rem,
@@ -1484,9 +1483,7 @@ const schedule_fn_t schedule_basic_fn = {
.term_local = schedule_term_local,
.order_lock = order_lock,
.order_unlock = order_unlock,
- .max_ordered_locks = schedule_max_ordered_locks,
- .unsched_queue = NULL,
- .save_context = NULL
+ .max_ordered_locks = schedule_max_ordered_locks
};
/* Fill in scheduler API calls */
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index 6b9431b69..e63bd0618 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -853,7 +853,6 @@ static void order_unlock(void)
/* Fill in scheduler interface */
const schedule_fn_t schedule_sp_fn = {
- .status_sync = 0,
.pktio_start = pktio_start,
.thr_add = thr_add,
.thr_rem = thr_rem,
@@ -868,9 +867,7 @@ const schedule_fn_t schedule_sp_fn = {
.term_local = term_local,
.order_lock = order_lock,
.order_unlock = order_unlock,
- .max_ordered_locks = max_ordered_locks,
- .unsched_queue = NULL,
- .save_context = NULL
+ .max_ordered_locks = max_ordered_locks
};
/* Fill in scheduler API calls */