[14/29] api: schedule: remove duplication between schedule and schedule_types

Message ID 20171023111057.6328-15-dmitry.ereminsolenikov@linaro.org
State Superseded
Headers show
Series
  • restructure headers for ABI-compat/platform-optimized modes
Related show

Commit Message

Dmitry Eremin-Solenikov Oct. 23, 2017, 11:10 a.m.
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>

---
 include/odp/api/abi-default/schedule.h       |  8 --------
 include/odp/api/abi-default/schedule_types.h |  8 ++++++++
 include/odp/api/spec/schedule.h              | 20 --------------------
 include/odp/api/spec/schedule_types.h        | 10 ++++++++++
 4 files changed, 18 insertions(+), 28 deletions(-)

-- 
2.14.2

Patch

diff --git a/include/odp/api/abi-default/schedule.h b/include/odp/api/abi-default/schedule.h
index 9615cb012653..95f23c8134f4 100644
--- a/include/odp/api/abi-default/schedule.h
+++ b/include/odp/api/abi-default/schedule.h
@@ -27,14 +27,6 @@  extern "C" {
 #define ODP_SCHED_WAIT     UINT64_MAX
 #define ODP_SCHED_NO_WAIT  0
 
-typedef int odp_schedule_group_t;
-
-/* These must be kept in sync with thread_globals_t in odp_thread.c */
-#define ODP_SCHED_GROUP_INVALID ((odp_schedule_group_t)-1)
-#define ODP_SCHED_GROUP_ALL     0
-#define ODP_SCHED_GROUP_WORKER  1
-#define ODP_SCHED_GROUP_CONTROL 2
-
 #define ODP_SCHED_GROUP_NAME_LEN 32
 
 /**
diff --git a/include/odp/api/abi-default/schedule_types.h b/include/odp/api/abi-default/schedule_types.h
index 21ad4db7617b..badc4ca09eb7 100644
--- a/include/odp/api/abi-default/schedule_types.h
+++ b/include/odp/api/abi-default/schedule_types.h
@@ -38,6 +38,14 @@  typedef int odp_schedule_sync_t;
 #define ODP_SCHED_SYNC_ATOMIC   1
 #define ODP_SCHED_SYNC_ORDERED  2
 
+typedef int odp_schedule_group_t;
+
+/* These must be kept in sync with thread_globals_t in odp_thread.c */
+#define ODP_SCHED_GROUP_INVALID ((odp_schedule_group_t)-1)
+#define ODP_SCHED_GROUP_ALL     0
+#define ODP_SCHED_GROUP_WORKER  1
+#define ODP_SCHED_GROUP_CONTROL 2
+
 /**
  * @}
  */
diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h
index 524449647b0c..8c55b4ec2ba5 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 e0dc4027b91b..a13cc4f13317 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