Changeset b3a6713 in rtems

Timestamp:

08/16/01 21:36:15 (22 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

cbdb144

Parents:

5ccb03b

Message:

2001-08-16 Joel Sherrill <joel@…>

• src/mqueuesendsupp.c: Account for possibly blocking during the core send operation.

2001-08-16 Joel Sherrill <joel@…>

• src/msgqsubmit.c: Add a comment indicating that we do not have to account for possibly blocking during the core send operation because Classic API message queue send is always non-blocking.

2001-08-16 Joel Sherrill <joel@…>

• include/rtems/score/coremsg.h, src/coremsgsubmit.c: Add a new return status to account for blocking sends. Otherwise, the caller will think that the returned message status will have the ultimate results of the operation. If the send times out, the final status will be in the return_code of the thread.

2001-08-16 Joel Sherrill <joel@…>

• src/coremutexsurrender.c: Use holder thread not executing thread because even though they may and often are the same it is not guaranteed unless the proper attribute is set.

2001-08-16 Joel Sherrill <joel@…>

• startup/linkcmds: Modified to work better with gcc 2.8.1 and gnat 3.13p.

2001-08-16 Joel Sherrill <joel@…>

• tools/runtest.in: Recognize debug variant of monitor test.

2001-08-16 Joel Sherrill <joel@…>

• sp13/sp13.scn: Id in screen had wrong class field value.
• sp13/system.h: Account for message buffer memory.
• sp13/task2.c: Remove unnecessary check for failure.

2001-08-16 Joel Sherrill <joel@…>

• sp20/system.h: Account for extra task stacks properly.

2001-08-16 Joel Sherrill <joel@…>

• include/tmacros.h: Attempt to print errno as further information.

Location:

c/src

Files:

• exec/posix/src/mqueuesendsupp.c (modified) (1 diff)
• exec/rtems/src/msgqsubmit.c (modified) (1 diff)
• exec/score/include/rtems/score/coremsg.h (modified) (1 diff)
• exec/score/src/coremsgsubmit.c (modified) (1 diff)
• exec/score/src/coremutexsurrender.c (modified) (1 diff)
• lib/libbsp/powerpc/psim/startup/linkcmds (modified) (1 diff)
• lib/libbsp/sparc/erc32/tools/runtest.in (modified) (1 diff)
• tests/sptests/sp13/sp13.scn (modified) (1 diff)
• tests/sptests/sp13/system.h (modified) (1 diff)
• tests/sptests/sp13/task2.c (modified) (1 diff)
• tests/sptests/sp20/system.h (modified) (1 diff)
• tests/support/include/tmacros.h (modified) (1 diff)

c/src/exec/posix/src/mqueuesendsupp.c

@@ -88 +88 @@
 
       _Thread_Enable_dispatch();
+
+      /*
+       *  If we had to block, then this is where the task returns
+       *  after it wakes up.  The returned status is correct for
+       *  non-blocking operations but if we blocked, then we need 
+       *  to look at the status in our TCB.
+       */
+
+      if ( msg_status == CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_WAIT )
+        msg_status = _Thread_Executing->Wait.return_code;
+
       if ( !msg_status )
-        return 0;
+        return msg_status;
 
       set_errno_and_return_minus_one(

c/src/exec/rtems/src/msgqsubmit.c

@@ -133 +133 @@
 
       _Thread_Enable_dispatch();
+      /*
+       *  Since this API does not allow for blocking sends, we can directly
+       *  return the returned msg_status.
+       */
+
       return
         _Message_queue_Translate_core_message_queue_return_code( msg_status );

c/src/exec/score/include/rtems/score/coremsg.h

@@ -96 +96 @@
   CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_NOWAIT,
   CORE_MESSAGE_QUEUE_STATUS_WAS_DELETED,
-  CORE_MESSAGE_QUEUE_STATUS_TIMEOUT
+  CORE_MESSAGE_QUEUE_STATUS_TIMEOUT,
+  CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_WAIT
 }   CORE_message_queue_Status;
 

c/src/exec/score/src/coremsgsubmit.c

@@ -172 +172 @@
   }
 
-  return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
+  return CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_WAIT;
 }

c/src/exec/score/src/coremutexsurrender.c

@@ -87 +87 @@
   }
 
-  _Thread_Executing->resource_count--;
+  holder->resource_count--;
   the_mutex->holder    = NULL;
   the_mutex->holder_id = 0;

c/src/lib/libbsp/powerpc/psim/startup/linkcmds

@@ -65 +65 @@
     *(.gnu.warning)
   } >RAM
-  .init           : { *(.init)          } >RAM
-  .fini           : { *(.fini)          } >RAM
+  .init           : { __init = .; *(.init)              } >RAM
+  .fini           : { __fini = .; *(.fini)              } >RAM
   .rodata         : { *(.rodata) *(.gnu.linkonce.r*) } >RAM
   .rodata1        : { *(.rodata1)       } >RAM

c/src/lib/libbsp/sparc/erc32/tools/runtest.in

@@ -132 +132 @@
 
    case $tname in
-       monitor)
+       monitor*)
            if [ $run_to_completion = "yes" ]
            then

c/src/tests/sptests/sp13/sp13.scn

@@ -1 +1 @@
 *** TEST 13 ***
-TA1 - rtems_message_queue_ident - qid => 18010001
+TA1 - rtems_message_queue_ident - qid => 1c010001
 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1
 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1

c/src/tests/sptests/sp13/system.h

@@ -54 +54 @@
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
+#define CONFIGURE_MEMORY_OVERHEAD           32
 #define CONFIGURE_EXTRA_TASK_STACKS         (3 * RTEMS_MINIMUM_STACK_SIZE)
 

c/src/tests/sptests/sp13/task2.c

@@ -101 +101 @@
   Fill_buffer( "BUFFER 2 TO Q 2", (long *)buffer );
   puts( "TA2 - rtems_message_queue_send - BUFFER 2 TO Q 2" );
-  directive_failed( status, "rtems_message_queue_send" );
-
   status = rtems_message_queue_send( Queue_id[ 2 ], buffer, MESSAGE_SIZE );
   directive_failed( status, "rtems_message_queue_send" );

c/src/tests/sptests/sp20/system.h

@@ -46 +46 @@
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
-#define CONFIGURE_EXTRA_TASK_STACKS         (15 * RTEMS_MINIMUM_STACK_SIZE)
+#define CONFIGURE_EXTRA_TASK_STACKS         (6 * 3 * RTEMS_MINIMUM_STACK_SIZE)
 
 #include <confdefs.h>

c/src/tests/support/include/tmacros.h

@@ -92 +92 @@
     check_dispatch_disable_level( _level ); \
     if ( (_stat) != (_desired) ) { \
-      printf( "\n%s FAILED -- expected (%s) got (%s)\n", \
-              (_msg), strerror(_desired), strerror(_stat) ); \
+      printf( "\n%s FAILED -- expected (%d - %s) got (%d - %s)\n", \
+              (_msg), _desired, strerror(_desired), _stat, strerror(_stat) ); \
+      printf( "\n FAILED -- errno (%d - %s)\n", \
+              errno, strerror(errno) ); \
       fflush(stdout); \
       exit( _stat ); \