From 6c6677651896ce7c21c5bfffadf75f6380f9af40 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Sun, 21 Mar 2021 11:40:25 -0700 Subject: [PATCH] Use start_soon instead of fork --- cocotbext/axi/axi_master.py | 8 ++++---- cocotbext/axi/axi_ram.py | 4 ++-- cocotbext/axi/axil_master.py | 8 ++++---- cocotbext/axi/axil_ram.py | 4 ++-- cocotbext/axi/axis.py | 4 ++-- cocotbext/axi/reset.py | 2 +- cocotbext/axi/stream.py | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cocotbext/axi/axi_master.py b/cocotbext/axi/axi_master.py index d16abde..60222f9 100644 --- a/cocotbext/axi/axi_master.py +++ b/cocotbext/axi/axi_master.py @@ -209,9 +209,9 @@ class AxiMasterWrite(Reset): else: self.log.info("Reset de-asserted") if self._process_write_cr is None: - self._process_write_cr = cocotb.fork(self._process_write()) + self._process_write_cr = cocotb.scheduler.start_soon(self._process_write()) if self._process_write_resp_cr is None: - self._process_write_resp_cr = cocotb.fork(self._process_write_resp()) + self._process_write_resp_cr = cocotb.scheduler.start_soon(self._process_write_resp()) self.aw_channel.clear() self.w_channel.clear() @@ -541,9 +541,9 @@ class AxiMasterRead(Reset): else: self.log.info("Reset de-asserted") if self._process_read_cr is None: - self._process_read_cr = cocotb.fork(self._process_read()) + self._process_read_cr = cocotb.scheduler.start_soon(self._process_read()) if self._process_read_resp_cr is None: - self._process_read_resp_cr = cocotb.fork(self._process_read_resp()) + self._process_read_resp_cr = cocotb.scheduler.start_soon(self._process_read_resp()) self.ar_channel.clear() self.r_channel.clear() diff --git a/cocotbext/axi/axi_ram.py b/cocotbext/axi/axi_ram.py index 639ec7d..2d9cea9 100644 --- a/cocotbext/axi/axi_ram.py +++ b/cocotbext/axi/axi_ram.py @@ -78,7 +78,7 @@ class AxiRamWrite(Memory, Reset): else: self.log.info("Reset de-asserted") if self._process_write_cr is None: - self._process_write_cr = cocotb.fork(self._process_write()) + self._process_write_cr = cocotb.scheduler.start_soon(self._process_write()) self.aw_channel.clear() self.w_channel.clear() @@ -198,7 +198,7 @@ class AxiRamRead(Memory, Reset): else: self.log.info("Reset de-asserted") if self._process_read_cr is None: - self._process_read_cr = cocotb.fork(self._process_read()) + self._process_read_cr = cocotb.scheduler.start_soon(self._process_read()) self.ar_channel.clear() self.r_channel.clear() diff --git a/cocotbext/axi/axil_master.py b/cocotbext/axi/axil_master.py index bec22cd..dc32f0f 100644 --- a/cocotbext/axi/axil_master.py +++ b/cocotbext/axi/axil_master.py @@ -152,9 +152,9 @@ class AxiLiteMasterWrite(Reset): else: self.log.info("Reset de-asserted") if self._process_write_cr is None: - self._process_write_cr = cocotb.fork(self._process_write()) + self._process_write_cr = cocotb.scheduler.start_soon(self._process_write()) if self._process_write_resp_cr is None: - self._process_write_resp_cr = cocotb.fork(self._process_write_resp()) + self._process_write_resp_cr = cocotb.scheduler.start_soon(self._process_write_resp()) self.aw_channel.clear() self.w_channel.clear() @@ -360,9 +360,9 @@ class AxiLiteMasterRead(Reset): else: self.log.info("Reset de-asserted") if self._process_read_cr is None: - self._process_read_cr = cocotb.fork(self._process_read()) + self._process_read_cr = cocotb.scheduler.start_soon(self._process_read()) if self._process_read_resp_cr is None: - self._process_read_resp_cr = cocotb.fork(self._process_read_resp()) + self._process_read_resp_cr = cocotb.scheduler.start_soon(self._process_read_resp()) self.ar_channel.clear() self.r_channel.clear() diff --git a/cocotbext/axi/axil_ram.py b/cocotbext/axi/axil_ram.py index 839ef9d..e4dd171 100644 --- a/cocotbext/axi/axil_ram.py +++ b/cocotbext/axi/axil_ram.py @@ -75,7 +75,7 @@ class AxiLiteRamWrite(Memory, Reset): else: self.log.info("Reset de-asserted") if self._process_write_cr is None: - self._process_write_cr = cocotb.fork(self._process_write()) + self._process_write_cr = cocotb.scheduler.start_soon(self._process_write()) self.aw_channel.clear() self.w_channel.clear() @@ -153,7 +153,7 @@ class AxiLiteRamRead(Memory, Reset): else: self.log.info("Reset de-asserted") if self._process_read_cr is None: - self._process_read_cr = cocotb.fork(self._process_read()) + self._process_read_cr = cocotb.scheduler.start_soon(self._process_read()) self.ar_channel.clear() self.r_channel.clear() diff --git a/cocotbext/axi/axis.py b/cocotbext/axi/axis.py index dc0dffd..79ea10d 100644 --- a/cocotbext/axi/axis.py +++ b/cocotbext/axi/axis.py @@ -368,7 +368,7 @@ class AxiStreamBase(Reset): else: self.log.info("Reset de-asserted") if self._run_cr is None: - self._run_cr = cocotb.fork(self._run()) + self._run_cr = cocotb.scheduler.start_soon(self._run()) self.active = False @@ -392,7 +392,7 @@ class AxiStreamPause: self._pause_generator = generator if self._pause_generator is not None: - self._pause_cr = cocotb.fork(self._run_pause()) + self._pause_cr = cocotb.scheduler.start_soon(self._run_pause()) def clear_pause_generator(self): self.set_pause_generator(None) diff --git a/cocotbext/axi/reset.py b/cocotbext/axi/reset.py index dca90aa..b0f0cb5 100644 --- a/cocotbext/axi/reset.py +++ b/cocotbext/axi/reset.py @@ -33,7 +33,7 @@ class Reset: self._reset_state = True if reset_signal is not None: - cocotb.fork(self._run_reset(reset_signal, bool(active_level))) + cocotb.scheduler.start_soon(self._run_reset(reset_signal, bool(active_level))) self._update_reset() diff --git a/cocotbext/axi/stream.py b/cocotbext/axi/stream.py index b8a51c7..c141e4b 100644 --- a/cocotbext/axi/stream.py +++ b/cocotbext/axi/stream.py @@ -146,7 +146,7 @@ class StreamBase(Reset): else: self.log.info("Reset de-asserted") if self._run_cr is None: - self._run_cr = cocotb.fork(self._run()) + self._run_cr = cocotb.scheduler.start_soon(self._run()) self.active = False @@ -170,7 +170,7 @@ class StreamPause: self._pause_generator = generator if self._pause_generator is not None: - self._pause_cr = cocotb.fork(self._run_pause()) + self._pause_cr = cocotb.scheduler.start_soon(self._run_pause()) def clear_pause_generator(self): self.set_pause_generator(None)