-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added scheduler records QS_SCHED_PREEMPT and QS_SCHED_RESTORE
- Loading branch information
1 parent
0529923
commit 0c6f17f
Showing
9 changed files
with
180 additions
and
54 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ | |
| * <[email protected]> | ||
| ============================================================================*/ | ||
| /*! | ||
| * @date Last updated on: 2022-08-29 | ||
| * @date Last updated on: 2022-09-03 | ||
| * @version Last updated for version: 7.1.1 | ||
| * | ||
| * @file | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ | |
| * <[email protected]> | ||
| ============================================================================*/ | ||
| /*! | ||
| * @date Last updated on: 2022-08-29 | ||
| * @date Last updated on: 2022-09-03 | ||
| * @version Last updated for version: 7.1.1 | ||
| * | ||
| * @file | ||
|
|
@@ -145,11 +145,9 @@ QSpyRecRender const QSPY_rec[QS_USER] = { | |
| /* [47] Additional Memory Pool (MP) records */ | ||
| { "QS_QF_MPOOL_GET_ATTEMPT", GRP_MP }, | ||
|
|
||
| /* [48] old Mutex records (deprecated) */ | ||
| { "QS_MUTEX_LOCK", GRP_MTX }, | ||
| { "QS_MUTEX_UNLOCK", GRP_MTX }, | ||
|
|
||
| /* [50] Scheduler (SC) records */ | ||
| /* [48] Scheduler (SC) records */ | ||
| { "QS_SCHED_PREEMPT", GRP_SC }, | ||
| { "QS_SCHED_RESTORE", GRP_SC }, | ||
| { "QS_SCHED_LOCK", GRP_SC }, | ||
| { "QS_SCHED_UNLOCK", GRP_SC }, | ||
| { "QS_SCHED_NEXT", GRP_SC }, | ||
|
|
@@ -1673,25 +1671,37 @@ static void QSpyRecord_process(QSpyRecord * const me) { | |
| break; | ||
| } | ||
|
|
||
| /* old Mutex records, deprecated in QP 7.1.0 | ||
| * see QS_MTX_LOCK, etc. | ||
| */ | ||
| case QS_MUTEX_LOCK: | ||
| if (s == 0) s = "Mtx-Lock"; | ||
| case QS_SCHED_PREEMPT: | ||
| if (QSPY_conf.version < 710U) { | ||
| /* old QS_MUTEX_LOCK */ | ||
| if (s == 0) s = "Mtx-Lock"; | ||
| } | ||
| else { | ||
| if (s == 0) s = "Sch-Pre "; | ||
| } | ||
| /* fall through */ | ||
| case QS_MUTEX_UNLOCK: { | ||
| if (s == 0) s = "Mtx-Unlk"; | ||
| case QS_SCHED_RESTORE: { | ||
| t = QSpyRecord_getUint32(me, QSPY_conf.tstampSize); | ||
| a = QSpyRecord_getUint32(me, 1); | ||
| b = QSpyRecord_getUint32(me, 1); | ||
| if (QSpyRecord_OK(me)) { | ||
| SNPRINTF_LINE("%010u %s Pro=%u,Ceil=%u", | ||
| t, | ||
| s, | ||
| a, b); | ||
| QSPY_onPrintLn(); | ||
| FPRINF_MATFILE("%d %u %u %u\n", | ||
| (int)me->rec, t, a, b); | ||
| if (QSPY_conf.version < 710U) { | ||
| /* old QS_MUTEX_UNLOCK */ | ||
| if (s == 0) s = "Mtx-Unlk"; | ||
| SNPRINTF_LINE("%010u %s Pro=%u,Ceil=%u", | ||
| t, s, a, b); | ||
| QSPY_onPrintLn(); | ||
| FPRINF_MATFILE("%d %u %u %u\n", | ||
| (int)me->rec, t, a, b); | ||
| } | ||
| else { | ||
| if (s == 0) s = "Sch-Rest"; | ||
| SNPRINTF_LINE("%010u %s Pri=%u->%u", | ||
| t, s, b, a); | ||
| QSPY_onPrintLn(); | ||
| FPRINF_MATFILE("%d %u %u %u\n", | ||
| (int)me->rec, t, b, a); | ||
| } | ||
| } | ||
| break; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,8 +23,8 @@ | |
| # <[email protected]> | ||
| #============================================================================= | ||
| ## | ||
| # @date Last updated on: 2022-08-22 | ||
| # @version Last updated for version: 7.1.0 | ||
| # @date Last updated on: 2022-09-03 | ||
| # @version Last updated for version: 7.1.1 | ||
| # | ||
| # @file | ||
| # @brief QUTest Python scripting support (implementation) | ||
|
|
@@ -52,7 +52,7 @@ | |
| # https://www.state-machine.com/qtools/qutest_script.html | ||
| # | ||
| class QUTest: | ||
| VERSION = 710 | ||
| VERSION = 711 | ||
|
|
||
| # class variables | ||
| _host_exe = "" | ||
|
|
@@ -1046,10 +1046,8 @@ class QSpy: | |
| # [47] Additional Memory Pool (MP) records | ||
| "QS_QF_MPOOL_GET_ATTEMPT", | ||
|
|
||
| # [48] old Mutex records (deprecated in QP 7.1.0) | ||
| "QS_MUTEX_LOCK", "QS_MUTEX_UNLOCK", | ||
|
|
||
| # [50] Scheduler (SC) records | ||
| # [48] Scheduler (SC) records | ||
| "QS_SCHED_PREEMPT", "QS_SCHED_RESTORE", | ||
| "QS_SCHED_LOCK", "QS_SCHED_UNLOCK", | ||
| "QS_SCHED_NEXT", "QS_SCHED_IDLE", | ||
| "QS_SCHED_RESUME", | ||
|
|
@@ -1111,7 +1109,7 @@ class QSpy: | |
| _GLB_FLT_MASK_TE = 0x00000000000000000000003F00000000 | ||
| _GLB_FLT_MASK_EQ = 0x00000000000000000000400000780000 | ||
| _GLB_FLT_MASK_MP = 0x00000000000000000000800003000000 | ||
| _GLB_FLT_MASK_SC = 0x0000000000000000007C000000000000 | ||
| _GLB_FLT_MASK_SC = 0x0000000000000000007F000000000000 | ||
| _GLB_FLT_MASK_SEM= 0x00000000000007800000000000000000 | ||
| _GLB_FLT_MASK_MTX= 0x000000000001F8000000000000000000 | ||
| _GLB_FLT_MASK_U0 = 0x000001F0000000000000000000000000 | ||
|
|
||
Oops, something went wrong.