3
0
Fork 0
mirror of https://github.com/YosysHQ/sby.git synced 2025-08-21 12:20:26 +00:00

Store task name in task and statusdb

This commit is contained in:
Krystine Sherwin 2025-07-08 15:47:31 +12:00
parent de59dcc9c4
commit f63cd46d12
No known key found for this signature in database
3 changed files with 9 additions and 7 deletions

View file

@ -467,7 +467,7 @@ def start_task(taskloop, taskname):
else: else:
junit_filename = "junit" junit_filename = "junit"
task = SbyTask(sbyconfig, my_workdir, early_logmsgs, reusedir, taskloop) task = SbyTask(sbyconfig, my_workdir, early_logmsgs, reusedir, taskloop, name=taskname)
for k, v in exe_paths.items(): for k, v in exe_paths.items():
task.exe_paths[k] = v task.exe_paths[k] = v

View file

@ -825,12 +825,13 @@ class SbySummary:
class SbyTask(SbyConfig): class SbyTask(SbyConfig):
def __init__(self, sbyconfig, workdir, early_logs, reusedir, taskloop=None, logfile=None): def __init__(self, sbyconfig, workdir, early_logs, reusedir, taskloop=None, logfile=None, name=None):
super().__init__() super().__init__()
self.used_options = set() self.used_options = set()
self.models = dict() self.models = dict()
self.workdir = workdir self.workdir = workdir
self.reusedir = reusedir self.reusedir = reusedir
self.name = name
self.status = "UNKNOWN" self.status = "UNKNOWN"
self.total_time = 0 self.total_time = 0
self.expect = list() self.expect = list()

View file

@ -18,6 +18,7 @@ SQLSCRIPT = """\
CREATE TABLE task ( CREATE TABLE task (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
workdir TEXT, workdir TEXT,
name TEXT,
mode TEXT, mode TEXT,
created REAL created REAL
); );
@ -124,7 +125,7 @@ class SbyStatusDb:
self._setup() self._setup()
if task is not None: if task is not None:
self.task_id = self.create_task(workdir=task.workdir, mode=task.opt_mode) self.task_id = self.create_task(workdir=task.workdir, name=task.name, mode=task.opt_mode)
def log_debug(self, *args): def log_debug(self, *args):
if self.debug: if self.debug:
@ -147,13 +148,13 @@ class SbyStatusDb:
return schema_script != SQLSCRIPT return schema_script != SQLSCRIPT
@transaction @transaction
def create_task(self, workdir: str, mode: str) -> int: def create_task(self, workdir: str, name: str, mode: str) -> int:
return self.db.execute( return self.db.execute(
""" """
INSERT INTO task (workdir, mode, created) INSERT INTO task (workdir, name, mode, created)
VALUES (:workdir, :mode, :now) VALUES (:workdir, :name, :mode, :now)
""", """,
dict(workdir=workdir, mode=mode, now=time.time()), dict(workdir=workdir, name=name, mode=mode, now=time.time()),
).lastrowid ).lastrowid
@transaction @transaction