You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/10/27 07:05:50 UTC
[incubator-nuttx] branch releases/10.0 updated: arch/sim: Enable
SIM_WALLTIME option by default
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/releases/10.0 by this push:
new 8d1fc32 arch/sim: Enable SIM_WALLTIME option by default
8d1fc32 is described below
commit 8d1fc32e547431d1a7ff4e71953c577d4b7e9b3d
Author: Sebastian Ene <se...@apache.org>
AuthorDate: Mon Oct 26 07:54:52 2020 +0200
arch/sim: Enable SIM_WALLTIME option by default
### Summary of Changes ###
Running the NuttX simulation 'as fast as possible' breaks the features
that depend on timing: eg. the Bluetooth stack. Enabling this option by
default SIM_WALLTIME=y will introduce delays and will tick the simulation at
a real pace.
Refresh defconfigs for sim targets and add depends on SIM_WALLTIME for
SIM_HCISOCKET.
Signed-off-by: Sebastian Ene <se...@apache.org>
---
arch/sim/Kconfig | 9 ++++-----
boards/sim/sim/sim/configs/bas/defconfig | 1 -
boards/sim/sim/sim/configs/bthcisock/defconfig | 1 -
boards/sim/sim/sim/configs/duktape/defconfig | 1 -
boards/sim/sim/sim/configs/ipforward/defconfig | 1 -
boards/sim/sim/sim/configs/loadable/defconfig | 1 -
boards/sim/sim/sim/configs/minibasic/defconfig | 1 -
boards/sim/sim/sim/configs/nsh/defconfig | 1 -
boards/sim/sim/sim/configs/nshcromfs/defconfig | 1 -
boards/sim/sim/sim/configs/rpproxy/defconfig | 1 -
boards/sim/sim/sim/configs/smp/defconfig | 1 -
boards/sim/sim/sim/configs/tcploop/defconfig | 1 -
boards/sim/sim/sim/configs/unionfs/defconfig | 1 -
13 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/arch/sim/Kconfig b/arch/sim/Kconfig
index a2f8bbf..1c09cac 100644
--- a/arch/sim/Kconfig
+++ b/arch/sim/Kconfig
@@ -99,7 +99,7 @@ endchoice
config SIM_WALLTIME
bool "Run the simulation at a fixed cadence in near real-time"
- default n
+ default y
if SIM_WALLTIME
choice
@@ -134,10 +134,9 @@ endif
config SIM_NETDEV
bool "Simulated Network Device"
default y
- depends on NET_ETHERNET
select ARCH_HAVE_NETDEV_STATISTICS
select SCHED_LPWORK
- select SIM_WALLTIME
+ depends on (NET_ETHERNET && SIM_WALLTIME)
---help---
Build in support for a simulated network device.
@@ -226,7 +225,7 @@ config SIM_X11FB
bool "Use X11 window"
default n
select SCHED_LPWORK
- select SIM_WALLTIME
+ depends on SIM_WALLTIME
---help---
Use an X11 graphics window to simulate the graphics device"
@@ -498,7 +497,7 @@ config SIM_QSPIFLASH_PAGESIZE
config SIM_HCISOCKET
bool "Attach Host Bluetooth"
default false
- depends on (WIRELESS_BLUETOOTH && HOST_LINUX)
+ depends on (WIRELESS_BLUETOOTH && HOST_LINUX && SIM_WALLTIME)
---help---
Attached the local bluetooth device to the simulation
target via HCI_CHANNEL_USER. This gives NuttX full
diff --git a/boards/sim/sim/sim/configs/bas/defconfig b/boards/sim/sim/sim/configs/bas/defconfig
index ef9a20e..cc32f04 100644
--- a/boards/sim/sim/sim/configs/bas/defconfig
+++ b/boards/sim/sim/sim/configs/bas/defconfig
@@ -39,7 +39,6 @@ CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
diff --git a/boards/sim/sim/sim/configs/bthcisock/defconfig b/boards/sim/sim/sim/configs/bthcisock/defconfig
index 1e9f9a5..eb7d1c9 100644
--- a/boards/sim/sim/sim/configs/bthcisock/defconfig
+++ b/boards/sim/sim/sim/configs/bthcisock/defconfig
@@ -64,7 +64,6 @@ CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
CONFIG_SIM_HCISOCKET=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_DAY=3
CONFIG_START_MONTH=4
CONFIG_SYSTEM_NSH=y
diff --git a/boards/sim/sim/sim/configs/duktape/defconfig b/boards/sim/sim/sim/configs/duktape/defconfig
index c1ea04b..58ccbd3 100644
--- a/boards/sim/sim/sim/configs/duktape/defconfig
+++ b/boards/sim/sim/sim/configs/duktape/defconfig
@@ -54,7 +54,6 @@ CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
diff --git a/boards/sim/sim/sim/configs/ipforward/defconfig b/boards/sim/sim/sim/configs/ipforward/defconfig
index d26b010..fbb880b 100644
--- a/boards/sim/sim/sim/configs/ipforward/defconfig
+++ b/boards/sim/sim/sim/configs/ipforward/defconfig
@@ -63,7 +63,6 @@ CONFIG_SCHED_LPWORKPRIORITY=140
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
diff --git a/boards/sim/sim/sim/configs/loadable/defconfig b/boards/sim/sim/sim/configs/loadable/defconfig
index dc0a0d8..f33f573 100644
--- a/boards/sim/sim/sim/configs/loadable/defconfig
+++ b/boards/sim/sim/sim/configs/loadable/defconfig
@@ -45,7 +45,6 @@ CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
CONFIG_SIM_M32=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=m
diff --git a/boards/sim/sim/sim/configs/minibasic/defconfig b/boards/sim/sim/sim/configs/minibasic/defconfig
index cde7b92..16e1b3d 100644
--- a/boards/sim/sim/sim/configs/minibasic/defconfig
+++ b/boards/sim/sim/sim/configs/minibasic/defconfig
@@ -49,7 +49,6 @@ CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
diff --git a/boards/sim/sim/sim/configs/nsh/defconfig b/boards/sim/sim/sim/configs/nsh/defconfig
index a63d529..1b04899 100644
--- a/boards/sim/sim/sim/configs/nsh/defconfig
+++ b/boards/sim/sim/sim/configs/nsh/defconfig
@@ -51,7 +51,6 @@ CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
diff --git a/boards/sim/sim/sim/configs/nshcromfs/defconfig b/boards/sim/sim/sim/configs/nshcromfs/defconfig
index 867170d..892acb7 100644
--- a/boards/sim/sim/sim/configs/nshcromfs/defconfig
+++ b/boards/sim/sim/sim/configs/nshcromfs/defconfig
@@ -44,7 +44,6 @@ CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_LZF=y
diff --git a/boards/sim/sim/sim/configs/rpproxy/defconfig b/boards/sim/sim/sim/configs/rpproxy/defconfig
index c20f1c0..b870a0e 100644
--- a/boards/sim/sim/sim/configs/rpproxy/defconfig
+++ b/boards/sim/sim/sim/configs/rpproxy/defconfig
@@ -47,7 +47,6 @@ CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_SIG_DEFAULT=y
-CONFIG_SIM_WALLTIME=y
CONFIG_SYSLOG_PREFIX=y
CONFIG_SYSLOG_PREFIX_STRING="proxy: "
CONFIG_SYSLOG_RPMSG=y
diff --git a/boards/sim/sim/sim/configs/smp/defconfig b/boards/sim/sim/sim/configs/smp/defconfig
index 87466ad..9762eb3 100644
--- a/boards/sim/sim/sim/configs/smp/defconfig
+++ b/boards/sim/sim/sim/configs/smp/defconfig
@@ -20,7 +20,6 @@ CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_WAITPID=y
-CONFIG_SIM_WALLTIME=y
CONFIG_SMP=y
CONFIG_SYSTEM_NSH=y
CONFIG_TESTING_OSTEST=y
diff --git a/boards/sim/sim/sim/configs/tcploop/defconfig b/boards/sim/sim/sim/configs/tcploop/defconfig
index fd9088b..a0a8318 100644
--- a/boards/sim/sim/sim/configs/tcploop/defconfig
+++ b/boards/sim/sim/sim/configs/tcploop/defconfig
@@ -65,7 +65,6 @@ CONFIG_SCHED_LPWORKPRIORITY=140
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/unionfs/defconfig
index 83cab21..f816ccd 100644
--- a/boards/sim/sim/sim/configs/unionfs/defconfig
+++ b/boards/sim/sim/sim/configs/unionfs/defconfig
@@ -41,7 +41,6 @@ CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
-CONFIG_SIM_WALLTIME=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y