Notice: We have migrated to GitLab launching 2024-05-01 see here: https://gitlab.rtems.org/

Ticket #1641: rtems-cvs.diff

File rtems-cvs.diff, 7.4 KB (added by Gedare Bloom, on 07/28/10 at 15:02:42)

Patch for red black tree.

  • cpukit/sapi/Makefile.am 

    RCS file: /usr1/CVS/rtems/cpukit/sapi/Makefile.am,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile.am
    include_rtemsdir = $(includedir)/rtems 
    1010include_rtems_HEADERS = include/confdefs.h
    1111include_rtems_HEADERS += include/rtems/chain.h include/rtems/config.h \
    1212    include/rtems/extension.h include/rtems/fatal.h include/rtems/init.h \
    13     include/rtems/io.h include/rtems/mptables.h include/rtems/sptables.h
     13    include/rtems/io.h include/rtems/mptables.h include/rtems/rbtree.h \
     14                include/rtems/sptables.h
    1415
    1516EXTRA_DIST = include/rtems/README
    1617
    1718include_rtems_HEADERS += inline/rtems/chain.inl \
    18     inline/rtems/extension.inl
     19    inline/rtems/extension.inl inline/rtems/rbtree.inl
    1920
    2021## src
    2122AM_CPPFLAGS += -D__RTEMS_INSIDE__

  • cpukit/sapi/preinstall.am 

    RCS file: /usr1/CVS/rtems/cpukit/sapi/preinstall.am,v
retrieving revision 1.11
diff -u -p -r1.11 preinstall.am
    $(PROJECT_INCLUDE)/rtems/mptables.h: inc 
    6060        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mptables.h
    6161PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mptables.h
    6262
     63$(PROJECT_INCLUDE)/rtems/rbtree.h: include/rtems/rbtree.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     64        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rbtree.h
     65PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rbtree.h
     66
    6367$(PROJECT_INCLUDE)/rtems/sptables.h: include/rtems/sptables.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    6468        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sptables.h
    6569PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sptables.h
    … … $(PROJECT_INCLUDE)/rtems/extension.inl:  
    7276        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.inl
    7377PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
    7478
     79$(PROJECT_INCLUDE)/rtems/rbtree.inl: inline/rtems/rbtree.inl $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     80        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rbtree.inl
     81PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rbtree.inl
     82
    7583$(PROJECT_LIB)/libsapi.a: libsapi.a $(PROJECT_LIB)/$(dirstamp)
    7684        $(INSTALL_DATA) $< $(PROJECT_LIB)/libsapi.a
    7785TMPINSTALL_FILES += $(PROJECT_LIB)/libsapi.a

  • cpukit/score/Makefile.am 

    RCS file: /usr1/CVS/rtems/cpukit/score/Makefile.am,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile.am
    include_rtems_score_HEADERS = include/rt 
    2525    include/rtems/score/heap.h include/rtems/score/protectedheap.h \
    2626    include/rtems/score/interr.h include/rtems/score/isr.h \
    2727    include/rtems/score/object.h include/rtems/score/percpu.h \
    28     include/rtems/score/priority.h include/rtems/score/stack.h \
     28    include/rtems/score/priority.h \
     29    include/rtems/score/rbtree.h include/rtems/score/stack.h \
    2930    include/rtems/score/states.h include/rtems/score/sysstate.h \
    3031    include/rtems/score/thread.h include/rtems/score/threadq.h \
    3132    include/rtems/score/threadsync.h include/rtems/score/timespec.h \
    … … include_rtems_score_HEADERS += inline/rt 
    5354    inline/rtems/score/coremsg.inl inline/rtems/score/coremutex.inl \
    5455    inline/rtems/score/coresem.inl inline/rtems/score/heap.inl \
    5556    inline/rtems/score/isr.inl inline/rtems/score/object.inl \
    56     inline/rtems/score/priority.inl inline/rtems/score/stack.inl \
     57    inline/rtems/score/priority.inl \
     58    inline/rtems/score/rbtree.inl inline/rtems/score/stack.inl \
    5759    inline/rtems/score/states.inl inline/rtems/score/sysstate.inl \
    5860    inline/rtems/score/thread.inl inline/rtems/score/threadq.inl \
    5961    inline/rtems/score/tod.inl inline/rtems/score/tqdata.inl \
    … … libscore_a_SOURCES += src/pheapallocate. 
    142144    src/pheapgetblocksize.c src/pheapgetfreeinfo.c src/pheapgetinfo.c \
    143145    src/pheapinit.c src/pheapresizeblock.c src/pheapwalk.c
    144146
     147## RBTREE_C_FILES
     148libscore_a_SOURCES += src/rbtree.c \
     149    src/rbtreeextract.c src/rbtreefind.c src/rbtreefindheader.c \
     150    src/rbtreeget.c src/rbtreeinsert.c src/rbtreepeek.c
     151
    145152## THREAD_C_FILES
    146153libscore_a_SOURCES += src/thread.c src/threadchangepriority.c \
    147154    src/threadclearstate.c src/threadclose.c src/threadcreateidle.c \

  • cpukit/score/preinstall.am 

    RCS file: /usr1/CVS/rtems/cpukit/score/preinstall.am,v
retrieving revision 1.23
diff -u -p -r1.23 preinstall.am
    $(PROJECT_INCLUDE)/rtems/score/priority. 
    107107        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/priority.h
    108108PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/priority.h
    109109
     110$(PROJECT_INCLUDE)/rtems/score/rbtree.h: include/rtems/score/rbtree.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     111        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/rbtree.h
     112PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/rbtree.h
     113
    110114$(PROJECT_INCLUDE)/rtems/score/stack.h: include/rtems/score/stack.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    111115        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/stack.h
    112116PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/stack.h
    … … $(PROJECT_INCLUDE)/rtems/score/priority. 
    237241        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/priority.inl
    238242PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/priority.inl
    239243
     244$(PROJECT_INCLUDE)/rtems/score/rbtree.inl: inline/rtems/score/rbtree.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     245        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/rbtree.inl
     246PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/rbtree.inl
     247
    240248$(PROJECT_INCLUDE)/rtems/score/stack.inl: inline/rtems/score/stack.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    241249        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/stack.inl
    242250PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/stack.inl

  • testsuites/sptests/Makefile.am 

    RCS file: /usr1/CVS/rtems/testsuites/sptests/Makefile.am,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile.am
    SUBDIRS = \ 
    1616    sp60 sp61 sp62 sp63 sp64 sp65 sp66 sp67 sp68 sp69 \
    1717    sp70 sp71 sp72 \
    1818    spassoc01 spchain spclockget spcoverage spobjgetnext \
    19     spnotepad01 spprintk spsize spstkalloc spthreadq01 \
     19    spnotepad01 spprintk sprbtree01 spsize spstkalloc spthreadq01 \
    2020    spwatchdog spwkspace \
    2121    sperror01 sperror02 sperror03 \
    2222    spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 spfatal06 spfatal07 \

  • testsuites/sptests/configure.ac 

    RCS file: /usr1/CVS/rtems/testsuites/sptests/configure.ac,v
retrieving revision 1.107
diff -u -p -r1.107 configure.ac
    spmountmgr01/Makefile 
    154154spnotepad01/Makefile
    155155spobjgetnext/Makefile
    156156spprintk/Makefile
     157sprbtree01/Makefile
    157158spsize/Makefile
    158159spstkalloc/Makefile
    159160spthreadq01/Makefile