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

Ticket #1641: rtems-cvs_v1.diff

File rtems-cvs_v1.diff, 7.3 KB (added by Gedare Bloom, on 12/09/10 at 01:37:51)

Patch for red black tree.

  • cpukit/sapi/Makefile.am 

    RCS file: /usr1/CVS/rtems/cpukit/sapi/Makefile.am,v
retrieving revision 1.40
diff -u -p -r1.40 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.89
diff -u -p -r1.89 Makefile.am
    include_rtems_score_HEADERS = include/rt 
    2626    include/rtems/score/interr.h include/rtems/score/isr.h \
    2727    include/rtems/score/object.h include/rtems/score/percpu.h \
    2828    include/rtems/score/priority.h include/rtems/score/prioritybitmap.h \
     29                include/rtems/score/rbtree.h \
    2930    include/rtems/score/scheduler.h include/rtems/score/schedulerpriority.h \
    3031    include/rtems/score/stack.h include/rtems/score/states.h \
    3132    include/rtems/score/sysstate.h include/rtems/score/thread.h \
    … … include_rtems_score_HEADERS += inline/rt 
    5556    inline/rtems/score/coresem.inl inline/rtems/score/heap.inl \
    5657    inline/rtems/score/isr.inl inline/rtems/score/object.inl \
    5758    inline/rtems/score/priority.inl inline/rtems/score/prioritybitmap.inl \
     59                inline/rtems/score/rbtree.inl \
    5860    inline/rtems/score/scheduler.inl inline/rtems/score/schedulerpriority.inl \
    5961    inline/rtems/score/stack.inl inline/rtems/score/states.inl \
    6062    inline/rtems/score/sysstate.inl inline/rtems/score/thread.inl \
    … … libscore_a_SOURCES += src/pheapallocate. 
    158160    src/pheapgetblocksize.c src/pheapgetfreeinfo.c src/pheapgetinfo.c \
    159161    src/pheapinit.c src/pheapresizeblock.c src/pheapwalk.c
    160162
     163## RBTREE_C_FILES
     164libscore_a_SOURCES += src/rbtree.c \
     165    src/rbtreeextract.c src/rbtreefind.c src/rbtreefindheader.c \
     166    src/rbtreeget.c src/rbtreeinsert.c src/rbtreepeek.c
     167
    161168## THREAD_C_FILES
    162169libscore_a_SOURCES += src/thread.c src/threadchangepriority.c \
    163170    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.25
diff -u -p -r1.25 preinstall.am
    $(PROJECT_INCLUDE)/rtems/score/priorityb 
    111111        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h
    112112PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h
    113113
     114$(PROJECT_INCLUDE)/rtems/score/rbtree.h: include/rtems/score/rbtree.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     115        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/rbtree.h
     116PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/rbtree.h
     117
    114118$(PROJECT_INCLUDE)/rtems/score/scheduler.h: include/rtems/score/scheduler.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    115119        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/scheduler.h
    116120PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/scheduler.h
    … … $(PROJECT_INCLUDE)/rtems/score/priorityb 
    253257        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.inl
    254258PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.inl
    255259
     260$(PROJECT_INCLUDE)/rtems/score/rbtree.inl: inline/rtems/score/rbtree.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     261        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/rbtree.inl
     262PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/rbtree.inl
     263
    256264$(PROJECT_INCLUDE)/rtems/score/scheduler.inl: inline/rtems/score/scheduler.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    257265        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/scheduler.inl
    258266PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/scheduler.inl

  • testsuites/sptests/Makefile.am 

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

  • testsuites/sptests/configure.ac 

    RCS file: /usr1/CVS/rtems/testsuites/sptests/configure.ac,v
retrieving revision 1.111
diff -u -p -r1.111 configure.ac
    spnotepad01/Makefile 
    158158spobjgetnext/Makefile
    159159spprintk/Makefile
    160160spprivenv01/Makefile
     161sprbtree01/Makefile
    161162spsize/Makefile
    162163spstkalloc/Makefile
    163164spthreadq01/Makefile