e4d5c78008
When using pthread_kill, the signal should be delivered to the specified thread. Current implementation, however, may add the signal to the groups pending list, if the signal is masked at the time of dispatch. From the group's pending list it can be delivered to any thread of the group, which is wrong. Fix this by adding a new field "FAR struct tcb_s *tcb" to "struct sigpendq", marking if the signal needs to be delivered to a specific thread. Use NULL for the value if delivery to any thread in the group is ok. Signed-off-by: Jukka Laitinen <jukka.laitinen@tii.ae>
91 lines
2.8 KiB
C
91 lines
2.8 KiB
C
/****************************************************************************
|
|
* sched/signal/sig_removependingsignal.c
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the
|
|
* License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#include <unistd.h>
|
|
#include <signal.h>
|
|
#include <time.h>
|
|
#include <assert.h>
|
|
#include <debug.h>
|
|
#include <sched.h>
|
|
|
|
#include <nuttx/irq.h>
|
|
#include <nuttx/arch.h>
|
|
#include <nuttx/wdog.h>
|
|
#include <nuttx/kmalloc.h>
|
|
|
|
#include "signal/signal.h"
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: nxsig_remove_pendingsignal
|
|
*
|
|
* Description:
|
|
* Remove the specified signal from the signal pending list
|
|
*
|
|
****************************************************************************/
|
|
|
|
FAR sigpendq_t *nxsig_remove_pendingsignal(FAR struct tcb_s *stcb, int signo)
|
|
{
|
|
FAR struct task_group_s *group = stcb->group;
|
|
FAR sigpendq_t *currsig;
|
|
FAR sigpendq_t *prevsig;
|
|
irqstate_t flags;
|
|
|
|
DEBUGASSERT(group);
|
|
|
|
flags = enter_critical_section();
|
|
|
|
/* If stcb == NULL, the signal is for whole group. Otherwise only
|
|
* remove the one which is to be delivered to the stcb
|
|
*/
|
|
|
|
for (prevsig = NULL,
|
|
currsig = (FAR sigpendq_t *)group->tg_sigpendingq.head;
|
|
currsig && (currsig->info.si_signo != signo ||
|
|
(currsig->tcb != NULL && currsig->tcb != stcb));
|
|
prevsig = currsig, currsig = currsig->flink);
|
|
|
|
if (currsig)
|
|
{
|
|
if (prevsig)
|
|
{
|
|
sq_remafter((FAR sq_entry_t *)prevsig, &group->tg_sigpendingq);
|
|
}
|
|
else
|
|
{
|
|
sq_remfirst(&group->tg_sigpendingq);
|
|
}
|
|
}
|
|
|
|
leave_critical_section(flags);
|
|
|
|
return currsig;
|
|
}
|