From b76fa74df180ade2b858dfffc74f801540ab2a1a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 12 Oct 2017 12:52:59 +0200 Subject: linkers: Update due to API changes Update #3160. --- linkers/rtems-score-coremutex.ini | 12 ---------- linkers/rtems-score-object.ini | 17 +++++++-------- linkers/rtems-score-thread.ini | 46 ++++++++++++++++++--------------------- linkers/rtems-score-threadq.ini | 12 ++++++++++ linkers/rtems-score.ini | 8 +++---- linkers/wscript | 2 +- 6 files changed, 46 insertions(+), 51 deletions(-) delete mode 100644 linkers/rtems-score-coremutex.ini create mode 100644 linkers/rtems-score-threadq.ini (limited to 'linkers') diff --git a/linkers/rtems-score-coremutex.ini b/linkers/rtems-score-coremutex.ini deleted file mode 100644 index 2459d0c..0000000 --- a/linkers/rtems-score-coremutex.ini +++ /dev/null @@ -1,12 +0,0 @@ -; -; RTEMS Supercore Core Mutex Trace Configurations -; -[rtems-score-coremutex-all] -trace = _CORE_mutex_Initialize, _CORE_mutex_Seize_interrupt_blocking -trace = _CORE_mutex_Surrender, _CORE_mutex_Flush - -[rtems-score-coremutex-signatures] -_CORE_mutex_Initialize = CORE_mutex_Status, CORE_mutex_Control*, Thread_Control*, const CORE_mutex_Attributes*, bool -_CORE_mutex_Seize_interrupt_blocking = void, CORE_mutex_Control*, Thread_Control*, Watchdog_Interval -_CORE_mutex_Surrender = CORE_mutex_Status, CORE_mutex_Control*, Objects_Id, CORE_mutex_API_mp_support_callout -_CORE_mutex_Flush = void, CORE_mutex_Control*, Thread_queue_Flush_callout, uint32_t diff --git a/linkers/rtems-score-object.ini b/linkers/rtems-score-object.ini index 34c2fd0..b4a977f 100644 --- a/linkers/rtems-score-object.ini +++ b/linkers/rtems-score-object.ini @@ -2,33 +2,32 @@ ; RTEMS Supercore Objects Trace Configurations ; [rtems-score-object-all] -trace = _Objects_Initialize_information, _Objects_Extend_information +trace = _Objects_Do_initialize_information, _Objects_Extend_information trace = _Objects_Shrink_information, _Objects_Allocate_unprotected -trace = _Objects_Allocate, _Objects_Free, _Objects_Get, _Objects_Get_isr_disable +trace = _Objects_Allocate, _Objects_Free, _Objects_Get trace = _Objects_Get_no_protection, _Objects_Get_next, _Objects_Get_information trace = _Objects_Get_information_id, _Objects_Get_name_as_string, _Objects_Set_name trace = _Objects_Namespace_remove, _Objects_Close, _Objects_Active_count [rtems-score-object-alloc] -trace = _Objects_Initialize_information, _Objects_Allocate_unprotected +trace = _Objects_Do_initialize_information, _Objects_Allocate_unprotected trace = _Objects_Allocate, _Objects_Free, _Objects_Close [rtems-score-object-get] -trace = _Objects_Get, _Objects_Get_isr_disable, _Objects_Get_no_protection +trace = _Objects_Get, _Objects_Get_no_protection trace = _Objects_Get_next, _Objects_Get_information, _Objects_Get_information_id trace = _Objects_Get_name_as_string [rtems-score-object-signatures] -_Objects_Initialize_information = void, Objects_Information*, Objects_APIs, uint16_t, uint32_t, uint16_t, bool, uint32_t +_Objects_Do_initialize_information = void, Objects_Information*, Objects_APIs, uint16_t, uint32_t, uint16_t, bool, uint32_t _Objects_Extend_information = void, Objects_Information* _Objects_Shrink_information = void, Objects_Information* _Objects_Allocate_unprotected = Objects_Control*, Objects_Information* _Objects_Allocate = Objects_Control*, Objects_Information* _Objects_Free = void, Objects_Information*, Objects_Control* -_Objects_Get = Objects_Control*, Objects_Information*, Objects_Id, Objects_Locations* -_Objects_Get_isr_disable = Objects_Control*, Objects_Information*, Objects_Id, Objects_Locations*, ISR_Level* -_Objects_Get_no_protection = Objects_Control*, Objects_Information*, Objects_Id, Objects_Locations* -_Objects_Get_next = Objects_Control*, Objects_Information*, Objects_Id, Objects_Locations*, Objects_Id* +_Objects_Get = Objects_Control*, Objects_Id, ISR_lock_Context *, const Objects_Information* +_Objects_Get_no_protection = Objects_Control*, Objects_Id, const Objects_Information* +_Objects_Get_next = Objects_Control*, Objects_Id, const Objects_Information*, Objects_Id* _Objects_Get_information = Objects_Information*, Objects_APIs, uint16_t _Objects_Get_information_id = Objects_Information*, Objects_Id _Objects_Get_name_as_string = char*, Objects_Id, size_t, char* diff --git a/linkers/rtems-score-thread.ini b/linkers/rtems-score-thread.ini index f1cbfe6..313831a 100644 --- a/linkers/rtems-score-thread.ini +++ b/linkers/rtems-score-thread.ini @@ -4,11 +4,11 @@ [rtems-score-thread-all] trace = _Thread_Handler_initialization, _Thread_Create_idle, _Thread_Start_multitasking trace = _Thread_Stack_Allocate, _Thread_Stack_Free, _Thread_Initialize, _Thread_Start -trace = _Thread_Restart, _Thread_Yield, _Thread_Set_life_protection +trace = _Thread_Restart_other, _Thread_Restart_self, _Thread_Yield, _Thread_Set_life_protection trace = _Thread_Life_action_handler, _Thread_Kill_zombies, _Thread_Close -trace = _Thread_Ready, _Thread_Clear_state, _Thread_Set_state, _Thread_Load_environment -trace = _Thread_Handler, _Thread_Delay_ended, _Thread_Change_priority, _Thread_Set_priority -trace = _Thread_Get, _Thread_blocking_operation_Cancel, _Thread_blocking_operation_Finalize +trace = _Thread_Clear_state, _Thread_Set_state, _Thread_Load_environment +trace = _Thread_Handler +trace = _Thread_Get [rtems-score-thread-create-destory] traces = rtems-score-thread-create, rtems-score-thread-destroy @@ -16,17 +16,17 @@ traces = rtems-score-thread-create, rtems-score-thread-destroy [rtems-score-thread-create] trace = _Thread_Handler_initialization, _Thread_Create_idle trace = _Thread_Stack_Allocate, _Thread_Initialize, _Thread_Start -trace = _Thread_Restart, _Thread_Handler +trace = _Thread_Restart_other, _Thread_Restart_self, _Thread_Handler [rtems-score-thread-destroy] trace = _Thread_Kill_zombies, _Thread_Close -trace = , _Thread_blocking_operation_Cancel, _Thread_blocking_operation_Finalize [rtems-score-thread-activity] -trace = _Thread_Restart, _Thread_Yield, _Thread_Set_life_protection -trace = _Thread_Life_action_handler, _Thread_Ready, _Thread_Clear_state, -trace = _Thread_Set_state, _Thread_Load_environment, _Thread_Delay_ended -trace = _Thread_Change_priority, _Thread_Set_priority, _Thread_Get +trace = _Thread_Restart_other, _Thread_Restart_self, _Thread_Yield, _Thread_Set_life_protection +trace = _Thread_Life_action_handler, _Thread_Clear_state, +trace = _Thread_Set_state, _Thread_Load_environment +trace = _Thread_Get +trace = _Thread_Priority_update [rtems-score-thread-signatures] _Thread_Handler_initialization = void, void @@ -34,23 +34,19 @@ _Thread_Create_idle = void, void _Thread_Start_multitasking = void, void _Thread_Stack_Allocate = size_t, Thread_Control*, size_t _Thread_Stack_Free = void, Thread_Control* -_Thread_Initialize = bool, Objects_Information *, Thread_Control*, const struct Scheduler_Control*, void*, size_t, bool, Priority_Control, bool, Thread_CPU_budget_algorithms, Thread_CPU_budget_algorithm_callout, uint32_t, Objects_Name -_Thread_Start = bool, Thread_Control*, Thread_Start_types, void*, void*, Thread_Entry_numeric_type, Per_CPU_Control* -_Thread_Restart = bool, Thread_Control*, Thread_Control*, void*, Thread_Entry_numeric_type +_Thread_Initialize = bool, Thread_Information *, Thread_Control*, const Scheduler_Control*, void*, size_t, bool, Priority_Control, bool, Thread_CPU_budget_algorithms, Thread_CPU_budget_algorithm_callout, uint32_t, Objects_Name +_Thread_Start = bool, Thread_Control*, const Thread_Entry_information*, ISR_lock_Context* +_Thread_Restart_other = bool, Thread_Control*, const Thread_Entry_information*, ISR_lock_Context* +_Thread_Restart_self = void, Thread_Control*, const Thread_Entry_information*, ISR_lock_Context* _Thread_Yield = void, Thread_Control* -_Thread_Set_life_protection = bool, bool -_Thread_Life_action_handler = void, Thread_Control*, Thread_Action*, Per_CPU_Control*, ISR_Level +_Thread_Set_life_protection = Thread_Life_state, Thread_Life_state +_Thread_Life_action_handler = void, Thread_Control*, Thread_Action*, ISR_lock_Context* _Thread_Kill_zombies = void, void -_Thread_Close = void, Thread_Control*, Thread_Control* -_Thread_Ready = void, Thread_Control* -_Thread_Clear_state = void, Thread_Control*, States_Control -_Thread_Set_state = void, Thread_Control*, States_Control +_Thread_Close = void, Thread_Control*, Thread_Control*, Thread_Close_context* +_Thread_Clear_state = States_Control, Thread_Control*, States_Control +_Thread_Set_state = States_Control, Thread_Control*, States_Control _Thread_Load_environment = void, Thread_Control* _Thread_Handler = void, void -_Thread_Delay_ended = void, Objects_Id, void* -_Thread_Change_priority = void, Thread_Control*, Priority_Control, bool -_Thread_Set_priority = void, Thread_Control*, Priority_Control -_Thread_Get = Thread_Control*, Objects_Id, Objects_Locations* -_Thread_blocking_operation_Cancel = void, Thread_blocking_operation_States, Thread_Control*, ISR_Level -_Thread_blocking_operation_Finalize = void, Thread_Control*, ISR_Level +_Thread_Get = Thread_Control*, Objects_Id, ISR_lock_Context* +_Thread_Priority_update = Thread_Control*, Thread_queue_Context* diff --git a/linkers/rtems-score-threadq.ini b/linkers/rtems-score-threadq.ini new file mode 100644 index 0000000..23b09bf --- /dev/null +++ b/linkers/rtems-score-threadq.ini @@ -0,0 +1,12 @@ +; +; RTEMS Supercore Thread Queue Trace Configurations +; +[rtems-score-threadq-all] +trace = _Thread_queue_Enqueue +trace = _Thread_queue_Extract_locked +trace = _Thread_queue_Unblock_critical + +[rtems-score-threadq-signatures] +_Thread_queue_Enqueue = void, Thread_queue_Queue*, const Thread_queue_Operations*, Thread_Control*, Thread_queue_Context* +_Thread_queue_Extract_locked = bool, Thread_queue_Queue*, const Thread_queue_Operations*, Thread_Control*, Thread_queue_Context* +_Thread_queue_Unblock_critical = void, bool, Thread_queue_Queue*, Thread_Control*, ISR_lock_Context* diff --git a/linkers/rtems-score.ini b/linkers/rtems-score.ini index edea712..80f7e4d 100644 --- a/linkers/rtems-score.ini +++ b/linkers/rtems-score.ini @@ -10,19 +10,19 @@ signatures = rtems-score-object-signatures ; Thread include = rtems-score-thread.ini signatures = rtems-score-thread-signatures +; Thread Queue +include = rtems-score-threadq.ini +signatures = rtems-score-threadq-signatures ; Heap include = rtems-score-heap.ini signatures = rtems-score-heap-signatures -; Core Mutex -include = rtems-score-coremutex.ini -signatures = rtems-score-coremutex-signatures [rtems-score-headers] header = "#include " header = "#include " header = "#include " header = "#include " -header = "#include " +header = "#include " header = "#include " [rtems-score-defines] diff --git a/linkers/wscript b/linkers/wscript index 6e696aa..46c8532 100644 --- a/linkers/wscript +++ b/linkers/wscript @@ -122,8 +122,8 @@ def build(bld): 'rtems-score.ini', 'rtems-score-object.ini', 'rtems-score-thread.ini', + 'rtems-score-threadq.ini', 'rtems-score-heap.ini', - 'rtems-score-coremutex.ini', 'rtld-base.ini', 'rtld-trace-buffer.ini', 'rtld-print.ini']) -- cgit v1.2.3