Changeset cd792a86 in rtems

Timestamp:

02/03/99 22:12:28 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

7c7fd4d

Parents:

0747e2d

Message:

Patch from John S Gwynne <jsg@…> for malloctest. His comments:

I have a few patches for the efi332 bsp. If you let me know when you
expect the next snapshot release, I will try to have them to you
before then. Also, the malloctest has some problems that I would think
would prevent it from running on almost any platform. I have enclose
patches below to fix (1) Task_id and Task_name dimensioning, (2) end
of test message, (3) the amount of memory malloc'ed, and (4) retry on
unsuccessful (out of memory) molloc's.

Files:

• c/src/tests/libtests/malloctest/system.h (modified) (2 diffs)
• c/src/tests/libtests/malloctest/task1.c (modified) (3 diffs)
• testsuites/libtests/malloctest/system.h (modified) (2 diffs)
• testsuites/libtests/malloctest/task1.c (modified) (3 diffs)

c/src/tests/libtests/malloctest/system.h

@@ -40 +40 @@
 #define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3)
 
-#define CONFIGURE_EXTRA_TASK_STACKS (10 * RTEMS_MINIMUM_STACK_SIZE)
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <confdefs.h>
@@ -46 +46 @@
 /* global variables */
 
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
+TEST_EXTERN rtems_id   Task_id[ 6 ];         /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 6 ];       /* array of task names */
 
 /* end of include file */

c/src/tests/libtests/malloctest/task1.c

@@ -18 +18 @@
 #include <libcsupport.h>    /* for malloc_dump, malloc_walk */
 #include <string.h>         /* for memset */
+#include <stdlib.h>
 
 #define NUM_PASSES 100
@@ -38 +39 @@
   while (TRUE)
   {
-    if ( passes++ > NUM_PASSES )
+    if ( passes++ > NUM_PASSES ) {
+        puts("*** END OF MALLOC TEST ***");
         exit(0);
+    }
 
     status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
@@ -47 +50 @@
     print_time( " - rtems_clock_get - ", &time, "\n" );
 
-    mem_amt = rand() * task_number( tid );
+    mem_amt = ((int)((float)rand()*1000.0/(float)RAND_MAX));
+    while (!(mem_ptr = malloc ( mem_amt))) {
+        printf("out of memory... trying again.\n");
+        mem_amt = ((int)((float)rand()*1000.0/(float)RAND_MAX));
+    }
     printf("mallocing %d bytes\n",mem_amt);
-    mem_ptr = malloc ( mem_amt);
     memset( mem_ptr, mem_amt, mem_amt );
     malloc_dump();

testsuites/libtests/malloctest/system.h

@@ -40 +40 @@
 #define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3)
 
-#define CONFIGURE_EXTRA_TASK_STACKS (10 * RTEMS_MINIMUM_STACK_SIZE)
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <confdefs.h>
@@ -46 +46 @@
 /* global variables */
 
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
+TEST_EXTERN rtems_id   Task_id[ 6 ];         /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 6 ];       /* array of task names */
 
 /* end of include file */

testsuites/libtests/malloctest/task1.c

@@ -18 +18 @@
 #include <libcsupport.h>    /* for malloc_dump, malloc_walk */
 #include <string.h>         /* for memset */
+#include <stdlib.h>
 
 #define NUM_PASSES 100
@@ -38 +39 @@
   while (TRUE)
   {
-    if ( passes++ > NUM_PASSES )
+    if ( passes++ > NUM_PASSES ) {
+        puts("*** END OF MALLOC TEST ***");
         exit(0);
+    }
 
     status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
@@ -47 +50 @@
     print_time( " - rtems_clock_get - ", &time, "\n" );
 
-    mem_amt = rand() * task_number( tid );
+    mem_amt = ((int)((float)rand()*1000.0/(float)RAND_MAX));
+    while (!(mem_ptr = malloc ( mem_amt))) {
+        printf("out of memory... trying again.\n");
+        mem_amt = ((int)((float)rand()*1000.0/(float)RAND_MAX));
+    }
     printf("mallocing %d bytes\n",mem_amt);
-    mem_ptr = malloc ( mem_amt);
     memset( mem_ptr, mem_amt, mem_amt );
     malloc_dump();