Skip to content

Commit fc91e31

Browse files
author
Michael Bruno
committed
Merge branch 'main' into feature/xcore
* main: Add some assertions and coverage exceptions to queue.c (FreeRTOS#273) Moved git-secrets check to a different workflow (FreeRTOS#271) Comment: fix code comment for xTaskAbortDelay (FreeRTOS#272) Added git-secrets check to Github Actions (FreeRTOS#270) fixed documentation for ulTaskNotifyTake() and ulTaskNotifyTakeIndexed() (FreeRTOS#269) Add description for vTaskList (FreeRTOS#206) Support allocating stack from separate heap (FreeRTOS#267) Update python version to 3.7.10 (FreeRTOS#265) Update URL in history.txt (FreeRTOS#259) Remove unmatched braces in MessageBuffer pre tags (FreeRTOS#256) Check: improve verbosity of url verifier (FreeRTOS#260) Update issue templates incorporate updates from common (FreeRTOS#255) Typos (FreeRTOS#248) Delete gitattributes (FreeRTOS#253) Fix typo in comment in task.h (FreeRTOS#244) Fix Github checks after move from master to main (FreeRTOS#246)
2 parents bec6302 + 18d4ba9 commit fc91e31

16 files changed

+171
-187
lines changed

.gitattributes

Lines changed: 0 additions & 105 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest a new feature for this project
4+
title: "[Feature Request] <replace with your title>"
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/actions/url_verifier.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ then
88
exit 2
99
fi
1010

11+
USER_AGENT="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36"
1112
SCRIPT_RET=0
1213

1314
set -o nounset # Treat unset variables as an error
@@ -27,7 +28,7 @@ function test {
2728

2829
for UNIQ_URL in ${!dict[@]} # loop urls
2930
do
30-
CURL_RES=$(curl -I ${UNIQ_URL} 2>/dev/null| head -n 1 | cut -f 2 -d ' ')
31+
CURL_RES=$(curl -si --user-agent "$(USER_AGENT)" ${UNIQ_URL} 2>/dev/null| head -n 1 | cut -f 2 -d ' ')
3132
RES=$?
3233

3334
if [ "${CURL_RES}" == '' -o "${CURL_RES}" != '200' ]
@@ -38,11 +39,14 @@ function test {
3839
then
3940
CURL_RES=$RES
4041
SCRIPT_RET=1
42+
echo ERROR: Result is: "${CURL_RES}"
4143
elif [ "${CURL_RES}" == '403' ]
4244
then
4345
SCRIPT_RET=1
46+
echo ERROR: Result is: "${CURL_RES}"
47+
else
48+
echo WARNING: Result is: "${CURL_RES}"
4449
fi
45-
echo Result is: "${CURL_RES}"
4650
echo "================================="
4751
fi
4852
done

.github/lexicon.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,6 +1529,7 @@ prvinitialisenewstreambuffer
15291529
prvinitialisenewtimer
15301530
prvinsertblockintofreelist
15311531
prvlockqueue
1532+
prvnotifyqueuesetcontainer
15321533
prvportmalloc
15331534
prvportresetpic
15341535
prvprocesssimulatedinterrupts
@@ -1617,6 +1618,7 @@ pvowner
16171618
pvparameter
16181619
pvparameters
16191620
pvportmalloc
1621+
pvportmallocstack
16201622
pvportrealloc
16211623
pvreg
16221624
pvrxdata
@@ -1686,6 +1688,7 @@ pxprevious
16861688
pxpreviouswaketime
16871689
pxqueue
16881690
pxqueuebuffer
1691+
pxqueuesetcontainer
16891692
pxramstack
16901693
pxreadycoroutinelists
16911694
pxreadytaskslists
@@ -1705,6 +1708,7 @@ pxstreambuffercreatestatic
17051708
pxtagvalue
17061709
pxtask
17071710
pxtaskbuffer
1711+
pxtaskcode
17081712
pxtaskdefinition
17091713
pxtaskstatus
17101714
pxtaskstatusarray
@@ -3017,6 +3021,7 @@ xtaskswaitingforbits
30173021
xtaskswaitingtermination
30183022
xtaskswaitingtoreceive
30193023
xtaskswaitingtosend
3024+
xtasktodelete
30203025
xtasktonotify
30213026
xtasktoquery
30223027
xtasktoresume

.github/scripts/kernel_checker.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
'.tex',
3131
'.png',
3232
'.bat',
33-
'.sh'
33+
'.sh',
34+
'.txt'
3435
]
3536

3637
KERNEL_IGNORED_PATTERNS = [
@@ -83,7 +84,11 @@ def main():
8384
checker.ignoreFile(*KERNEL_IGNORED_FILES)
8485
checker.ignoreFile(os.path.split(__file__)[-1])
8586

86-
return checker.processArgs(args)
87+
rc = checker.processArgs(args)
88+
if rc:
89+
checker.showHelp(__file__)
90+
91+
return rc
8792

8893
if __name__ == '__main__':
8994
exit(main())

.github/workflows/auto-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Tool Setup
2222
uses: actions/setup-python@v2
2323
with:
24-
python-version: 3.8.5
24+
python-version: 3.7.10
2525
architecture: x64
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches: ["**"]
55
pull_request:
6-
branches: [master]
6+
branches: [main]
77
workflow_dispatch:
88
jobs:
99
spell-check:
@@ -44,3 +44,4 @@ jobs:
4444
- name: URL Checker
4545
run: |
4646
bash kernel/.github/actions/url_verifier.sh kernel
47+

.github/workflows/git-secrets.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: git-secrets Check
2+
on:
3+
push:
4+
pull_request:
5+
workflow_dispatch:
6+
jobs:
7+
git-secrets:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
with:
12+
submodules: recursive
13+
- name: Checkout awslabs/git-secrets
14+
uses: actions/checkout@v2
15+
with:
16+
repository: awslabs/git-secrets
17+
ref: master
18+
path: git-secrets
19+
- name: Install git-secrets
20+
run: cd git-secrets && sudo make install && cd ..
21+
- name: Run git-secrets
22+
run: |
23+
git-secrets --register-aws
24+
git-secrets --scan

.github/workflows/kernel-checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Tool Setup
1212
uses: actions/setup-python@v2
1313
with:
14-
python-version: 3.8.5
14+
python-version: 3.7.10
1515
architecture: x64
1616
env:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -36,12 +36,12 @@ jobs:
3636
uses: lots0logs/[email protected]
3737
with:
3838
token: ${{ secrets.GITHUB_TOKEN }}
39-
39+
4040
# Run checks
4141
- name: Check File Headers
4242
run: |
4343
mv tools/.github/scripts/common inspect/.github/scripts
44+
pip install -r inspect/.github/scripts/common/requirements.txt
4445
cd inspect
4546
.github/scripts/kernel_checker.py --json ${HOME}/files_modified.json ${HOME}/files_added.json ${HOME}/files_renamed.json
4647
exit $?
47-

History.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Changes between FreeRTOS V10.3.1 and FreeRTOS V10.4.0 released September 10 2020
7979
the same way the Windows port layer enables FreeRTOS to run on Windows
8080
hosts.
8181
+ Many other minor optimisations and enhancements. For full details
82-
see https://github.com/FreeRTOS/FreeRTOS-Kernel/commits/master
82+
see https://github.com/FreeRTOS/FreeRTOS-Kernel/commits/main
8383

8484

8585
Changes between FreeRTOS V10.3.0 and FreeRTOS V10.3.1 released February 18 2020

include/FreeRTOS.h

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,11 @@
900900
#define configSUPPORT_DYNAMIC_ALLOCATION 1
901901
#endif
902902

903+
#ifndef configSTACK_ALLOCATION_FROM_SEPARATE_HEAP
904+
/* Defaults to 0 for backward compatibility. */
905+
#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP 0
906+
#endif
907+
903908
#ifndef configSTACK_DEPTH_TYPE
904909

905910
/* Defaults to uint16_t for backward compatibility, but can be overridden
@@ -983,7 +988,7 @@
983988

984989
#ifndef configMIN
985990

986-
/* The application writer has not provided their own MAX macro, so define
991+
/* The application writer has not provided their own MIN macro, so define
987992
* the following generic implementation. */
988993
#define configMIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
989994
#endif
@@ -1109,7 +1114,7 @@
11091114
* data hiding policy, so the real structures used by FreeRTOS to maintain the
11101115
* state of tasks, queues, semaphores, etc. are not accessible to the application
11111116
* code. However, if the application writer wants to statically allocate such
1112-
* an object then the size of the object needs to be know. Dummy structures
1117+
* an object then the size of the object needs to be known. Dummy structures
11131118
* that are guaranteed to have the same size and alignment requirements of the
11141119
* real objects are used for this purpose. The dummy list and list item
11151120
* structures below are used for inclusion in such a dummy structure.
@@ -1158,7 +1163,7 @@ typedef struct xSTATIC_LIST
11581163
* strict data hiding policy. This means the Task structure used internally by
11591164
* FreeRTOS is not accessible to application code. However, if the application
11601165
* writer wants to statically allocate the memory required to create a task then
1161-
* the size of the task object needs to be know. The StaticTask_t structure
1166+
* the size of the task object needs to be known. The StaticTask_t structure
11621167
* below is provided for this purpose. Its sizes and alignment requirements are
11631168
* guaranteed to match those of the genuine structure, no matter which
11641169
* architecture is being used, and no matter how the values in FreeRTOSConfig.h
@@ -1221,7 +1226,7 @@ typedef struct xSTATIC_TCB
12211226
* strict data hiding policy. This means the Queue structure used internally by
12221227
* FreeRTOS is not accessible to application code. However, if the application
12231228
* writer wants to statically allocate the memory required to create a queue
1224-
* then the size of the queue object needs to be know. The StaticQueue_t
1229+
* then the size of the queue object needs to be known. The StaticQueue_t
12251230
* structure below is provided for this purpose. Its sizes and alignment
12261231
* requirements are guaranteed to match those of the genuine structure, no
12271232
* matter which architecture is being used, and no matter how the values in
@@ -1292,7 +1297,7 @@ typedef struct xSTATIC_EVENT_GROUP
12921297
* strict data hiding policy. This means the software timer structure used
12931298
* internally by FreeRTOS is not accessible to application code. However, if
12941299
* the application writer wants to statically allocate the memory required to
1295-
* create a software timer then the size of the queue object needs to be know.
1300+
* create a software timer then the size of the queue object needs to be known.
12961301
* The StaticTimer_t structure below is provided for this purpose. Its sizes
12971302
* and alignment requirements are guaranteed to match those of the genuine
12981303
* structure, no matter which architecture is being used, and no matter how the
@@ -1320,12 +1325,12 @@ typedef struct xSTATIC_TIMER
13201325
* internally by FreeRTOS is not accessible to application code. However, if
13211326
* the application writer wants to statically allocate the memory required to
13221327
* create a stream buffer then the size of the stream buffer object needs to be
1323-
* know. The StaticStreamBuffer_t structure below is provided for this purpose.
1324-
* Its size and alignment requirements are guaranteed to match those of the
1325-
* genuine structure, no matter which architecture is being used, and no matter
1326-
* how the values in FreeRTOSConfig.h are set. Its contents are somewhat
1327-
* obfuscated in the hope users will recognise that it would be unwise to make
1328-
* direct use of the structure members.
1328+
* known. The StaticStreamBuffer_t structure below is provided for this
1329+
* purpose. Its size and alignment requirements are guaranteed to match those
1330+
* of the genuine structure, no matter which architecture is being used, and
1331+
* no matter how the values in FreeRTOSConfig.h are set. Its contents are
1332+
* somewhat obfuscated in the hope users will recognise that it would be unwise
1333+
* to make direct use of the structure members.
13291334
*/
13301335
typedef struct xSTATIC_STREAM_BUFFER
13311336
{

0 commit comments

Comments
 (0)