Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-09 09:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

posix: Fix return states of pthread_kill()

Browse Source 
POSIX mandates that an error code is returned and not -1 plus errno.

Update #2715.
This commit is contained in:
Sebastian Huber
2016-05-17 13:39:15 +02:00
parent 94b1ba5aed
commit f502882ef5
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cpukit/posix/src/pthreadkill.c
View File

@@ -28,7 +28,6 @@
#include <rtems/posix/psignalimpl.h> #include <rtems/posix/psignalimpl.h>
#include <rtems/score/isr.h> #include <rtems/score/isr.h>
#include <rtems/score/threadimpl.h> #include <rtems/score/threadimpl.h>
#include <rtems/seterr.h>
int pthread_kill( int pthread_kill(
pthread_t thread, pthread_t thread,
@@ -39,11 +38,9 @@ int pthread_kill(
Thread_Control *the_thread; Thread_Control *the_thread;
Objects_Locations location; Objects_Locations location;
if ( !sig ) if ( !is_valid_signo( sig ) ) {
rtems_set_errno_and_return_minus_one( EINVAL ); return EINVAL;
}
if ( !is_valid_signo(sig) )
rtems_set_errno_and_return_minus_one( EINVAL );
the_thread = _Thread_Get( thread, &location ); the_thread = _Thread_Get( thread, &location );
switch ( location ) { switch ( location ) {
@@ -55,19 +52,16 @@ int pthread_kill(
api = the_thread->API_Extensions[ THREAD_API_POSIX ]; api = the_thread->API_Extensions[ THREAD_API_POSIX ];
if ( sig ) { if ( _POSIX_signals_Vectors[ sig ].sa_handler == SIG_IGN ) {
_Objects_Put( &the_thread->Object );
if ( _POSIX_signals_Vectors[ sig ].sa_handler == SIG_IGN ) { return 0;
_Objects_Put( &the_thread->Object );
return 0;
}
/* XXX critical section */
api->signals_pending |= signo_to_mask( sig );
(void) _POSIX_signals_Unblock_thread( the_thread, sig, NULL );
} }
/* XXX critical section */
api->signals_pending |= signo_to_mask( sig );
(void) _POSIX_signals_Unblock_thread( the_thread, sig, NULL );
_Objects_Put( &the_thread->Object ); _Objects_Put( &the_thread->Object );
return 0; return 0;
@@ -78,5 +72,5 @@ int pthread_kill(
break; break;
} }
rtems_set_errno_and_return_minus_one( ESRCH ); return ESRCH;
} }

8
testsuites/psxtests/psx04/init.c
View File

@@ -543,15 +543,11 @@ void *POSIX_Init(
puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid to large)" ); puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid to large)" );
status = pthread_kill( Init_id, 999 ); status = pthread_kill( Init_id, 999 );
if ( status != -1 ) rtems_test_assert( status == EINVAL );
printf( "status = %d\n", status );
rtems_test_assert( errno == EINVAL );
puts( "Init: pthread_kill - EINVAL (sig invalid)" ); puts( "Init: pthread_kill - EINVAL (sig invalid)" );
status = pthread_kill( Init_id, 0 ); status = pthread_kill( Init_id, 0 );
if ( status != -1 ) rtems_test_assert( status == EINVAL );
printf( "status = %d\n", status );
rtems_test_assert( errno == EINVAL );
puts( "Init: pthread_kill - EINVAL (signal = 0)" ); puts( "Init: pthread_kill - EINVAL (signal = 0)" );
act.sa_handler = SIG_IGN; act.sa_handler = SIG_IGN;