Skip to content

Commit

Permalink
7.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@quantum-leaps
quantum-leaps committed Sep 22, 2022
1 parent 60f6f73 commit 5145067
Show file tree
Hide file tree
Showing 166 changed files with 532 additions and 596 deletions.
3 changes: 2 additions & 1 deletion doxygen/history.dox
View file
Expand Up @@ -7,7 +7,7 @@ This release improves @ref srs_qs "software tracing" of the scheduler activity i
The QP framework "knows" the type of preemption (synchronous/asynchronous) and this information is now provided in the software trace to the user.


Additionally, the default for #QF_TIMEEVT_CTR_SIZE has been increased from 2 to 4 bytes. This increases the dynamic range for QTimeEvt counters to 32-bits.
Additionally, the default for #QF_TIMEEVT_CTR_SIZE has been increased from 2 to 4 bytes. This increases the default dynamic range for QTimeEvt counters to 32-bits.

__Source__
- Added new pre-defined QS trace records:
Expand All @@ -20,6 +20,7 @@ __Source__
- Added parameter `asynch` to QXK_sched_(). This parameter is used to indicate the type of preemption and is set to 1 for asynchronous preemption and 0 for synchronous. This parameter is used in the #Q_SPY configuration only.
- changed all calls to QXK_sched_() and QXK_activate_() to add the `asynch` parameter, whereas all cases of synchronous preemption call QXK_sched_(0U)/XK_activate_(0U), while cases for asynchronous preemption call QXK_sched_(1U)/XK_activate_(1U);
- increased default for #QF_TIMEEVT_CTR_SIZE 4
- changed inclusion guards in the QP/C header files (e.g. `QF_H` -> `QP_INC_QF_H_`) for compliance with the updated Quantum Leaps coding standard and to make the names more unique.

__Ports__
- All QK ports have been updated to set the `asynch` parameter for calling QK_activate_()
Expand Down
141 changes: 71 additions & 70 deletions doxygen/metrics.dox
View file
Expand Up @@ -8,15 +8,15 @@
3 1 15 1 3 QEQueue_getNFree@306-308@..\include\qequeue.h
3 1 15 1 3 QEQueue_getNMin@323-325@..\include\qequeue.h
3 1 21 1 3 QEQueue_isEmpty@342-344@..\include\qequeue.h
5 2 33 1 8 QPSet_setEmpty@240-247@..\include\qf.h
4 3 44 1 7 QPSet_isEmpty@250-256@..\include\qf.h
4 3 44 1 7 QPSet_notEmpty@259-265@..\include\qf.h
8 3 95 2 11 QPSet_hasElement@268-278@..\include\qf.h
11 3 105 2 14 QPSet_insert@281-294@..\include\qf.h
12 3 117 2 15 QPSet_remove@297-311@..\include\qf.h
6 3 56 1 9 QPSet_findMax@314-322@..\include\qf.h
3 1 27 1 3 QActive_getPrio@777-779@..\include\qf.h
6 1 20 2 6 QF_psInit@1401-1406@..\include\qf.h
5 2 33 1 8 QPSet_setEmpty@244-251@..\include\qf.h
4 3 44 1 7 QPSet_isEmpty@254-260@..\include\qf.h
4 3 44 1 7 QPSet_notEmpty@263-269@..\include\qf.h
8 3 95 2 11 QPSet_hasElement@272-282@..\include\qf.h
11 3 105 2 14 QPSet_insert@285-298@..\include\qf.h
12 3 117 2 15 QPSet_remove@301-315@..\include\qf.h
6 3 56 1 9 QPSet_findMax@318-326@..\include\qf.h
3 1 27 1 3 QActive_getPrio@781-783@..\include\qf.h
6 1 20 2 6 QF_psInit@1405-1410@..\include\qf.h
14 3 67 1 14 QS_rxPut@823-836@..\include\qs.h
5 1 20 1 20 Q_DEFINE_THIS_MODULE@54-73@..\src\qf\qep_hsm.c
18 3 99 2 24 QHsm_isIn@128-151@..\src\qf\qep_hsm.c
Expand All @@ -38,38 +38,38 @@
55 9 316 3 68 QMsm_execTatbl_@376-443@..\src\qf\qep_msm.c
24 4 130 4 32 QMsm_exitToTranSource_@446-477@..\src\qf\qep_msm.c
45 6 243 3 54 QMsm_enterHistory_@480-533@..\src\qf\qep_msm.c
82 13 431 4 118 QActive_post_@70-187@..\src\qf\qf_actq.c
44 7 266 2 66 QActive_postLIFO_@192-257@..\src\qf\qf_actq.c
34 3 233 1 44 QActive_get_@262-305@..\src\qf\qf_actq.c
10 2 60 1 11 QF_getQueueMin@311-321@..\src\qf\qf_actq.c
16 2 79 2 20 QTicker_ctor@340-359@..\src\qf\qf_actq.c
10 1 45 3 11 QTicker_init_@362-372@..\src\qf\qf_actq.c
17 2 92 3 20 QTicker_dispatch_@375-394@..\src\qf\qf_actq.c
30 2 156 4 37 QTicker_post_@397-433@..\src\qf\qf_actq.c
8 1 30 2 9 QTicker_postLIFO_@436-444@..\src\qf\qf_actq.c
82 14 431 4 120 QActive_post_@70-189@..\src\qf\qf_actq.c
44 7 266 2 66 QActive_postLIFO_@194-259@..\src\qf\qf_actq.c
34 3 233 1 44 QActive_get_@264-307@..\src\qf\qf_actq.c
10 2 60 1 11 QF_getQueueMin@313-323@..\src\qf\qf_actq.c
16 2 79 2 20 QTicker_ctor@342-361@..\src\qf\qf_actq.c
10 1 45 3 11 QTicker_init_@364-374@..\src\qf\qf_actq.c
17 2 92 3 20 QTicker_dispatch_@377-396@..\src\qf\qf_actq.c
30 2 156 4 37 QTicker_post_@399-435@..\src\qf\qf_actq.c
8 1 30 2 9 QTicker_postLIFO_@438-446@..\src\qf\qf_actq.c
15 1 84 3 17 QActive_defer@65-81@..\src\qf\qf_defer.c
34 3 169 2 54 QActive_recall@86-139@..\src\qf\qf_defer.c
13 2 68 2 13 QActive_flushDeferred@144-156@..\src\qf\qf_defer.c
17 3 116 3 26 QF_poolInit@72-97@..\src\qf\qf_dyn.c
3 1 17 1 3 QF_poolGetMaxBlockSize@100-102@..\src\qf\qf_dyn.c
9 3 59 1 12 QF_getPoolMin@105-116@..\src\qf\qf_dyn.c
39 7 234 3 57 QF_newX_@119-175@..\src\qf\qf_dyn.c
30 4 192 1 46 QF_gc@178-223@..\src\qf\qf_dyn.c
20 2 99 2 28 QF_newRef_@226-253@..\src\qf\qf_dyn.c
11 1 67 1 13 QF_deleteRef_@256-268@..\src\qf\qf_dyn.c
13 3 68 2 15 QActive_flushDeferred@144-158@..\src\qf\qf_defer.c
17 3 116 3 26 QF_poolInit@86-111@..\src\qf\qf_dyn.c
3 1 17 1 3 QF_poolGetMaxBlockSize@114-116@..\src\qf\qf_dyn.c
9 3 59 1 12 QF_getPoolMin@119-130@..\src\qf\qf_dyn.c
39 7 234 3 57 QF_newX_@133-189@..\src\qf\qf_dyn.c
30 4 192 1 46 QF_gc@192-237@..\src\qf\qf_dyn.c
20 2 99 2 28 QF_newRef_@240-267@..\src\qf\qf_dyn.c
11 2 67 1 15 QF_deleteRef_@270-284@..\src\qf\qf_dyn.c
32 5 233 4 50 QMPool_init@67-116@..\src\qf\qf_mem.c
44 4 238 3 67 QMPool_get@119-185@..\src\qf\qf_mem.c
19 2 114 3 26 QMPool_put@188-213@..\src\qf\qf_mem.c
8 1 35 2 13 QActive_psInit@73-85@..\src\qf\qf_ps.c
43 5 232 3 70 QActive_publish_@90-159@..\src\qf\qf_ps.c
18 5 111 2 24 QActive_subscribe@164-187@..\src\qf\qf_ps.c
18 5 111 2 27 QActive_unsubscribe@192-218@..\src\qf\qf_ps.c
19 5 130 1 24 QActive_unsubscribeAll@223-246@..\src\qf\qf_ps.c
10 2 46 2 10 QF_bzero@84-93@..\src\qf\qf_qact.c
16 2 72 2 23 QActive_ctor@100-122@..\src\qf\qf_qact.c
29 9 211 1 44 QActive_register_@127-170@..\src\qf\qf_qact.c
10 3 79 1 15 QActive_unregister_@175-189@..\src\qf\qf_qact.c
24 6 143 1 29 QF_LOG2@197-225@..\src\qf\qf_qact.c
43 6 232 3 73 QActive_publish_@90-162@..\src\qf\qf_ps.c
18 5 111 2 24 QActive_subscribe@167-190@..\src\qf\qf_ps.c
18 5 111 2 27 QActive_unsubscribe@195-221@..\src\qf\qf_ps.c
19 5 130 1 24 QActive_unsubscribeAll@226-249@..\src\qf\qf_ps.c
10 2 46 2 10 QF_bzero@80-89@..\src\qf\qf_qact.c
16 2 72 2 23 QActive_ctor@96-118@..\src\qf\qf_qact.c
29 9 211 1 44 QActive_register_@123-166@..\src\qf\qf_qact.c
10 3 79 1 15 QActive_unregister_@171-185@..\src\qf\qf_qact.c
24 6 143 1 29 QF_LOG2@193-221@..\src\qf\qf_qact.c
14 2 85 3 14 QEQueue_init@67-80@..\src\qf\qf_qeq.c
57 8 301 4 76 QEQueue_post@83-158@..\src\qf\qf_qeq.c
36 5 199 3 46 QEQueue_postLIFO@161-206@..\src\qf\qf_qeq.c
Expand All @@ -85,26 +85,26 @@
14 3 75 1 16 QTimeEvt_noActive@411-426@..\src\qf\qf_time.c
21 2 112 1 31 QK_schedLock@74-104@..\src\qk\qk.c
21 4 119 1 33 QK_schedUnlock@107-139@..\src\qk\qk.c
12 2 87 1 18 QF_init@144-161@..\src\qk\qk.c
3 1 10 1 4 QF_stop@164-167@..\src\qk\qk.c
15 4 62 1 25 QF_run@170-194@..\src\qk\qk.c
25 3 157 7 34 QActive_start_@201-234@..\src\qk\qk.c
14 3 70 1 18 QK_sched_@239-256@..\src\qk\qk.c
82 20 455 1 132 QK_activate_@259-390@..\src\qk\qk.c
9 2 64 1 13 QF_init@73-85@..\src\qv\qv.c
9 3 74 1 17 QF_init@144-160@..\src\qk\qk.c
3 1 10 1 4 QF_stop@163-166@..\src\qk\qk.c
15 4 62 1 25 QF_run@169-193@..\src\qk\qk.c
25 3 157 7 34 QActive_start_@200-233@..\src\qk\qk.c
14 3 70 1 18 QK_sched_@238-255@..\src\qk\qk.c
82 21 455 1 134 QK_activate_@258-391@..\src\qk\qk.c
7 3 52 1 13 QF_init@73-85@..\src\qv\qv.c
3 1 10 1 4 QF_stop@88-91@..\src\qv\qv.c
39 9 197 1 76 QF_run@94-169@..\src\qv\qv.c
18 1 124 7 25 QActive_start_@176-200@..\src\qv\qv.c
39 10 197 1 77 QF_run@94-170@..\src\qv\qv.c
18 1 124 7 25 QActive_start_@177-201@..\src\qv\qv.c
23 3 131 1 34 QXK_schedLock@71-104@..\src\qxk\qxk.c
20 4 120 1 33 QXK_schedUnlock@107-139@..\src\qxk\qxk.c
14 2 116 1 22 QF_init@144-165@..\src\qxk\qxk.c
3 1 10 1 4 QF_stop@168-171@..\src\qxk\qxk.c
15 4 63 1 25 QF_run@174-198@..\src\qxk\qxk.c
26 3 168 7 37 QActive_start_@205-241@..\src\qxk\qxk.c
74 12 403 1 99 QXK_sched_@249-347@..\src\qxk\qxk.c
104 23 613 1 167 QXK_activate_@350-516@..\src\qxk\qxk.c
12 2 72 1 18 QXK_current@519-536@..\src\qxk\qxk.c
13 2 105 1 23 QXK_threadExit_@542-564@..\src\qxk\qxk.c
11 3 103 1 21 QF_init@144-164@..\src\qxk\qxk.c
3 1 10 1 4 QF_stop@167-170@..\src\qxk\qxk.c
15 4 63 1 25 QF_run@173-197@..\src\qxk\qxk.c
26 3 168 7 37 QActive_start_@204-240@..\src\qxk\qxk.c
74 12 403 1 99 QXK_sched_@248-346@..\src\qxk\qxk.c
104 24 613 1 169 QXK_activate_@349-517@..\src\qxk\qxk.c
12 2 72 1 18 QXK_current@520-537@..\src\qxk\qxk.c
13 2 105 1 23 QXK_threadExit_@543-565@..\src\qxk\qxk.c
10 2 74 2 12 QXMutex_init@74-85@..\src\qxk\qxk_mutex.c
81 11 725 2 138 QXMutex_lock@88-225@..\src\qxk\qxk_mutex.c
59 9 502 1 97 QXMutex_tryLock@228-324@..\src\qxk\qxk_mutex.c
Expand All @@ -120,17 +120,17 @@
10 1 39 3 11 QXThread_init_@247-257@..\src\qxk\qxk_xthr.c
10 1 39 3 11 QXThread_dispatch_@260-270@..\src\qxk\qxk_xthr.c
30 6 215 7 49 QXThread_start_@273-321@..\src\qxk\qxk_xthr.c
100 13 528 4 134 QXThread_post_@324-457@..\src\qxk\qxk_xthr.c
8 1 30 2 9 QXThread_postLIFO_@460-468@..\src\qxk\qxk_xthr.c
5 1 50 1 7 QXThread_block_@471-477@..\src\qxk\qxk_xthr.c
8 3 57 1 8 QXThread_unblock_@480-487@..\src\qxk\qxk_xthr.c
20 3 157 3 39 QXThread_teArm_@490-528@..\src\qxk\qxk_xthr.c
11 2 46 1 13 QXThread_teDisarm_@531-543@..\src\qxk\qxk_xthr.c
100 15 528 4 138 QXThread_post_@324-461@..\src\qxk\qxk_xthr.c
8 1 30 2 9 QXThread_postLIFO_@464-472@..\src\qxk\qxk_xthr.c
5 1 50 1 7 QXThread_block_@475-481@..\src\qxk\qxk_xthr.c
8 3 57 1 8 QXThread_unblock_@484-491@..\src\qxk\qxk_xthr.c
20 3 157 3 39 QXThread_teArm_@494-532@..\src\qxk\qxk_xthr.c
11 2 46 1 13 QXThread_teDisarm_@535-547@..\src\qxk\qxk_xthr.c
33 file analyzed.
==============================================================
NLOC Avg.NLOC AvgCCN Avg.token function_cnt file
--------------------------------------------------------------
7 0.0 0.0 0.0 0 ..\include\qassert.h
6 0.0 0.0 0.0 0 ..\include\qassert.h
124 0.0 0.0 0.0 0 ..\include\qep.h
33 3.0 1.0 17.0 3 ..\include\qequeue.h
225 6.6 2.4 60.1 9 ..\include\qf.h
Expand All @@ -148,31 +148,32 @@ NLOC Avg.NLOC AvgCCN Avg.token function_cnt file
334 32.3 5.1 182.1 10 ..\src\qf\qep_hsm.c
336 32.3 5.3 187.9 10 ..\src\qf\qep_msm.c
2 0.0 0.0 0.0 0 ..\src\qf\qf_act.c
258 27.9 3.7 154.7 9 ..\src\qf\qf_actq.c
69 20.7 2.0 107.0 3 ..\src\qf\qf_defer.c
136 18.4 3.0 112.0 7 ..\src\qf\qf_dyn.c
258 27.9 3.8 154.7 9 ..\src\qf\qf_actq.c
69 20.7 2.3 107.0 3 ..\src\qf\qf_defer.c
138 18.4 3.1 112.0 7 ..\src\qf\qf_dyn.c
102 31.7 3.7 195.0 3 ..\src\qf\qf_mem.c
115 21.2 4.2 123.8 5 ..\src\qf\qf_ps.c
98 17.8 4.4 110.2 5 ..\src\qf\qf_qact.c
115 21.2 4.4 123.8 5 ..\src\qf\qf_ps.c
96 17.8 4.4 110.2 5 ..\src\qf\qf_qact.c
152 36.2 4.8 201.0 4 ..\src\qf\qf_qeq.c
18 16.0 2.0 79.0 1 ..\src\qf\qf_qmact.c
218 26.2 4.1 156.0 8 ..\src\qf\qf_time.c
201 24.1 4.9 134.0 8 ..\src\qk\qk.c
76 17.2 3.2 98.8 4 ..\src\qv\qv.c
312 30.4 5.6 180.1 10 ..\src\qxk\qxk.c
198 23.8 5.1 132.4 8 ..\src\qk\qk.c
74 16.8 3.8 95.8 4 ..\src\qv\qv.c
309 30.1 5.8 178.8 10 ..\src\qxk\qxk.c
235 57.0 8.5 493.2 4 ..\src\qxk\qxk_mutex.c
143 34.0 4.5 214.0 4 ..\src\qxk\qxk_sema.c
324 24.3 3.5 156.2 13 ..\src\qxk\qxk_xthr.c
324 24.3 3.7 156.2 13 ..\src\qxk\qxk_xthr.c

=========================================================================================================
!!!! Warnings (cyclomatic_complexity > 20 or length > 500 or nloc > 1000000 or parameter_count > 10) !!!!
================================================
NLOC CCN token PARAM length location
------------------------------------------------
104 23 613 1 167 QXK_activate_@350-516@..\src\qxk\qxk.c
82 21 455 1 134 QK_activate_@258-391@..\src\qk\qk.c
104 24 613 1 169 QXK_activate_@349-517@..\src\qxk\qxk.c
==========================================================================================
Total nloc Avg.NLOC AvgCCN Avg.token Fun Cnt Warning cnt Fun Rt nloc Rt
------------------------------------------------------------------------------------------
4063 25.4 4.2 156.0 121 1 0.01 0.03
4054 25.4 4.3 155.6 121 2 0.02 0.06
@endcode
*/
61 changes: 0 additions & 61 deletions examples/arm-cm/dpp_efm32-slstk3401a/.dpp
View file

This file was deleted.

6 changes: 3 additions & 3 deletions examples/arm-cm/dpp_efm32-slstk3401a/dpp.h
View file
Expand Up @@ -3,7 +3,7 @@
* Model: dpp.qm
* File: ${.::dpp.h}
*
* This code has been generated by QM 5.2.1 <www.state-machine.com/qm>.
* This code has been generated by QM 5.2.2 <www.state-machine.com/qm>.
* DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
*
* SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -83,12 +83,12 @@ void Philo_ctor(uint8_t n);
extern QActive * const AO_Philo[N_PHILO];
/*$enddecl${AOs::AO_Philo[N_PHILO]} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/

#ifdef QXK_H
#ifdef QP_INC_QXK_H_
void Test1_ctor(void);
extern QXThread * const XT_Test1;
void Test2_ctor(void);
extern QXThread * const XT_Test2;
#endif /* QXK_H */
#endif /* QP_INC_QXK_H_ */

#endif /* DPP_H */

4 changes: 2 additions & 2 deletions examples/arm-cm/dpp_efm32-slstk3401a/dpp.qm
View file
Expand Up @@ -394,12 +394,12 @@ $declare${AOs::AO_Table}
$declare${AOs::Philo_ctor}
$declare${AOs::AO_Philo[N_PHILO]}

#ifdef QXK_H
#ifdef QP_INC_QXK_H_
void Test1_ctor(void);
extern QXThread * const XT_Test1;
void Test2_ctor(void);
extern QXThread * const XT_Test2;
#endif /* QXK_H */
#endif /* QP_INC_QXK_H_ */

#endif /* DPP_H */
</text>
Expand Down
2 changes: 1 addition & 1 deletion examples/arm-cm/dpp_efm32-slstk3401a/philo.c
View file
Expand Up @@ -3,7 +3,7 @@
* Model: dpp.qm
* File: ${.::philo.c}
*
* This code has been generated by QM 5.2.1 <www.state-machine.com/qm>.
* This code has been generated by QM 5.2.2 <www.state-machine.com/qm>.
* DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
*
* SPDX-License-Identifier: GPL-3.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion examples/arm-cm/dpp_efm32-slstk3401a/qk/bsp.c
View file
Expand Up @@ -83,7 +83,7 @@ void SysTick_Handler(void) {
static struct ButtonsDebouncing {
uint32_t depressed;
uint32_t previous;
} buttons = { ~0U, ~0U };
} buttons = { 0U, 0U };
uint32_t current;
uint32_t tmp;

Expand Down
2 changes: 1 addition & 1 deletion examples/arm-cm/dpp_efm32-slstk3401a/qv/bsp.c
View file
Expand Up @@ -83,7 +83,7 @@ void SysTick_Handler(void) {
static struct ButtonsDebouncing {
uint32_t depressed;
uint32_t previous;
} buttons = { ~0U, ~0U };
} buttons = { 0U, 0U };
uint32_t current;
uint32_t tmp;

Expand Down

0 comments on commit 5145067

Please sign in to comment.