Skip to content

<feat>:support freertos smp with not use xTaskRunState #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2025
Merged

<feat>:support freertos smp with not use xTaskRunState #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 66 additions & 8 deletions src/rtos/rtos-freertos.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,15 @@ export class RTOSFreeRTOS extends RTOSCommon.RTOSBase {
private xPendingReadyList: RTOSCommon.RTOSVarHelperMaybe;
private pxCurrentTCB: RTOSCommon.RTOSVarHelperMaybe;
private pxCurrentTCBs: RTOSCommon.RTOSVarHelperMaybe;
private pxCurrentTCBsNum = 0;
private xSuspendedTaskList: RTOSCommon.RTOSVarHelperMaybe;
private xTasksWaitingTermination: RTOSCommon.RTOSVarHelperMaybe;
private ulTotalRunTime: RTOSCommon.RTOSVarHelperMaybe;
private ulTotalRunTimeVal = 0;

private stale = true;
private curThreadInfo = 0; // address (from pxCurrentTCB) of status (when multicore)
private curThreadInfos: number[] = []; //address (from pxCurrentTCBs) of status of all threads (when multicore)
private foundThreads: RTOSCommon.RTOSThreadInfo[] = [];
private finalThreads: RTOSCommon.RTOSThreadInfo[] = [];
private timeInfo = '';
Expand Down Expand Up @@ -243,6 +245,40 @@ export class RTOSFreeRTOS extends RTOSCommon.RTOSBase {
});
}

// pxCurrentTCBs store the currently running thread. use it determine thread status
private updateThreadAddrInCurrentTCBs(frameId: number): Promise<void> {
return new Promise<void>((resolve, reject) => {
if (this.pxCurrentTCBs !== null) {
this.pxCurrentTCBs?.getValue(frameId).then(
(ret) => {
if (ret !== undefined) {
const match = ret.match(/\d+/);
this.pxCurrentTCBsNum = match ? parseInt(match[0]) : 0;
} else {
this.pxCurrentTCBsNum = 0;
}
for (let i = 0; i < this.pxCurrentTCBsNum; i++) {
this.getExprVal('pxCurrentTCBs[' + i + ']', frameId).then(
(ret) => {
this.curThreadInfos[i] = parseInt(ret || '');
},
(e) => {
reject(e);
}
);
}
resolve();
},
(e) => {
reject(e);
}
);
} else {
resolve();
}
});
}

private updateTotalRuntime(frameId: number): Promise<void> {
return new Promise<void>((resolve, reject) => {
if (!this.ulTotalRunTime) {
Expand Down Expand Up @@ -285,6 +321,7 @@ export class RTOSFreeRTOS extends RTOSCommon.RTOSBase {
promises.push(this.getThreadInfo(v.variablesReference, 'READY', frameId));
}
promises.push(this.updateCurrentThreadAddr(frameId));
promises.push(this.updateThreadAddrInCurrentTCBs(frameId));
promises.push(this.updateTotalRuntime(frameId));
// Update in bulk, but broken up into three chunks, if the number of threads are already fulfilled, then
// not much happens
Expand Down Expand Up @@ -395,15 +432,36 @@ export class RTOSFreeRTOS extends RTOSCommon.RTOSBase {
mySetter(DisplayFields.Status, threadRunning ? 'RUNNING' : state);
} else {
const xTaskRunState = thInfo['xTaskRunState']?.val;
if (xTaskRunState === '-2') {
threadRunning = false;
mySetter(DisplayFields.Status, 'YIELD');
}else if (xTaskRunState === '-1') {
threadRunning = false;
mySetter(DisplayFields.Status, state);
if (xTaskRunState !== undefined) {
// some freertos not use it,then it is undefined
if (xTaskRunState === '-2') {
threadRunning = false;
mySetter(DisplayFields.Status, 'YIELD');
} else if (xTaskRunState === '-1') {
threadRunning = false;
mySetter(DisplayFields.Status, state);
} else {
threadRunning = true;
mySetter(DisplayFields.Status, 'RUNNING(' + xTaskRunState + ')');
}
} else {
threadRunning = true;
mySetter(DisplayFields.Status, 'RUNNING(' + xTaskRunState + ')');
if (this.pxCurrentTCBs !== null) {
threadRunning = false;
for (const num in this.curThreadInfos) {
if (this.curThreadInfos[num] === threadId) {
threadRunning = true;
mySetter(DisplayFields.Status, 'RUNNING(' + num + ')');
break;
}
}
if (!threadRunning) {
mySetter(DisplayFields.Status, state);
}
} else {
// no pxCurrentTCB, no pxCurrentTCBs, no xTaskRunState
threadRunning = false;
mySetter(DisplayFields.Status, 'UNKNOWN');
}
}
}
mySetter(DisplayFields.StackStart, RTOSCommon.hexFormat(stackInfo.stackStart));
Expand Down