summaryrefslogtreecommitdiff
path: root/database
diff options
context:
space:
mode:
authorMatthijs Bijman <matthijs@bijman.org>2017-02-27 15:38:31 +0100
committerMatthijs Bijman <matthijs@bijman.org>2017-02-27 15:38:31 +0100
commitb55ad82adcb624a2c844b75e768187b175242f7e (patch)
treeddb7d1a5e302bbb0a8db50126f78ab38e8de23a1 /database
parent4ad9df0973a5efc160feda37e9dba3f1bcfb08fd (diff)
Add parallelizability and new schedulers to sql schema/test data
Diffstat (limited to 'database')
-rw-r--r--database/schema.sql3
-rw-r--r--database/test.sql10
2 files changed, 8 insertions, 5 deletions
diff --git a/database/schema.sql b/database/schema.sql
index 01172b99..ef67a8b0 100644
--- a/database/schema.sql
+++ b/database/schema.sql
@@ -115,6 +115,8 @@ CREATE TABLE IF NOT EXISTS schedulers (
name TEXT PRIMARY KEY NOT NULL
);
INSERT INTO schedulers (name) VALUES ("DEFAULT");
+INSERT INTO schedulers (name) VALUES ("SRTF");
+INSERT INTO schedulers (name) VALUES ("FIFO");
/*
* Each simulation has a single trace. A trace contains tasks and their start times.
@@ -133,6 +135,7 @@ CREATE TABLE IF NOT EXISTS tasks (
total_flop_count INTEGER NOT NULL,
trace_id INTEGER NOT NULL,
task_dependency_id INTEGER NULL,
+ parallelizability TEXT NOT NULL,
FOREIGN KEY (trace_id) REFERENCES traces (id) ON DELETE CASCADE ON UPDATE CASCADE,
FOREIGN KEY (task_dependency_id) REFERENCES tasks (id) ON DELETE CASCADE ON UPDATE CASCADE
diff --git a/database/test.sql b/database/test.sql
index 69304767..30e3b870 100644
--- a/database/test.sql
+++ b/database/test.sql
@@ -39,11 +39,11 @@ INSERT INTO sections (path_id, datacenter_id, start_tick) VALUES (2, 3, 0);
INSERT INTO traces (name) VALUES ('test trace');
-- Tasks
-INSERT INTO tasks (id, start_tick, total_flop_count, trace_id) VALUES (1, 0, 40000000, 1);
-INSERT INTO tasks (start_tick, total_flop_count, trace_id) VALUES (25, 10000, 1);
-INSERT INTO tasks (start_tick, total_flop_count, trace_id) VALUES (25, 10000, 1);
-INSERT INTO tasks (start_tick, total_flop_count, trace_id) VALUES (26, 10000, 1);
-INSERT INTO tasks (start_tick, total_flop_count, trace_id, task_dependency_id) VALUES (80, 200000, 1, 1);
+INSERT INTO tasks (id, start_tick, total_flop_count, trace_id, parallelizability) VALUES (1, 0, 40000000, 1, 'SEQUENTIAL');
+INSERT INTO tasks (start_tick, total_flop_count, trace_id, parallelizability) VALUES (25, 10000, 1, 'PARALLEL');
+INSERT INTO tasks (start_tick, total_flop_count, trace_id, parallelizability) VALUES (25, 10000, 1, 'PARALLEL');
+INSERT INTO tasks (start_tick, total_flop_count, trace_id, parallelizability) VALUES (26, 10000, 1, 'PARALLEL');
+INSERT INTO tasks (start_tick, total_flop_count, trace_id, task_dependency_id, parallelizability) VALUES (80, 200000, 1, 1, 'PARALLEL');
-- Experiments
INSERT INTO experiments (simulation_id, path_id, trace_id, scheduler_name, name, state, last_simulated_tick)