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

84830f45

Commit 84830f45 authored 6 years ago by Peter W. Draper

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/repart-by-ticks' into repart-by-means

Conflicts:
	src/partition.c
	src/scheduler.c

parents e76ec80e 5fe5e550

Branches

Tags

1 merge request!707Repart by CPU ticks with optional fixed costs

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

configure.ac 2 additions, 2 deletions

configure.ac
src/engine.c 45 additions, 58 deletions

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

src/engine.h
src/partition.c 10 additions, 6 deletions

src/partition.c
src/scheduler.c 7 additions, 10 deletions

src/scheduler.c
src/task.h 1 addition, 1 deletion

src/task.h

with 65 additions and 79 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