Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
NuttX RTOS
Commits
961837ea
Commit
961837ea
authored
11 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix an assertion
parent
44450511
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ChangeLog
+2
-0
2 additions, 0 deletions
ChangeLog
libc/stdio/Make.defs
+1
-1
1 addition, 1 deletion
libc/stdio/Make.defs
libc/stdio/lib_vdprintf.c
+1
-1
1 addition, 1 deletion
libc/stdio/lib_vdprintf.c
sched/sem_holder.c
+14
-3
14 additions, 3 deletions
sched/sem_holder.c
with
18 additions
and
5 deletions
ChangeLog
+
2
−
0
View file @
961837ea
...
...
@@ -4868,3 +4868,5 @@
the SAM4L (2013-6-2).
* libc/stdio/lib_dprintd.c and lib_vdprintf.c: Add dprintf() and
vdprintf() (the latter from Andrew Tridgell, 2013-6-2).
* sched/sem_holder.c: Modify assertion that is reported to cause
false alarm assertions (2013-6-2).
This diff is collapsed.
Click to expand it.
libc/stdio/Make.defs
+
1
−
1
View file @
961837ea
...
...
@@ -37,7 +37,7 @@
# This first group of C files do not depend on having file descriptors or
# C streams.
CSRCS += lib_fileno.c lib_printf.c lib_syslog.c lib_lowsyslog.c\
CSRCS += lib_fileno.c lib_printf.c lib_syslog.c lib_lowsyslog.c
\
lib_sprintf.c lib_asprintf.c lib_snprintf.c lib_libsprintf.c \
lib_vsprintf.c lib_avsprintf.c lib_vsnprintf.c lib_libvsprintf.c \
lib_dprintf.c lib_vdprintf.c \
...
...
This diff is collapsed.
Click to expand it.
libc/stdio/lib_vdprintf.c
+
1
−
1
View file @
961837ea
...
...
@@ -56,4 +56,4 @@ int vdprintf(int fd, FAR const char *fmt, va_list ap)
lib_rawoutstream
(
&
rawoutstream
,
fd
);
return
lib_vsprintf
(
&
rawoutstream
.
public
,
fmt
,
ap
);
}
}
This diff is collapsed.
Click to expand it.
sched/sem_holder.c
+
14
−
3
View file @
961837ea
...
...
@@ -448,11 +448,22 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder, FAR sem_t *sem
if
(
htcb
->
npend_reprio
<
1
)
{
/* No... the holder thread has only been boosted once. Reset all
* priorities back to the base priority.
/* No... the holder thread has only been boosted once.
* npend_reprio should be 0 and the boosted priority should be the
* priority of the task that just got the semaphore
* (stcb->sched_priority)
*
* That latter assumption may not be true if the stcb's priority
* was also boosted so that it no longer matches the htcb's
* sched_priority. Or if CONFIG_SEM_NNESTPRIO is too small (so
* that we do not have a proper record of the reprioritizations).
*/
DEBUGASSERT
(
htcb
->
sched_priority
==
stcb
->
sched_priority
&&
htcb
->
npend_reprio
==
0
);
DEBUGASSERT
(
/* htcb->sched_priority == stcb->sched_priority && */
htcb
->
npend_reprio
==
0
);
/* Reset the holder's priority back to the base priority. */
sched_reprioritize
(
htcb
,
htcb
->
base_priority
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment