Different files than the current master?

Joel Sherrill joel at rtems.org
Thu Oct 29 18:38:01 UTC 2020


On Thu, Oct 29, 2020 at 10:53 AM Richi Dubey <richidubey at gmail.com> wrote:

> Hi,
>
> I have attached my cpukit/include/rtems/confdefs/scheduler.h with this
> email, which is different from the current file that I should have, which
> can be seen here:
> https://git.rtems.org/rtems/tree/cpukit/include/rtems/confdefs/scheduler.h
> .
>

I think you are looking at the wrong file named scheduler.h. There are
three options apparently:

$ find cpukit/ -name scheduler.h
cpukit/include/rtems/confdefs/scheduler.h
cpukit/include/rtems/scheduler.h
cpukit/include/rtems/score/scheduler.h

And the file you attached looks more like cpukit/include/rtems/scheduler.h

 diff -u  ~/Downloads/scheduler.h cpukit/include/rtems/scheduler.h
--- /home/joel/Downloads/scheduler.h    2020-10-29 13:32:18.338022528 -0500
+++ cpukit/include/rtems/scheduler.h    2020-10-12 16:26:27.858302686 -0500
@@ -257,14 +257,16 @@
   #define RTEMS_SCHEDULER_STRONG_APA( name, prio_count ) \
     static struct { \
       Scheduler_strong_APA_Context Base; \
-      Scheduler_strong_APA_CPU CPU[ CONFIGURE_MAXIMUM_PROCESSORS ]; \
+      Chain_Control                Ready[ ( prio_count ) ]; \
     } SCHEDULER_STRONG_APA_CONTEXT_NAME( name )

   #define RTEMS_SCHEDULER_TABLE_STRONG_APA( name, obj_name ) \
     { \
       &SCHEDULER_STRONG_APA_CONTEXT_NAME( name ).Base.Base.Base, \
       SCHEDULER_STRONG_APA_ENTRY_POINTS, \
-      SCHEDULER_STRONG_APA_MAXIMUM_PRIORITY, \
+      RTEMS_ARRAY_SIZE( \
+        SCHEDULER_STRONG_APA_CONTEXT_NAME( name ).Ready \
+      ) - 1, \
       ( obj_name ) \
       SCHEDULER_CONTROL_IS_NON_PREEMPT_MODE_SUPPORTED( false ) \
     }

>
> On running :
>
> $ git log --oneline
> 68239434c2 (HEAD -> master, origin/master, origin/HEAD) score: Fix unused
> parameter 'lock' warning
> eebad5ffcd build: Improve cache handling
> b052e3aefa build: Report caching errors
> 99494370d6 bsp/stm32h7: New BSP
> c44e404888 bsp/stm32h7: Fix warnings
>
> I can verify that my RTEMS is at the current
> <https://git.rtems.org/rtems/> master, why are the files different then?
>
> - Richi
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20201029/9478301c/attachment.html>


More information about the devel mailing list