Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SWIFTsim
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

1a631e1d

Commit 1a631e1d authored 9 years ago by Peter W. Draper

Downloads
- Plain Diff

Merge branch 'master' into parallel_scheduler

Conflicts:
	src/runner.c
	src/space.c
	src/task.c
	src/task.h

parents de72d25a 0689a0cd

No related branches found

No related tags found

1 merge request!60Parallel scheduler

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/debug.c 143 additions, 2 deletions

src/debug.c
src/debug.h 7 additions, 0 deletions

src/debug.h
src/engine.c 56 additions, 3 deletions

src/engine.c
src/engine.h 2 additions, 0 deletions

src/engine.h
src/runner.c 3 additions, 0 deletions

src/runner.c
src/scheduler.c 4 additions, 1 deletion

src/scheduler.c
src/space.c 34 additions, 22 deletions

src/space.c
src/task.c 1 addition, 1 deletion

src/task.c
src/task.h 1 addition, 0 deletions

src/task.h

with 251 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment