[PATCH 4/5] Switch all tests to unlimited objects and unified workspace

Joel Sherrill joel at rtems.org
Fri May 21 19:16:01 UTC 2021


---
 dnstest/init.c       |  9 ++++-----
 http/init.c          | 12 ++++--------
 mcast/init.c         |  3 +--
 netdemo/init.c       |  9 ++++-----
 nfsClientTest/init.c |  7 +++----
 ntp/init.c           |  9 ++++-----
 rpc_demo/init.c      |  5 ++---
 select/init.c        |  9 ++++-----
 telnetd/init.c       |  7 +++----
 tftpTest/init.c      |  9 ++++-----
 ttcp/init.c          |  7 ++++---
 11 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/dnstest/init.c b/dnstest/init.c
index 2f245ac..a7cd077 100644
--- a/dnstest/init.c
+++ b/dnstest/init.c
@@ -39,13 +39,12 @@ Init (rtems_task_argument ignored)
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 
-#define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES	20
-#define CONFIGURE_MAXIMUM_TASKS		20
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
 
-#define CONFIGURE_MICROSECONDS_PER_TICK	10000
+#define CONFIGURE_MAXIMUM_TASKS		20
 
-#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
+#define CONFIGURE_INIT_TASK_STACK_SIZE	(16*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY	100
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
diff --git a/http/init.c b/http/init.c
index 7ddf49c..dab82db 100644
--- a/http/init.c
+++ b/http/init.c
@@ -176,21 +176,17 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS	20
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 
-#define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES	20
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
+
 #define CONFIGURE_MAXIMUM_TASKS		20
 
 #if defined(USE_MONGOOSE_HTTPD)
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 30
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
 #define CONFIGURE_MINIMUM_TASK_STACK_SIZE (32 * 1024)
-#define CONFIGURE_UNIFIED_WORK_AREAS
 #endif
 
-#define CONFIGURE_MICROSECONDS_PER_TICK	10000
-
-#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
+#define CONFIGURE_INIT_TASK_STACK_SIZE	(16*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY	120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
diff --git a/mcast/init.c b/mcast/init.c
index 29073a9..163fae9 100644
--- a/mcast/init.c
+++ b/mcast/init.c
@@ -72,13 +72,12 @@ Init (rtems_task_argument ignored)
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 
-#define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024)
 #define CONFIGURE_MAXIMUM_SEMAPHORES 20
 #define CONFIGURE_MAXIMUM_TASKS      20
 
 #define CONFIGURE_MICROSECONDS_PER_TICK 10000
 
-#define CONFIGURE_INIT_TASK_STACK_SIZE (10*1024)
+#define CONFIGURE_INIT_TASK_STACK_SIZE (16*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY   120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
diff --git a/netdemo/init.c b/netdemo/init.c
index c5d9963..b7d14a4 100644
--- a/netdemo/init.c
+++ b/netdemo/init.c
@@ -44,13 +44,12 @@ Init (rtems_task_argument ignored)
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 
-#define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES 20
-#define CONFIGURE_MAXIMUM_TASKS      20
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
 
-#define CONFIGURE_MICROSECONDS_PER_TICK 10000
+#define CONFIGURE_MAXIMUM_TASKS      20
 
-#define CONFIGURE_INIT_TASK_STACK_SIZE (10*1024)
+#define CONFIGURE_INIT_TASK_STACK_SIZE (16*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY   120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
diff --git a/nfsClientTest/init.c b/nfsClientTest/init.c
index a75a4e8..95b709f 100644
--- a/nfsClientTest/init.c
+++ b/nfsClientTest/init.c
@@ -106,11 +106,10 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS	20
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 
-#define CONFIGURE_MEMORY_OVERHEAD       256
-#define CONFIGURE_MESSAGE_BUFFER_MEMORY 32 * 1024
-#define CONFIGURE_MAXIMUM_SEMAPHORES	40
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
+
 #define CONFIGURE_MAXIMUM_TASKS		20
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES	20
 
 #define CONFIGURE_MICROSECONDS_PER_TICK	1000
 
diff --git a/ntp/init.c b/ntp/init.c
index a2705ef..d29dda4 100644
--- a/ntp/init.c
+++ b/ntp/init.c
@@ -63,13 +63,12 @@ Init (rtems_task_argument ignored)
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 
-#define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES	20
-#define CONFIGURE_MAXIMUM_TASKS		20
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
 
-#define CONFIGURE_MICROSECONDS_PER_TICK	10000
+#define CONFIGURE_MAXIMUM_TASKS		20
 
-#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
+#define CONFIGURE_INIT_TASK_STACK_SIZE	(16*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY	120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
diff --git a/rpc_demo/init.c b/rpc_demo/init.c
index faca00a..d00f8ab 100644
--- a/rpc_demo/init.c
+++ b/rpc_demo/init.c
@@ -56,11 +56,10 @@ void pmap_unset () { ; }
 #define CONFIGURE_STACK_CHECKER_ENABLED
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS   2
-#define CONFIGURE_MAXIMUM_SEMAPHORES	    20
 #define CONFIGURE_MAXIMUM_TASKS		    12
 
-#define CONFIGURE_MICROSECONDS_PER_TICK       20000
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
 
 #define CONFIGURE_INIT_TASK_PRIORITY	99
 #define CONFIGURE_INIT_TASK_STACK_SIZE	(16*1024)
diff --git a/select/init.c b/select/init.c
index e56dc8b..fef49a0 100644
--- a/select/init.c
+++ b/select/init.c
@@ -39,13 +39,12 @@ Init (rtems_task_argument ignored)
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 
-#define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES	20
-#define CONFIGURE_MAXIMUM_TASKS		20
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
 
-#define CONFIGURE_MICROSECONDS_PER_TICK	10000
+#define CONFIGURE_MAXIMUM_TASKS		20
 
-#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
+#define CONFIGURE_INIT_TASK_STACK_SIZE	(16*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY	120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
diff --git a/telnetd/init.c b/telnetd/init.c
index 5c2d8b0..b12bb71 100644
--- a/telnetd/init.c
+++ b/telnetd/init.c
@@ -209,11 +209,10 @@ rtems_task Init(
 
 #define CONFIGURE_STACK_CHECKER_ENABLED
 
-#define CONFIGURE_MEMORY_OVERHEAD         256
-#define CONFIGURE_MESSAGE_BUFFER_MEMORY   (32 * 1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES	  40
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
+
 #define CONFIGURE_MAXIMUM_TASKS		  20
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES  20
 
 #define CONFIGURE_MICROSECONDS_PER_TICK	1000
 
diff --git a/tftpTest/init.c b/tftpTest/init.c
index 66723ad..db37278 100644
--- a/tftpTest/init.c
+++ b/tftpTest/init.c
@@ -57,13 +57,12 @@ Init (rtems_task_argument ignored)
 #define CONFIGURE_FILESYSTEM_IMFS
 #define CONFIGURE_FILESYSTEM_TFTPFS
 
-#define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES	20
-#define CONFIGURE_MAXIMUM_TASKS		20
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
 
-#define CONFIGURE_MICROSECONDS_PER_TICK	10000
+#define CONFIGURE_MAXIMUM_TASKS		20
 
-#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
+#define CONFIGURE_INIT_TASK_STACK_SIZE	(16*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY	100
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
diff --git a/ttcp/init.c b/ttcp/init.c
index 39749c9..c3d2372 100644
--- a/ttcp/init.c
+++ b/ttcp/init.c
@@ -39,13 +39,14 @@ Init (rtems_task_argument ignored)
 #define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 20
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 
-#define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES	20
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
+
 #define CONFIGURE_MAXIMUM_TASKS		20
 
 #define CONFIGURE_MICROSECONDS_PER_TICK	1000
 
-#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
+#define CONFIGURE_INIT_TASK_STACK_SIZE	(16*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY	100
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
                                            RTEMS_NO_TIMESLICE | \
-- 
1.8.3.1



More information about the devel mailing list