Merge branch 'apache:master' into ostest

Author: zzby0

.codespell-ignore-lines

@@ -1,2 +1,6 @@
       mynewt-nimble/nimble/host/services/ans/src/ble_svc_ans.c
       mynewt-nimble/nimble/host/services/ans/include
+#include "crypto/controlse/ccertificate.hxx"
+              object = new Controlse::CCertificate(
+          Controlse::CCertificate cert(se, settings->key_id);
+      auto certificate = Controlse::CCertificate(

.codespellrc

@@ -8,3 +8,6 @@ exclude-file = .codespell-ignore-lines
 # Ignore complete files (e.g. legal text or other immutable material).
 skip =
   LICENSE,
+
+# Ignore words list (FTP protocol commands and technical terms)
+ignore-words-list = ALLO

LICENSE

@@ -1282,7 +1282,7 @@ apps/system/telnet/telnet_client.c
    Copyright (C) 2017 Gregory Nutt. All rights reserved.
    Author: Gregory Nutt <[email protected]>
 
- The original authors of libtelnet are listed below.  Per their licesne,
+ The original authors of libtelnet are listed below.  Per their license,
  "The author or authors of this code dedicate any and all copyright
  interest in this code to the public domain. We make this dedication for
  the benefit of the public at large and to the detriment of our heirs and
@@ -2248,3 +2248,29 @@ AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
+
+
+netutils/bare/
+==============
+
+MIT License
+
+Copyright (c) 2022 Frank Smit
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

benchmarks/osperf/osperf.c

@@ -39,6 +39,7 @@
 #include <sys/poll.h>
 
 #include <nuttx/sched.h>
+#include <nuttx/spinlock.h>
 
 /****************************************************************************
  * Private Types
@@ -129,7 +130,7 @@ static size_t performance_gettime(FAR struct performance_time_s *result)
 }
 
 /****************************************************************************
- * Pthread swtich performance
+ * Pthread switch performance
  ****************************************************************************/
 
 static FAR void *pthread_switch_task(FAR void *arg)

benchmarks/ramspeed/CMakeLists.txt

@@ -0,0 +1,31 @@
+# ##############################################################################
+# apps/benchmarks/ramspeed/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_BENCHMARK_RAMSPEED)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_BENCHMARK_RAMSPEED_PROGNAME}
+    SRCS
+    ramspeed_main.c
+    STACKSIZE
+    ${CONFIG_BENCHMARK_RAMSPEED_STACKSIZE}
+    PRIORITY
+    ${CONFIG_BENCHMARK_RAMSPEED_PRIORITY})
+endif()

benchmarks/tacle-bench/0001-tacle-bench-add-makefile-and-all-in-one-main-file.patch

@@ -1,10 +1,11 @@
-From 71f51cd5ca4f492a464fb12d5bce91e5fbba300a Mon Sep 17 00:00:00 2001
+From 6d0be04a4b4208447e75c369e9811d089f466739 Mon Sep 17 00:00:00 2001
 From: ouyangxiangzhen <[email protected]>
-Date: Tue, 11 Jun 2024 16:01:23 +0800
+Date: Thu, 3 Apr 2025 11:59:02 +0800
 Subject: [PATCH] tacle-bench: add makefile and all-in-one main file
 
 The original taclebench is used for WCET analysis. This commit allows most taclebench test cases (except parallel test cases) to be compiled and executed.
 
+Change-Id: I707b8ac58d3ddc4b7974c5bedecac1a7b5c887f9
 Signed-off-by: ouyangxiangzhen <[email protected]>
 ---
  Makefile                                      |  12 +
@@ -65,14 +66,14 @@ Signed-off-by: ouyangxiangzhen <[email protected]>
  bench/test/cover/cover.c                      |   3 +
  bench/test/duff/duff.c                        |   3 +
  bench/test/test3/test3.c                      |   3 +
- taclebench.c                                  | 349 ++++++++++++++++++
- 59 files changed, 532 insertions(+)
+ taclebench.c                                  | 366 ++++++++++++++++++
+ 59 files changed, 549 insertions(+)
  create mode 100644 Makefile
  create mode 100644 taclebench.c
 
 diff --git a/Makefile b/Makefile
 new file mode 100644
-index 0000000..2385c61
+index 0000000..75ca0a1
 --- /dev/null
 +++ b/Makefile
 @@ -0,0 +1,12 @@
@@ -83,7 +84,7 @@ index 0000000..2385c61
 +TEST_SRCS := $(shell find bench/test -name "*.c")
 +
 +all:
-+	cc -DALL_IN_ONE ${APP_SRCS} ${KERNEL_SRCS} ${SEQUENTIAL_SRCS} ${TEST_SRCS} bench/kernel/cosf/wcclibm.c taclebench.c -static -o taclebench
++	cc -DALL_IN_ONE ${APP_SRCS} ${KERNEL_SRCS} ${SEQUENTIAL_SRCS} ${TEST_SRCS} bench/kernel/cosf/wcclibm.c taclebench.c -static -o taclebench -O3
 +
 +clean:
 +	rm -f taclebench
@@ -888,11 +889,12 @@ index 0235738..6eaf8c2 100755
 
 diff --git a/taclebench.c b/taclebench.c
 new file mode 100644
-index 0000000..1231b87
+index 0000000..aaff1bb
 --- /dev/null
 +++ b/taclebench.c
-@@ -0,0 +1,349 @@
+@@ -0,0 +1,366 @@
 +#include <stdio.h>
++#include <time.h>
 +
 +int main_epic(void);
 +int main_mpeg2(void);
@@ -954,6 +956,10 @@ index 0000000..1231b87
 +
 +int main(void)
 +{
++  struct timespec start_ts;
++  struct timespec end_ts;
++  clock_gettime(CLOCK_MONOTONIC, &start_ts);
++
 +  if (main_epic() != 0)
 +    {
 +      printf("main_epic error\n");
@@ -1239,6 +1245,18 @@ index 0000000..1231b87
 +      printf("main_bitonic error\n");
 +    }
 +
++  clock_gettime(CLOCK_MONOTONIC, &end_ts);
++  long sec_diff = end_ts.tv_sec - start_ts.tv_sec;
++  long nsec_diff = end_ts.tv_nsec - start_ts.tv_nsec;
++
++  if (nsec_diff < 0)
++    {
++      sec_diff  -= 1;
++      nsec_diff += 1000000000;
++    }
++
++  printf("%ld.%09ld seconds\n", sec_diff, nsec_diff);
++
 +  return 0;
 +}
 -- 

benchmarks/whetstone/CMakeLists.txt

@@ -0,0 +1,31 @@
+# ##############################################################################
+# apps/benchmarks/whetstone/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_BENCHMARK_WHETSTONE)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_BENCHMARK_WHETSTONE_PROGNAME}
+    SRCS
+    whetstone.c
+    STACKSIZE
+    ${CONFIG_BENCHMARK_WHETSTONE_STACKSIZE}
+    PRIORITY
+    ${CONFIG_BENCHMARK_WHETSTONE_PRIORITY})
+endif()

benchmarks/whetstone/Kconfig

@@ -0,0 +1,34 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config BENCHMARK_WHETSTONE
+	tristate "Double Precision Benchmark"
+	default n
+	depends on ALLOW_CUSTOM_PERMISSIVE_COMPONENTS
+	---help---
+		Enable a Whetstone test.
+
+		This benchmark is based on the C converted version from
+		https://www.netlib.org/benchmark/whetstone.c which has a
+		custom permissive license requiring attribution.
+
+if BENCHMARK_WHETSTONE
+
+config BENCHMARK_WHETSTONE_PROGNAME
+	string "Program name"
+	default "whetstone"
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		program is installed.
+
+config BENCHMARK_WHETSTONE_PRIORITY
+	int "Whetstone test task priority"
+	default 100
+
+config BENCHMARK_WHETSTONE_STACKSIZE
+	int "Whetstone test stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif

benchmarks/whetstone/Make.defs

@@ -0,0 +1,23 @@
+############################################################################
+# apps/benchmarks/whetstone/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_BENCHMARK_WHETSTONE),)
+CONFIGURED_APPS += $(APPDIR)/benchmarks/whetstone
+endif

benchmarks/whetstone/Makefile

@@ -0,0 +1,32 @@
+############################################################################
+# apps/benchmarks/whetstone/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# WHETSTONE speed test
+
+PROGNAME = $(CONFIG_BENCHMARK_WHETSTONE_PROGNAME)
+PRIORITY = $(CONFIG_BENCHMARK_WHETSTONE_PRIORITY)
+STACKSIZE = $(CONFIG_BENCHMARK_WHETSTONE_STACKSIZE)
+MODULE = $(CONFIG_BENCHMARK_WHETSTONE)
+
+MAINSRC = whetstone.c
+
+include $(APPDIR)/Application.mk