sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix backward conditional compilation in work_queue.c

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5394 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-27 17:22:32 +00:00
parent 36463721d0
commit bdf4201e3b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3700,3 +3700,6 @@
* cloudctrl/src/up_chipid.c and shenzhou/src/up_chipid.c: Add functions to * cloudctrl/src/up_chipid.c and shenzhou/src/up_chipid.c: Add functions to
get chip ID. Contributed by Darcy Gong. These should not be board-dependent, get chip ID. Contributed by Darcy Gong. These should not be board-dependent,
but should be in arch/arm/src/stm32 where they can be used from any board. but should be in arch/arm/src/stm32 where they can be used from any board.
* sched/work_thread.c: Fix backward conditional compilation. This might
has caused a memory leadk. From Freddie Chopin.

4
configs/z8f64200100kit/ostest/Make.defs
View File

@ -41,7 +41,7 @@ include $(TOPDIR)/tools/Config.mk
ZDSVERSION := 5.0.0 ZDSVERSION := 5.0.0
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZZDSII_Z8Encore!_$(ZDSVERSION) ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"} INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
ZDSBINDIR := $(INSTALLDIR)\bin ZDSBINDIR := $(INSTALLDIR)\bin
ZDSSTDINCDIR := $(INSTALLDIR)\include\std ZDSSTDINCDIR := $(INSTALLDIR)\include\std
@ -63,7 +63,7 @@ endif
ARCHUSRINCLUDES = -usrinc:. ARCHUSRINCLUDES = -usrinc:.
else else
WINTOOL := y WINTOOL := y
ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZZDSII_Z8Encore!_$(ZDSVERSION) ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std ZDSSTDINCDIR := $(INSTALLDIR)/include/std

6
sched/work_thread.c
View File

@ -208,10 +208,10 @@ int work_hpthread(int argc, char *argv[])
* that were queued because they could not be freed in that execution * that were queued because they could not be freed in that execution
* context (for example, if the memory was freed from an interrupt handler). * context (for example, if the memory was freed from an interrupt handler).
* NOTE: If the work thread is disabled, this clean-up is performed by * NOTE: If the work thread is disabled, this clean-up is performed by
* the IDLE thread (at a very, very lower priority). * the IDLE thread (at a very, very low priority).
*/ */
#ifdef CONFIG_SCHED_LPWORK #ifndef CONFIG_SCHED_LPWORK
sched_garbagecollection(); sched_garbagecollection();
#endif #endif
@ -236,7 +236,7 @@ int work_lpthread(int argc, char *argv[])
* that were queued because they could not be freed in that execution * that were queued because they could not be freed in that execution
* context (for example, if the memory was freed from an interrupt handler). * context (for example, if the memory was freed from an interrupt handler).
* NOTE: If the work thread is disabled, this clean-up is performed by * NOTE: If the work thread is disabled, this clean-up is performed by
* the IDLE thread (at a very, very lower priority). * the IDLE thread (at a very, very low priority).
*/ */
sched_garbagecollection(); sched_garbagecollection();