summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog8
-rw-r--r--cpukit/posix/src/killinfo.c9
-rw-r--r--cpukit/posix/src/psignal.c2
3 files changed, 17 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index e9f358ea80..225e3c07dc 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-29 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * posix/src/killinfo.c: Add _Thread_Enable_dispatch() on EAGAIN
+ error case. Add debug print on loop processing threads waiting
+ for signal.
+ * posix/src/psignal.c: When the sigwait() Thread Queue processing loop
+ was changed to FIFO, I forgot to change the initialization to match.
+
2009-07-29 Roxana Leontie <roxana.leontie@gmail.com>
* libmisc/mw-fb/mw_fb.h: Cleaned code and added some more structures.
diff --git a/cpukit/posix/src/killinfo.c b/cpukit/posix/src/killinfo.c
index f0201a5bd6..7c0f38e95a 100644
--- a/cpukit/posix/src/killinfo.c
+++ b/cpukit/posix/src/killinfo.c
@@ -144,6 +144,11 @@ int killinfo(
the_thread = (Thread_Control *)the_node;
api = the_thread->API_Extensions[ THREAD_API_POSIX ];
+ #if defined(DEBUG_SIGNAL_PROCESSING)
+ printk( "Waiting Thread=%p option=0x%08x mask=0x%08x blocked=0x%08x\n",
+ the_thread, the_thread->Wait.option, mask, api->signals_blocked);
+ #endif
+
/*
* Is this thread is actually blocked waiting for the signal?
*/
@@ -332,8 +337,10 @@ post_process_signal:
psiginfo = (POSIX_signals_Siginfo_node *)
_Chain_Get( &_POSIX_signals_Inactive_siginfo );
- if ( !psiginfo )
+ if ( !psiginfo ) {
+ _Thread_Enable_dispatch();
rtems_set_errno_and_return_minus_one( EAGAIN );
+ }
psiginfo->Info = *siginfo;
diff --git a/cpukit/posix/src/psignal.c b/cpukit/posix/src/psignal.c
index 922908724e..60e9a7bfb7 100644
--- a/cpukit/posix/src/psignal.c
+++ b/cpukit/posix/src/psignal.c
@@ -196,7 +196,7 @@ void _POSIX_signals_Manager_Initialization(void)
*/
_Thread_queue_Initialize(
&_POSIX_signals_Wait_queue,
- THREAD_QUEUE_DISCIPLINE_PRIORITY,
+ THREAD_QUEUE_DISCIPLINE_FIFO,
STATES_WAITING_FOR_SIGNAL | STATES_INTERRUPTIBLE_BY_SIGNAL,
EAGAIN
);