Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed GEDF_NP and removal of deprecated schedulers #282

Merged
merged 6 commits into from
Oct 6, 2023
Merged

Fixed GEDF_NP and removal of deprecated schedulers #282

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2466962
Prepend sched macros with SCHED and remove deprecated sched
erlingrj Oct 4, 2023
42e9c29
Merge remote-tracking branch 'origin/main' into remove-deprecated-scheds
erlingrj Oct 4, 2023
b6c4886
Point to feature branch of lingua-franca
erlingrj Oct 4, 2023
35af3a5
Merge branch 'main' into remove-deprecated-scheds
erlingrj Oct 5, 2023
5f4e96a
Fix level-bugs in the GEDF scheduler
erlingrj Oct 5, 2023
eefa45a
Merge branch 'remove-deprecated-scheds' of github.com:lf-lang/reactor…
erlingrj Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ jobs:
compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
scheduler: GEDF_NP

lf-gedf-np-ci:
needs: fetch-lf
uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
with:
runtime-ref: ${{ github.ref }}
compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
scheduler: GEDF_NP_CI

lf-adaptive:
needs: fetch-lf
uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
Expand Down
2 changes: 0 additions & 2 deletions core/threaded/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ set(
THREADED_SOURCES
reactor_threaded.c
scheduler_adaptive.c
scheduler_GEDF_NP_CI.c
scheduler_GEDF_NP.c
scheduler_NP.c
scheduler_PEDF_NP.c
scheduler_sync_tag_advance.c
scheduler_instance.c
watchdog.c
Expand Down
2 changes: 1 addition & 1 deletion core/threaded/scheduler_GEDF_NP.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @author{Marten Lohstroh <marten@berkeley.edu>}
*/
#include "lf_types.h"
#if SCHEDULER == GEDF_NP
#if SCHEDULER == SCHED_GEDF_NP
#ifndef NUMBER_OF_WORKERS
#define NUMBER_OF_WORKERS 1
#endif // NUMBER_OF_WORKERS
Expand Down
Loading