Break up some long lines

This commit is contained in:
Gregory Nutt 2017-06-14 13:42:56 -06:00
parent 04ae3d51c2
commit 2245dddaf9
9 changed files with 34 additions and 18 deletions

View File

@ -223,7 +223,8 @@ int os_smp_start(void)
* this task is locked to this CPU. * this task is locked to this CPU.
*/ */
tcb->flags = (TCB_FLAG_TTYPE_KERNEL | TCB_FLAG_NONCANCELABLE | TCB_FLAG_CPU_LOCKED); tcb->flags = (TCB_FLAG_TTYPE_KERNEL | TCB_FLAG_NONCANCELABLE |
TCB_FLAG_CPU_LOCKED);
tcb->cpu = cpu; tcb->cpu = cpu;
} }

View File

@ -543,7 +543,8 @@ void os_start(void)
sem_initialize(); sem_initialize();
#if defined(MM_KERNEL_USRHEAP_INIT) || defined(CONFIG_MM_KERNEL_HEAP) || defined(CONFIG_MM_PGALLOC) #if defined(MM_KERNEL_USRHEAP_INIT) || defined(CONFIG_MM_KERNEL_HEAP) || \
defined(CONFIG_MM_PGALLOC)
/* Initialize the memory manager */ /* Initialize the memory manager */
{ {

View File

@ -447,7 +447,8 @@ void sched_note_cpu_start(FAR struct tcb_s *tcb, int cpu)
/* Format the note */ /* Format the note */
note_common(tcb, &note.ncs_cmn, sizeof(struct note_cpu_start_s), NOTE_CPU_START); note_common(tcb, &note.ncs_cmn, sizeof(struct note_cpu_start_s),
NOTE_CPU_START);
note.ncs_target = (uint8_t)cpu; note.ncs_target = (uint8_t)cpu;
/* Add the note to circular buffer */ /* Add the note to circular buffer */
@ -461,7 +462,8 @@ void sched_note_cpu_started(FAR struct tcb_s *tcb)
/* Format the note */ /* Format the note */
note_common(tcb, &note.ncs_cmn, sizeof(struct note_cpu_started_s), NOTE_CPU_STARTED); note_common(tcb, &note.ncs_cmn, sizeof(struct note_cpu_started_s),
NOTE_CPU_STARTED);
/* Add the note to circular buffer */ /* Add the note to circular buffer */
@ -474,7 +476,8 @@ void sched_note_cpu_pause(FAR struct tcb_s *tcb, int cpu)
/* Format the note */ /* Format the note */
note_common(tcb, &note.ncp_cmn, sizeof(struct note_cpu_pause_s), NOTE_CPU_PAUSE); note_common(tcb, &note.ncp_cmn, sizeof(struct note_cpu_pause_s),
NOTE_CPU_PAUSE);
note.ncp_target = (uint8_t)cpu; note.ncp_target = (uint8_t)cpu;
/* Add the note to circular buffer */ /* Add the note to circular buffer */
@ -488,7 +491,8 @@ void sched_note_cpu_paused(FAR struct tcb_s *tcb)
/* Format the note */ /* Format the note */
note_common(tcb, &note.ncp_cmn, sizeof(struct note_cpu_paused_s), NOTE_CPU_PAUSED); note_common(tcb, &note.ncp_cmn, sizeof(struct note_cpu_paused_s),
NOTE_CPU_PAUSED);
/* Add the note to circular buffer */ /* Add the note to circular buffer */
@ -501,7 +505,8 @@ void sched_note_cpu_resume(FAR struct tcb_s *tcb, int cpu)
/* Format the note */ /* Format the note */
note_common(tcb, &note.ncr_cmn, sizeof(struct note_cpu_resume_s), NOTE_CPU_RESUME); note_common(tcb, &note.ncr_cmn, sizeof(struct note_cpu_resume_s),
NOTE_CPU_RESUME);
note.ncr_target = (uint8_t)cpu; note.ncr_target = (uint8_t)cpu;
/* Add the note to circular buffer */ /* Add the note to circular buffer */
@ -515,7 +520,8 @@ void sched_note_cpu_resumed(FAR struct tcb_s *tcb)
/* Format the note */ /* Format the note */
note_common(tcb, &note.ncr_cmn, sizeof(struct note_cpu_resumed_s), NOTE_CPU_RESUMED); note_common(tcb, &note.ncr_cmn, sizeof(struct note_cpu_resumed_s),
NOTE_CPU_RESUMED);
/* Add the note to circular buffer */ /* Add the note to circular buffer */

View File

@ -103,4 +103,5 @@ void sched_resume_scheduler(FAR struct tcb_s *tcb)
} }
#endif /* CONFIG_RR_INTERVAL > 0 || CONFIG_SCHED_SPORADIC || CONFIG_SCHED_INSTRUMENTATION */ #endif /* CONFIG_RR_INTERVAL > 0 || CONFIG_SCHED_SPORADIC || \
* CONFIG_SCHED_INSTRUMENTATION */

View File

@ -439,7 +439,8 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem, static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
FAR void *arg) FAR void *arg)
{ {
#if 0 // Need to revisit this, but these assumptions seem to be untrue -- OR there is a bug??? #if 0 /* Need to revisit this, but these assumptions seem to be untrue -- \
* OR there is a bug??? */
FAR struct tcb_s *htcb = (FAR struct tcb_s *)pholder->htcb; FAR struct tcb_s *htcb = (FAR struct tcb_s *)pholder->htcb;
/* Called after a semaphore has been released (incremented), the semaphore /* Called after a semaphore has been released (incremented), the semaphore

View File

@ -106,8 +106,9 @@ void sig_deliver(FAR struct tcb_s *stcb)
* delivered plus the signal being delivered. * delivered plus the signal being delivered.
*/ */
savesigprocmask = stcb->sigprocmask; savesigprocmask = stcb->sigprocmask;
stcb->sigprocmask = savesigprocmask | sigq->mask | SIGNO2SET(sigq->info.si_signo); stcb->sigprocmask = savesigprocmask | sigq->mask |
SIGNO2SET(sigq->info.si_signo);
/* Deliver the signal. In the kernel build this has to be handled /* Deliver the signal. In the kernel build this has to be handled
* differently if we are dispatching to a signal handler in a user- * differently if we are dispatching to a signal handler in a user-

View File

@ -315,9 +315,9 @@ int sig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
if (sigismember(&stcb->sigprocmask, info->si_signo)) if (sigismember(&stcb->sigprocmask, info->si_signo))
{ {
/* Check if the task is waiting for this pending signal. If so, then unblock it. /* Check if the task is waiting for this pending signal. If so, then
* This must be performed in a critical section because signals can be queued * unblock it. This must be performed in a critical section because
* from the interrupt level. * signals can be queued * from the interrupt level.
*/ */
flags = enter_critical_section(); flags = enter_critical_section();

View File

@ -129,14 +129,18 @@ int prctl(int option, ...)
if (option == PR_SET_NAME) if (option == PR_SET_NAME)
{ {
/* Ensure that tcb->name will be null-terminated, truncating if necessary */ /* Ensure that tcb->name will be null-terminated, truncating if
* necessary.
*/
strncpy(tcb->name, name, CONFIG_TASK_NAME_SIZE); strncpy(tcb->name, name, CONFIG_TASK_NAME_SIZE);
tcb->name[CONFIG_TASK_NAME_SIZE] = '\0'; tcb->name[CONFIG_TASK_NAME_SIZE] = '\0';
} }
else else
{ {
/* The returned value will be null-terminated, truncating if necessary */ /* The returned value will be null-terminated, truncating if
* necessary.
*/
strncpy(name, tcb->name, CONFIG_TASK_NAME_SIZE-1); strncpy(name, tcb->name, CONFIG_TASK_NAME_SIZE-1);
name[CONFIG_TASK_NAME_SIZE-1] = '\0'; name[CONFIG_TASK_NAME_SIZE-1] = '\0';

View File

@ -403,4 +403,5 @@ void lpwork_restorepriority(uint8_t reqprio)
leave_critical_section(flags); leave_critical_section(flags);
} }
#endif /* CONFIG_SCHED_WORKQUEUE && CONFIG_SCHED_LPWORK && CONFIG_PRIORITY_INHERITANCE */ #endif /* CONFIG_SCHED_WORKQUEUE && CONFIG_SCHED_LPWORK && \
* CONFIG_PRIORITY_INHERITANCE */