diff options
| author | Anouk Van Laer <anouk.vanlaer@arm.com> | 2017-02-17 11:20:49 +0000 |
|---|---|---|
| committer | Anouk Van Laer <anouk.vanlaer@arm.com> | 2017-09-25 14:26:36 +0000 |
| commit | 1b48d293c4e7bb07dbd73b1759f119c5d32563c7 (patch) | |
| tree | 54634d6604751793b0e49534c2f7ef1d657da907 /src/dev/virtio/fs9p.hh | |
| parent | 0658925a8f64a9092599afa4a5432df2cc4812dc (diff) | |
| download | gem5-1b48d293c4e7bb07dbd73b1759f119c5d32563c7.tar.xz | |
dev, virtio: Improvements to diod process handling
* When dispatching multiple gem5 simulations at once, they race
for the socket id, resulting in a panic when calling 'bind'. To
avoid this problem, the socket id is now created before the diod
process is created. In case of a race, a panic is called in the
gem5 process, whereas before the panic was called in the diod
process where it didn't have any effect.
* In some cases killing the diod process in terminateDiod() using
only SIGTERM failed, so a call using SIGKILL is added.
Change-Id: Ie10741e10af52c8d255210cd4bfe0e5d761485d3
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Sascha Bischoff <sascha.bischoff@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/2821
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/dev/virtio/fs9p.hh')
| -rw-r--r-- | src/dev/virtio/fs9p.hh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dev/virtio/fs9p.hh b/src/dev/virtio/fs9p.hh index 786f58464..46525603d 100644 --- a/src/dev/virtio/fs9p.hh +++ b/src/dev/virtio/fs9p.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 ARM Limited + * Copyright (c) 2014-2017 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -305,6 +305,8 @@ class VirtIO9PDiod : public VirtIO9PProxy ssize_t read(uint8_t *data, size_t len); ssize_t write(const uint8_t *data, size_t len); + /** Kill the diod child process at the end of the simulation */ + void terminateDiod(); private: class DiodDataEvent : public PollEvent |