sched/getpid: replace syscall getpid/tid/ppid() to kernel version
NuttX kernel should not use the syscall functions, especially after enabling CONFIG_SCHED_INSTRUMENTATION_SYSCALL, all system functions will be traced to backend, which will impact system performance. Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
parent
c24dc389e4
commit
4c8d244fae
@ -192,14 +192,14 @@ void farapi_main(int id, void *arg, struct modulelist_s *mlist)
|
|||||||
{
|
{
|
||||||
/* Save the current cpuset */
|
/* Save the current cpuset */
|
||||||
|
|
||||||
sched_getaffinity(gettid(), sizeof(cpu_set_t), &cpuset0);
|
sched_getaffinity(nxsched_gettid(), sizeof(cpu_set_t), &cpuset0);
|
||||||
|
|
||||||
/* Assign the current task to cpu0 */
|
/* Assign the current task to cpu0 */
|
||||||
|
|
||||||
cpu_set_t cpuset1;
|
cpu_set_t cpuset1;
|
||||||
CPU_ZERO(&cpuset1);
|
CPU_ZERO(&cpuset1);
|
||||||
CPU_SET(0, &cpuset1);
|
CPU_SET(0, &cpuset1);
|
||||||
sched_setaffinity(gettid(), sizeof(cpu_set_t), &cpuset1);
|
sched_setaffinity(nxsched_gettid(), sizeof(cpu_set_t), &cpuset1);
|
||||||
|
|
||||||
/* NOTE: a workaround to finish rescheduling */
|
/* NOTE: a workaround to finish rescheduling */
|
||||||
|
|
||||||
@ -267,7 +267,7 @@ err:
|
|||||||
{
|
{
|
||||||
/* Restore the cpu affinity */
|
/* Restore the cpu affinity */
|
||||||
|
|
||||||
sched_setaffinity(gettid(), sizeof(cpu_set_t), &cpuset0);
|
sched_setaffinity(nxsched_gettid(), sizeof(cpu_set_t), &cpuset0);
|
||||||
|
|
||||||
/* NOTE: a workaround to finish rescheduling */
|
/* NOTE: a workaround to finish rescheduling */
|
||||||
|
|
||||||
|
@ -1577,7 +1577,7 @@ static int cxd56_gnss_set_signal(struct file *filep, unsigned long arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
sig = NULL;
|
sig = NULL;
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
for (i = 0; i < CONFIG_CXD56_GNSS_NSIGNALRECEIVERS; i++)
|
for (i = 0; i < CONFIG_CXD56_GNSS_NSIGNALRECEIVERS; i++)
|
||||||
{
|
{
|
||||||
checksig = &priv->sigs[i];
|
checksig = &priv->sigs[i];
|
||||||
|
@ -519,7 +519,7 @@ int cxd56_iccnotify(int cpuid, int signo, void *sigdata)
|
|||||||
return -ESRCH;
|
return -ESRCH;
|
||||||
}
|
}
|
||||||
|
|
||||||
priv->pid = getpid();
|
priv->pid = nxsched_getpid();
|
||||||
priv->signo = signo;
|
priv->signo = signo;
|
||||||
priv->sigdata = sigdata;
|
priv->sigdata = sigdata;
|
||||||
|
|
||||||
|
@ -2237,7 +2237,7 @@ static int seq_seteventnotifier(struct scufifo_s *fifo,
|
|||||||
|
|
||||||
flags = enter_critical_section();
|
flags = enter_critical_section();
|
||||||
priv->event[mid].signo = ev->signo;
|
priv->event[mid].signo = ev->signo;
|
||||||
priv->event[mid].pid = getpid();
|
priv->event[mid].pid = nxsched_getpid();
|
||||||
priv->event[mid].arg = ev->arg;
|
priv->event[mid].arg = ev->arg;
|
||||||
priv->event[mid].fifo = fifo;
|
priv->event[mid].fifo = fifo;
|
||||||
leave_critical_section(flags);
|
leave_critical_section(flags);
|
||||||
@ -2320,7 +2320,7 @@ static int seq_setwatermark(struct seq_s *seq, int fifoid,
|
|||||||
|
|
||||||
flags = enter_critical_section();
|
flags = enter_critical_section();
|
||||||
notify->signo = wm->signo;
|
notify->signo = wm->signo;
|
||||||
notify->pid = getpid();
|
notify->pid = nxsched_getpid();
|
||||||
notify->ts = wm->ts;
|
notify->ts = wm->ts;
|
||||||
notify->fifo = fifo;
|
notify->fifo = fifo;
|
||||||
|
|
||||||
|
@ -3342,7 +3342,7 @@ int cxd56_usbdev_setsigno(int signo)
|
|||||||
uinfo("signo = %d\n", signo);
|
uinfo("signo = %d\n", signo);
|
||||||
|
|
||||||
priv->signo = signo;
|
priv->signo = signo;
|
||||||
priv->pid = getpid();
|
priv->pid = nxsched_getpid();
|
||||||
|
|
||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
@ -1045,11 +1045,11 @@ struct i2s_dev_s *lc823450_i2sdev_initialize(void)
|
|||||||
|
|
||||||
/* Backup the current affinity */
|
/* Backup the current affinity */
|
||||||
|
|
||||||
nxsched_get_affinity(gettid(), sizeof(cpuset0), &cpuset0);
|
nxsched_get_affinity(nxsched_gettid(), sizeof(cpuset0), &cpuset0);
|
||||||
|
|
||||||
/* Set the new affinity which assigns to CPU0 */
|
/* Set the new affinity which assigns to CPU0 */
|
||||||
|
|
||||||
nxsched_set_affinity(gettid(), sizeof(cpuset1), &cpuset1);
|
nxsched_set_affinity(nxsched_gettid(), sizeof(cpuset1), &cpuset1);
|
||||||
nxsig_usleep(10 * 1000);
|
nxsig_usleep(10 * 1000);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -1062,7 +1062,7 @@ struct i2s_dev_s *lc823450_i2sdev_initialize(void)
|
|||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
/* Restore the original affinity */
|
/* Restore the original affinity */
|
||||||
|
|
||||||
nxsched_set_affinity(gettid(), sizeof(cpuset0), &cpuset0);
|
nxsched_set_affinity(nxsched_gettid(), sizeof(cpuset0), &cpuset0);
|
||||||
nxsig_usleep(10 * 1000);
|
nxsig_usleep(10 * 1000);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -359,7 +359,7 @@ void bl_os_task_delete(void *task_handle)
|
|||||||
|
|
||||||
void *bl_os_task_get_current_task(void)
|
void *bl_os_task_get_current_task(void)
|
||||||
{
|
{
|
||||||
pid_t pid = getpid();
|
pid_t pid = nxsched_getpid();
|
||||||
|
|
||||||
return (void *)((uintptr_t)pid);
|
return (void *)((uintptr_t)pid);
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ int _fstat_r(struct _reent *r, int fd, struct stat *statbuf)
|
|||||||
|
|
||||||
int _getpid_r(struct _reent *r)
|
int _getpid_r(struct _reent *r)
|
||||||
{
|
{
|
||||||
return getpid();
|
return nxsched_getpid();
|
||||||
}
|
}
|
||||||
|
|
||||||
int _kill_r(struct _reent *r, int pid, int sig)
|
int _kill_r(struct _reent *r, int pid, int sig)
|
||||||
|
@ -2095,7 +2095,7 @@ static int32_t esp_task_ms_to_tick(uint32_t ms)
|
|||||||
|
|
||||||
static void *esp_task_get_current_task(void)
|
static void *esp_task_get_current_task(void)
|
||||||
{
|
{
|
||||||
pid_t pid = getpid();
|
pid_t pid = nxsched_getpid();
|
||||||
|
|
||||||
return (void *)((uintptr_t)pid);
|
return (void *)((uintptr_t)pid);
|
||||||
}
|
}
|
||||||
@ -4961,7 +4961,7 @@ int esp_wifi_notify_subscribe(pid_t pid, struct sigevent *event)
|
|||||||
{
|
{
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
wlinfo("Actual PID=%d\n", pid);
|
wlinfo("Actual PID=%d\n", pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -217,10 +217,10 @@ void mm_free(struct mm_heap_s *heap, void *mem)
|
|||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (gettid() < 0)
|
if (nxsched_gettid() < 0)
|
||||||
{
|
{
|
||||||
/* gettid() return -ESRCH, means we are in situations
|
/* nxsched_gettid() return -ESRCH, means we are in situations
|
||||||
* during context switching(See gettid's comment).
|
* during context switching(See nxsched_gettid's comment).
|
||||||
* Then add to the delay list.
|
* Then add to the delay list.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -2025,7 +2025,7 @@ static int32_t esp_task_ms_to_tick(uint32_t ms)
|
|||||||
|
|
||||||
static void *esp_task_get_current_task(void)
|
static void *esp_task_get_current_task(void)
|
||||||
{
|
{
|
||||||
pid_t pid = getpid();
|
pid_t pid = nxsched_getpid();
|
||||||
|
|
||||||
return (void *)((uintptr_t)pid);
|
return (void *)((uintptr_t)pid);
|
||||||
}
|
}
|
||||||
@ -4680,7 +4680,7 @@ int esp_wifi_notify_subscribe(pid_t pid, struct sigevent *event)
|
|||||||
{
|
{
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
wlinfo("Actual PID=%d\n", pid);
|
wlinfo("Actual PID=%d\n", pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -557,7 +557,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
opriv->ao_notify.an_press = notify->an_press;
|
opriv->ao_notify.an_press = notify->an_press;
|
||||||
opriv->ao_notify.an_release = notify->an_release;
|
opriv->ao_notify.an_release = notify->an_release;
|
||||||
opriv->ao_notify.an_event = notify->an_event;
|
opriv->ao_notify.an_event = notify->an_event;
|
||||||
opriv->ao_pid = getpid();
|
opriv->ao_pid = nxsched_getpid();
|
||||||
|
|
||||||
/* Enable/disable interrupt handling */
|
/* Enable/disable interrupt handling */
|
||||||
|
|
||||||
|
@ -607,7 +607,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
opriv->bo_notify.bn_press = notify->bn_press;
|
opriv->bo_notify.bn_press = notify->bn_press;
|
||||||
opriv->bo_notify.bn_release = notify->bn_release;
|
opriv->bo_notify.bn_release = notify->bn_release;
|
||||||
opriv->bo_notify.bn_event = notify->bn_event;
|
opriv->bo_notify.bn_event = notify->bn_event;
|
||||||
opriv->bo_pid = getpid();
|
opriv->bo_pid = nxsched_getpid();
|
||||||
|
|
||||||
/* Enable/disable interrupt handling */
|
/* Enable/disable interrupt handling */
|
||||||
|
|
||||||
|
@ -553,7 +553,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
opriv->do_notify.dn_press = notify->dn_press;
|
opriv->do_notify.dn_press = notify->dn_press;
|
||||||
opriv->do_notify.dn_release = notify->dn_release;
|
opriv->do_notify.dn_release = notify->dn_release;
|
||||||
opriv->do_notify.dn_event = notify->dn_event;
|
opriv->do_notify.dn_event = notify->dn_event;
|
||||||
opriv->do_pid = getpid();
|
opriv->do_pid = nxsched_getpid();
|
||||||
|
|
||||||
/* Enable/disable interrupt handling */
|
/* Enable/disable interrupt handling */
|
||||||
|
|
||||||
|
@ -350,7 +350,7 @@ static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
case GPIOC_REGISTER:
|
case GPIOC_REGISTER:
|
||||||
if (arg && dev->gp_pintype >= GPIO_INTERRUPT_PIN)
|
if (arg && dev->gp_pintype >= GPIO_INTERRUPT_PIN)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
flags = spin_lock_irqsave(NULL);
|
flags = spin_lock_irqsave(NULL);
|
||||||
for (i = 0; i < CONFIG_DEV_GPIO_NSIGNALS; i++)
|
for (i = 0; i < CONFIG_DEV_GPIO_NSIGNALS; i++)
|
||||||
{
|
{
|
||||||
@ -402,7 +402,7 @@ static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
case GPIOC_UNREGISTER:
|
case GPIOC_UNREGISTER:
|
||||||
if (dev->gp_pintype >= GPIO_INTERRUPT_PIN)
|
if (dev->gp_pintype >= GPIO_INTERRUPT_PIN)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
flags = spin_lock_irqsave(NULL);
|
flags = spin_lock_irqsave(NULL);
|
||||||
for (i = 0; i < CONFIG_DEV_GPIO_NSIGNALS; i++)
|
for (i = 0; i < CONFIG_DEV_GPIO_NSIGNALS; i++)
|
||||||
{
|
{
|
||||||
|
@ -275,7 +275,7 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid,
|
|||||||
|
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
phyinfo("Actual PID=%d\n", pid);
|
phyinfo("Actual PID=%d\n", pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -255,7 +255,7 @@ static void rptun_wakeup_rx(FAR struct rptun_priv_s *priv)
|
|||||||
|
|
||||||
static void rptun_in_recursive(int tid, FAR void *arg)
|
static void rptun_in_recursive(int tid, FAR void *arg)
|
||||||
{
|
{
|
||||||
*((FAR bool *)arg) = (gettid() == tid);
|
*((FAR bool *)arg) = (nxsched_gettid() == tid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool rptun_is_recursive(FAR struct rptun_priv_s *priv)
|
static bool rptun_is_recursive(FAR struct rptun_priv_s *priv)
|
||||||
@ -271,7 +271,7 @@ static int rptun_thread(int argc, FAR char *argv[])
|
|||||||
FAR struct rptun_priv_s *priv;
|
FAR struct rptun_priv_s *priv;
|
||||||
|
|
||||||
priv = (FAR struct rptun_priv_s *)((uintptr_t)strtoul(argv[2], NULL, 0));
|
priv = (FAR struct rptun_priv_s *)((uintptr_t)strtoul(argv[2], NULL, 0));
|
||||||
priv->tid = gettid();
|
priv->tid = nxsched_gettid();
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
@ -295,7 +295,7 @@ static void rptun_wakeup_rx(FAR struct rptun_priv_s *priv)
|
|||||||
|
|
||||||
static bool rptun_is_recursive(FAR struct rptun_priv_s *priv)
|
static bool rptun_is_recursive(FAR struct rptun_priv_s *priv)
|
||||||
{
|
{
|
||||||
return gettid() == priv->tid;
|
return nxsched_gettid() == priv->tid;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -424,7 +424,7 @@ static int zc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
/* Save the notification events */
|
/* Save the notification events */
|
||||||
|
|
||||||
opriv->do_event = *event;
|
opriv->do_event = *event;
|
||||||
opriv->do_pid = getpid();
|
opriv->do_pid = nxsched_getpid();
|
||||||
|
|
||||||
/* Enable/disable interrupt handling */
|
/* Enable/disable interrupt handling */
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap)
|
|||||||
struct lib_syslogstream_s stream;
|
struct lib_syslogstream_s stream;
|
||||||
int ret;
|
int ret;
|
||||||
#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_SYSLOG_PROCESS_NAME)
|
#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_SYSLOG_PROCESS_NAME)
|
||||||
FAR struct tcb_s *tcb = nxsched_get_tcb(gettid());
|
FAR struct tcb_s *tcb = nxsched_get_tcb(nxsched_gettid());
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_SYSLOG_TIMESTAMP
|
#ifdef CONFIG_SYSLOG_TIMESTAMP
|
||||||
struct timespec ts;
|
struct timespec ts;
|
||||||
@ -218,7 +218,7 @@ int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap)
|
|||||||
#if defined(CONFIG_SYSLOG_PROCESSID)
|
#if defined(CONFIG_SYSLOG_PROCESSID)
|
||||||
/* Prepend the Thread ID */
|
/* Prepend the Thread ID */
|
||||||
|
|
||||||
, (int)gettid()
|
, (int)nxsched_gettid()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_SYSLOG_COLOR_OUTPUT)
|
#if defined(CONFIG_SYSLOG_COLOR_OUTPUT)
|
||||||
|
@ -209,7 +209,7 @@ static int oneshot_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
pid = start->pid;
|
pid = start->pid;
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
}
|
}
|
||||||
|
|
||||||
priv->od_pid = pid;
|
priv->od_pid = pid;
|
||||||
|
@ -470,7 +470,7 @@ static int rtc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
pid = alarminfo->pid;
|
pid = alarminfo->pid;
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Save the signal info to be used to notify the caller when the
|
/* Save the signal info to be used to notify the caller when the
|
||||||
@ -541,7 +541,7 @@ static int rtc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
pid = alarminfo->pid;
|
pid = alarminfo->pid;
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Save the signal info to be used to notify the caller when the
|
/* Save the signal info to be used to notify the caller when the
|
||||||
@ -675,7 +675,7 @@ static int rtc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
|||||||
pid = alarminfo->pid;
|
pid = alarminfo->pid;
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
{
|
{
|
||||||
pid = getpid();
|
pid = nxsched_getpid();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Save the signal info to be used to notify the caller when the
|
/* Save the signal info to be used to notify the caller when the
|
||||||
|
@ -939,7 +939,7 @@ static int xbeenet_ioctl(FAR struct net_driver_s *dev, int cmd,
|
|||||||
/* Save the notification events */
|
/* Save the notification events */
|
||||||
|
|
||||||
priv->xd_notify_event = netmac->u.event;
|
priv->xd_notify_event = netmac->u.event;
|
||||||
priv->xd_notify_pid = getpid();
|
priv->xd_notify_pid = nxsched_getpid();
|
||||||
priv->xd_notify_registered = true;
|
priv->xd_notify_registered = true;
|
||||||
ret = OK;
|
ret = OK;
|
||||||
}
|
}
|
||||||
|
@ -89,7 +89,7 @@ FAR struct aio_container_s *aio_contain(FAR struct aiocb *aiocbp)
|
|||||||
memset(aioc, 0, sizeof(struct aio_container_s));
|
memset(aioc, 0, sizeof(struct aio_container_s));
|
||||||
aioc->aioc_aiocbp = aiocbp;
|
aioc->aioc_aiocbp = aiocbp;
|
||||||
aioc->aioc_filep = filep;
|
aioc->aioc_filep = filep;
|
||||||
aioc->aioc_pid = getpid();
|
aioc->aioc_pid = nxsched_getpid();
|
||||||
|
|
||||||
#ifdef CONFIG_PRIORITY_INHERITANCE
|
#ifdef CONFIG_PRIORITY_INHERITANCE
|
||||||
DEBUGVERIFY(nxsched_get_param (aioc->aioc_pid, ¶m));
|
DEBUGVERIFY(nxsched_get_param (aioc->aioc_pid, ¶m));
|
||||||
|
@ -358,7 +358,7 @@ static int automount_ioctl(FAR struct file *filep, int cmd,
|
|||||||
opriv->ao_notify.an_mount = notify->an_mount;
|
opriv->ao_notify.an_mount = notify->an_mount;
|
||||||
opriv->ao_notify.an_umount = notify->an_umount;
|
opriv->ao_notify.an_umount = notify->an_umount;
|
||||||
opriv->ao_notify.an_event = notify->an_event;
|
opriv->ao_notify.an_event = notify->an_event;
|
||||||
opriv->ao_pid = getpid();
|
opriv->ao_pid = nxsched_getpid();
|
||||||
ret = OK;
|
ret = OK;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1484,7 +1484,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
|
|||||||
|
|
||||||
if (strncmp(relpath, "self", 4) == 0)
|
if (strncmp(relpath, "self", 4) == 0)
|
||||||
{
|
{
|
||||||
tmp = gettid(); /* Get the TID of the calling task */
|
tmp = nxsched_gettid(); /* Get the TID of the calling task */
|
||||||
ptr = (FAR char *)relpath + 4; /* Discard const */
|
ptr = (FAR char *)relpath + 4; /* Discard const */
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -1792,7 +1792,7 @@ static int proc_opendir(FAR const char *relpath,
|
|||||||
|
|
||||||
if (strncmp(relpath, "self", 4) == 0)
|
if (strncmp(relpath, "self", 4) == 0)
|
||||||
{
|
{
|
||||||
tmp = gettid(); /* Get the TID of the calling task */
|
tmp = nxsched_gettid(); /* Get the TID of the calling task */
|
||||||
ptr = (FAR char *)relpath + 4; /* Discard const */
|
ptr = (FAR char *)relpath + 4; /* Discard const */
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -2032,7 +2032,7 @@ static int proc_stat(const char *relpath, struct stat *buf)
|
|||||||
|
|
||||||
if (strncmp(relpath, "self", 4) == 0)
|
if (strncmp(relpath, "self", 4) == 0)
|
||||||
{
|
{
|
||||||
tmp = gettid(); /* Get the TID of the calling task */
|
tmp = nxsched_gettid(); /* Get the TID of the calling task */
|
||||||
ptr = (FAR char *)relpath + 4; /* Discard const */
|
ptr = (FAR char *)relpath + 4; /* Discard const */
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -38,8 +38,9 @@
|
|||||||
* ARRAY and return the exact number of values stored.
|
* ARRAY and return the exact number of values stored.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# define backtrace(buffer, size) sched_backtrace(gettid(), buffer, size, 0)
|
# define backtrace(buffer, size) sched_backtrace(_SCHED_GETTID(), \
|
||||||
# define dump_stack() sched_dumpstack(gettid())
|
buffer, size, 0)
|
||||||
|
# define dump_stack() sched_dumpstack(_SCHED_GETTID())
|
||||||
|
|
||||||
#else
|
#else
|
||||||
# define backtrace(buffer, size) 0
|
# define backtrace(buffer, size) 0
|
||||||
|
@ -120,7 +120,7 @@ typedef CODE void (*tss_dtor_t)(FAR void *);
|
|||||||
* thrd_t thrd_current(void);
|
* thrd_t thrd_current(void);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define thrd_current() ((thrd_t)gettid())
|
#define thrd_current() ((thrd_t)_SCHED_GETTID())
|
||||||
|
|
||||||
/* thrd_sleep: suspends execution of the calling thread for the given
|
/* thrd_sleep: suspends execution of the calling thread for the given
|
||||||
* period of time
|
* period of time
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <nuttx/signal.h>
|
#include <nuttx/signal.h>
|
||||||
|
#include <nuttx/sched.h>
|
||||||
|
|
||||||
#include "libc.h"
|
#include "libc.h"
|
||||||
#include "aio/aio.h"
|
#include "aio/aio.h"
|
||||||
@ -234,7 +235,7 @@ static int lio_sigsetup(FAR struct aiocb * const *list, int nent,
|
|||||||
sighand->list = list;
|
sighand->list = list;
|
||||||
sighand->sig = *sig;
|
sighand->sig = *sig;
|
||||||
sighand->nent = nent;
|
sighand->nent = nent;
|
||||||
sighand->pid = getpid();
|
sighand->pid = _SCHED_GETPID();
|
||||||
|
|
||||||
/* Save this structure as the private data attached to each aiocb */
|
/* Save this structure as the private data attached to each aiocb */
|
||||||
|
|
||||||
@ -664,7 +665,7 @@ int lio_listio(int mode, FAR struct aiocb * const list[], int nent,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = nxsig_notification(getpid(), sig,
|
status = nxsig_notification(_SCHED_GETPID(), sig,
|
||||||
SI_ASYNCIO, &aiocbp->aio_sigwork);
|
SI_ASYNCIO, &aiocbp->aio_sigwork);
|
||||||
if (status < 0 && ret == OK)
|
if (status < 0 && ret == OK)
|
||||||
{
|
{
|
||||||
|
@ -27,6 +27,8 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#include <nuttx/sched.h>
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Pre-processor Definitions
|
* Pre-processor Definitions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@ -66,9 +68,10 @@ void vwarn(FAR const char *fmt, va_list ap)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_FILE_STREAM
|
#ifdef CONFIG_FILE_STREAM
|
||||||
fprintf(stderr, "%d: %pV: %s\n", gettid(), &vaf, strerror(error));
|
fprintf(stderr, "%d: %pV: %s\n", _SCHED_GETTID(), &vaf, strerror(error));
|
||||||
#else
|
#else
|
||||||
dprintf(STDERR_FILENO, "%d: %pV: %s\n", gettid(), &vaf, strerror(error));
|
dprintf(STDERR_FILENO, "%d: %pV: %s\n", _SCHED_GETTID(),
|
||||||
|
&vaf, strerror(error));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef va_copy
|
#ifdef va_copy
|
||||||
@ -97,9 +100,9 @@ void vwarnx(FAR const char *fmt, va_list ap)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_FILE_STREAM
|
#ifdef CONFIG_FILE_STREAM
|
||||||
fprintf(stderr, "%d: %pV\n", gettid(), &vaf);
|
fprintf(stderr, "%d: %pV\n", _SCHED_GETTID(), &vaf);
|
||||||
#else
|
#else
|
||||||
dprintf(STDERR_FILENO, "%d: %pV\n", gettid(), &vaf);
|
dprintf(STDERR_FILENO, "%d: %pV\n", _SCHED_GETTID(), &vaf);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef va_copy
|
#ifdef va_copy
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
#include <execinfo.h>
|
#include <execinfo.h>
|
||||||
#include <unwind.h>
|
#include <unwind.h>
|
||||||
|
|
||||||
|
#include <nuttx/sched.h>
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Private Data Types
|
* Private Data Types
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@ -110,7 +112,7 @@ int sched_backtrace(pid_t tid, FAR void **buffer, int size, int skip)
|
|||||||
{
|
{
|
||||||
struct trace_arg arg;
|
struct trace_arg arg;
|
||||||
|
|
||||||
if (tid != gettid())
|
if (tid != _SCHED_GETTID())
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -25,6 +25,8 @@
|
|||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <nuttx/sched.h>
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@ -41,5 +43,5 @@
|
|||||||
|
|
||||||
int raise(int signo)
|
int raise(int signo)
|
||||||
{
|
{
|
||||||
return tkill(gettid(), signo);
|
return tkill(_SCHED_GETTID(), signo);
|
||||||
}
|
}
|
||||||
|
@ -29,6 +29,8 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
#include <nuttx/sched.h>
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@ -73,7 +75,7 @@ int getpriority(int which, id_t who)
|
|||||||
|
|
||||||
if (who == 0)
|
if (who == 0)
|
||||||
{
|
{
|
||||||
who = gettid();
|
who = _SCHED_GETTID();
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = sched_getparam(who, ¶m);
|
ret = sched_getparam(who, ¶m);
|
||||||
|
@ -28,6 +28,8 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <nuttx/sched.h>
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@ -62,7 +64,7 @@ int setpriority(int which, id_t who, int value)
|
|||||||
|
|
||||||
if (who == 0)
|
if (who == 0)
|
||||||
{
|
{
|
||||||
who = gettid();
|
who = _SCHED_GETTID();
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = sched_getparam(who, ¶m);
|
ret = sched_getparam(who, ¶m);
|
||||||
|
@ -102,7 +102,7 @@ static inline void mempool_add_backtrace(FAR struct mempool_s *pool,
|
|||||||
FAR struct mempool_backtrace_s *buf)
|
FAR struct mempool_backtrace_s *buf)
|
||||||
{
|
{
|
||||||
list_add_head(&pool->alist, &buf->node);
|
list_add_head(&pool->alist, &buf->node);
|
||||||
buf->pid = gettid();
|
buf->pid = _SCHED_GETTID();
|
||||||
# if CONFIG_MM_BACKTRACE > 0
|
# if CONFIG_MM_BACKTRACE > 0
|
||||||
if (pool->procfs.backtrace)
|
if (pool->procfs.backtrace)
|
||||||
{
|
{
|
||||||
|
@ -75,7 +75,7 @@
|
|||||||
do \
|
do \
|
||||||
{ \
|
{ \
|
||||||
FAR struct mm_allocnode_s *tmp = (FAR struct mm_allocnode_s *)(ptr); \
|
FAR struct mm_allocnode_s *tmp = (FAR struct mm_allocnode_s *)(ptr); \
|
||||||
tmp->pid = gettid(); \
|
tmp->pid = _SCHED_GETTID(); \
|
||||||
} \
|
} \
|
||||||
while (0)
|
while (0)
|
||||||
#elif CONFIG_MM_BACKTRACE > 0
|
#elif CONFIG_MM_BACKTRACE > 0
|
||||||
@ -84,7 +84,7 @@
|
|||||||
{ \
|
{ \
|
||||||
FAR struct mm_allocnode_s *tmp = (FAR struct mm_allocnode_s *)(ptr); \
|
FAR struct mm_allocnode_s *tmp = (FAR struct mm_allocnode_s *)(ptr); \
|
||||||
FAR struct tcb_s *tcb; \
|
FAR struct tcb_s *tcb; \
|
||||||
tmp->pid = gettid(); \
|
tmp->pid = _SCHED_GETTID(); \
|
||||||
tcb = nxsched_get_tcb(tmp->pid); \
|
tcb = nxsched_get_tcb(tmp->pid); \
|
||||||
if ((heap)->mm_procfs.backtrace || (tcb && tcb->flags & TCB_FLAG_HEAP_DUMP)) \
|
if ((heap)->mm_procfs.backtrace || (tcb && tcb->flags & TCB_FLAG_HEAP_DUMP)) \
|
||||||
{ \
|
{ \
|
||||||
|
@ -77,17 +77,17 @@ int mm_lock(FAR struct mm_heap_s *heap)
|
|||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* gettid() returns the task ID of the task at the head of the ready-to-
|
/* _SCHED_GETTID() returns the task ID of the task at the head of the
|
||||||
* run task list. mm_lock() may be called during context
|
* ready-to-run task list. mm_lock() may be called during context
|
||||||
* switches. There are certain situations during context switching when
|
* switches. There are certain situations during context switching when
|
||||||
* the OS data structures are in flux and then can't be freed immediately
|
* the OS data structures are in flux and then can't be freed immediately
|
||||||
* (e.g. the running thread stack).
|
* (e.g. the running thread stack).
|
||||||
*
|
*
|
||||||
* This is handled by gettid() to return the special value -ESRCH to
|
* This is handled by _SCHED_GETTID() to return the special value -ESRCH
|
||||||
* indicate this special situation.
|
* to indicate this special situation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (gettid() < 0)
|
if (_SCHED_GETTID() < 0)
|
||||||
{
|
{
|
||||||
return -ESRCH;
|
return -ESRCH;
|
||||||
}
|
}
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
#include <nuttx/sched.h>
|
||||||
#include <nuttx/pgalloc.h>
|
#include <nuttx/pgalloc.h>
|
||||||
|
|
||||||
#include "shm/shm.h"
|
#include "shm/shm.h"
|
||||||
@ -184,7 +185,7 @@ int shmctl(int shmid, int cmd, struct shmid_ds *buf)
|
|||||||
/* Save the process ID of the last operation */
|
/* Save the process ID of the last operation */
|
||||||
|
|
||||||
region = &g_shminfo.si_region[shmid];
|
region = &g_shminfo.si_region[shmid];
|
||||||
region->sr_ds.shm_lpid = getpid();
|
region->sr_ds.shm_lpid = _SCHED_GETPID();
|
||||||
|
|
||||||
/* Save the time of the last shmctl() */
|
/* Save the time of the last shmctl() */
|
||||||
|
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <nuttx/pgalloc.h>
|
#include <nuttx/pgalloc.h>
|
||||||
|
#include <nuttx/sched.h>
|
||||||
|
|
||||||
#include "shm/shm.h"
|
#include "shm/shm.h"
|
||||||
|
|
||||||
@ -268,7 +269,7 @@ static int shm_create(key_t key, size_t size, int shmflg)
|
|||||||
/* Save the process ID of the creator */
|
/* Save the process ID of the creator */
|
||||||
|
|
||||||
region = &g_shminfo.si_region[shmid];
|
region = &g_shminfo.si_region[shmid];
|
||||||
region->sr_ds.shm_cpid = getpid();
|
region->sr_ds.shm_cpid = _SCHED_GETPID();
|
||||||
|
|
||||||
/* Return the shared memory ID */
|
/* Return the shared memory ID */
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ static void memdump_backtrace(FAR struct mm_heap_s *heap,
|
|||||||
FAR struct tcb_s *tcb;
|
FAR struct tcb_s *tcb;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
dump->pid = getpid();
|
dump->pid = _SCHED_GETPID();
|
||||||
# if CONFIG_MM_BACKTRACE > 0
|
# if CONFIG_MM_BACKTRACE > 0
|
||||||
tcb = nxsched_get_tcb(dump->pid);
|
tcb = nxsched_get_tcb(dump->pid);
|
||||||
if (heap->mm_procfs.backtrace ||
|
if (heap->mm_procfs.backtrace ||
|
||||||
@ -319,17 +319,17 @@ static int mm_lock(FAR struct mm_heap_s *heap)
|
|||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* gettid() returns the task ID of the task at the head of the ready-to-
|
/* _SCHED_GETTID() returns the task ID of the task at the head of the
|
||||||
* run task list. mm_lock() may be called during context
|
* ready-to-run task list. mm_lock() may be called during context
|
||||||
* switches. There are certain situations during context switching when
|
* switches. There are certain situations during context switching when
|
||||||
* the OS data structures are in flux and then can't be freed immediately
|
* the OS data structures are in flux and then can't be freed immediately
|
||||||
* (e.g. the running thread stack).
|
* (e.g. the running thread stack).
|
||||||
*
|
*
|
||||||
* This is handled by gettid() to return the special value -ESRCH to
|
* This is handled by _SCHED_GETTID() to return the special value
|
||||||
* indicate this special situation.
|
* -ESRCH to indicate this special situation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (gettid() < 0)
|
if (_SCHED_GETTID() < 0)
|
||||||
{
|
{
|
||||||
return -ESRCH;
|
return -ESRCH;
|
||||||
}
|
}
|
||||||
|
@ -131,7 +131,7 @@ FAR struct local_conn_s *local_alloc(void)
|
|||||||
nxmutex_init(&conn->lc_sendlock);
|
nxmutex_init(&conn->lc_sendlock);
|
||||||
|
|
||||||
#ifdef CONFIG_NET_LOCAL_SCM
|
#ifdef CONFIG_NET_LOCAL_SCM
|
||||||
conn->lc_cred.pid = getpid();
|
conn->lc_cred.pid = nxsched_getpid();
|
||||||
conn->lc_cred.uid = getuid();
|
conn->lc_cred.uid = getuid();
|
||||||
conn->lc_cred.gid = getgid();
|
conn->lc_cred.gid = getgid();
|
||||||
#endif
|
#endif
|
||||||
|
@ -262,7 +262,7 @@ static int netlink_bind(FAR struct socket *psock,
|
|||||||
nladdr = (FAR struct sockaddr_nl *)addr;
|
nladdr = (FAR struct sockaddr_nl *)addr;
|
||||||
conn = (FAR struct netlink_conn_s *)psock->s_conn;
|
conn = (FAR struct netlink_conn_s *)psock->s_conn;
|
||||||
|
|
||||||
conn->pid = nladdr->nl_pid ? nladdr->nl_pid : gettid();
|
conn->pid = nladdr->nl_pid ? nladdr->nl_pid : nxsched_gettid();
|
||||||
conn->groups = nladdr->nl_groups;
|
conn->groups = nladdr->nl_groups;
|
||||||
|
|
||||||
return OK;
|
return OK;
|
||||||
|
@ -40,6 +40,7 @@
|
|||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
#include <arch/irq.h>
|
#include <arch/irq.h>
|
||||||
|
#include <nuttx/sched.h>
|
||||||
#include <nuttx/semaphore.h>
|
#include <nuttx/semaphore.h>
|
||||||
#include <nuttx/fs/fs.h>
|
#include <nuttx/fs/fs.h>
|
||||||
#include <nuttx/net/net.h>
|
#include <nuttx/net/net.h>
|
||||||
@ -367,7 +368,7 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev,
|
|||||||
|
|
||||||
pstate->snd_sent += sndlen;
|
pstate->snd_sent += sndlen;
|
||||||
ninfo("pid: %d SEND: acked=%" PRId32 " sent=%zd flen=%zu\n",
|
ninfo("pid: %d SEND: acked=%" PRId32 " sent=%zd flen=%zu\n",
|
||||||
getpid(),
|
nxsched_getpid(),
|
||||||
pstate->snd_acked, pstate->snd_sent, pstate->snd_flen);
|
pstate->snd_acked, pstate->snd_sent, pstate->snd_flen);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -202,7 +202,8 @@ ssize_t file_mq_timedreceive(FAR struct file *mq, FAR char *msg,
|
|||||||
|
|
||||||
/* Start the watchdog */
|
/* Start the watchdog */
|
||||||
|
|
||||||
wd_start(&rtcb->waitdog, ticks, nxmq_rcvtimeout, gettid());
|
wd_start(&rtcb->waitdog, ticks,
|
||||||
|
nxmq_rcvtimeout, nxsched_gettid());
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get the message from the message queue */
|
/* Get the message from the message queue */
|
||||||
|
@ -245,7 +245,7 @@ int file_mq_timedsend(FAR struct file *mq, FAR const char *msg,
|
|||||||
|
|
||||||
/* Start the watchdog and begin the wait for MQ not full */
|
/* Start the watchdog and begin the wait for MQ not full */
|
||||||
|
|
||||||
wd_start(&rtcb->waitdog, ticks, nxmq_sndtimeout, gettid());
|
wd_start(&rtcb->waitdog, ticks, nxmq_sndtimeout, nxsched_gettid());
|
||||||
|
|
||||||
/* And wait for the message queue to be non-empty */
|
/* And wait for the message queue to be non-empty */
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ int pthread_cond_clockwait(FAR pthread_cond_t *cond,
|
|||||||
FAR const struct timespec *abstime)
|
FAR const struct timespec *abstime)
|
||||||
{
|
{
|
||||||
irqstate_t flags;
|
irqstate_t flags;
|
||||||
int mypid = gettid();
|
int mypid = nxsched_gettid();
|
||||||
int ret = OK;
|
int ret = OK;
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
|
|||||||
|
|
||||||
/* Make sure that the caller holds the mutex */
|
/* Make sure that the caller holds the mutex */
|
||||||
|
|
||||||
else if (mutex->pid != gettid())
|
else if (mutex->pid != nxsched_gettid())
|
||||||
{
|
{
|
||||||
ret = EPERM;
|
ret = EPERM;
|
||||||
}
|
}
|
||||||
@ -140,7 +140,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
|
|||||||
{
|
{
|
||||||
/* Yes.. Then initialize it properly */
|
/* Yes.. Then initialize it properly */
|
||||||
|
|
||||||
mutex->pid = gettid();
|
mutex->pid = nxsched_gettid();
|
||||||
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
|
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
|
||||||
mutex->flags = mflags;
|
mutex->flags = mflags;
|
||||||
#endif
|
#endif
|
||||||
|
@ -79,7 +79,7 @@ void nx_pthread_exit(FAR void *exit_value)
|
|||||||
|
|
||||||
/* Complete pending join operations */
|
/* Complete pending join operations */
|
||||||
|
|
||||||
status = pthread_completejoin(gettid(), exit_value);
|
status = pthread_completejoin(nxsched_gettid(), exit_value);
|
||||||
if (status != OK)
|
if (status != OK)
|
||||||
{
|
{
|
||||||
/* Assume that the join completion failured because this
|
/* Assume that the join completion failured because this
|
||||||
|
@ -78,7 +78,7 @@
|
|||||||
int pthread_mutex_timedlock(FAR pthread_mutex_t *mutex,
|
int pthread_mutex_timedlock(FAR pthread_mutex_t *mutex,
|
||||||
FAR const struct timespec *abs_timeout)
|
FAR const struct timespec *abs_timeout)
|
||||||
{
|
{
|
||||||
pid_t mypid = gettid();
|
pid_t mypid = nxsched_gettid();
|
||||||
int ret = EINVAL;
|
int ret = EINVAL;
|
||||||
|
|
||||||
sinfo("mutex=%p\n", mutex);
|
sinfo("mutex=%p\n", mutex);
|
||||||
|
@ -76,7 +76,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
|
|||||||
|
|
||||||
if (mutex != NULL)
|
if (mutex != NULL)
|
||||||
{
|
{
|
||||||
pid_t mypid = gettid();
|
pid_t mypid = nxsched_gettid();
|
||||||
|
|
||||||
/* Make sure the semaphore is stable while we make the following
|
/* Make sure the semaphore is stable while we make the following
|
||||||
* checks. This all needs to be one atomic action.
|
* checks. This all needs to be one atomic action.
|
||||||
|
@ -142,7 +142,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
|
|||||||
* thread owns the semaphore.
|
* thread owns the semaphore.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (mutex->pid != gettid())
|
if (mutex->pid != nxsched_gettid())
|
||||||
|
|
||||||
#elif defined(CONFIG_PTHREAD_MUTEX_UNSAFE) && defined(CONFIG_PTHREAD_MUTEX_TYPES)
|
#elif defined(CONFIG_PTHREAD_MUTEX_UNSAFE) && defined(CONFIG_PTHREAD_MUTEX_TYPES)
|
||||||
/* If mutex types are not supported, then all mutexes are NORMAL (or
|
/* If mutex types are not supported, then all mutexes are NORMAL (or
|
||||||
@ -150,7 +150,8 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
|
|||||||
* non-robust NORMAL mutex type.
|
* non-robust NORMAL mutex type.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (mutex->type != PTHREAD_MUTEX_NORMAL && mutex->pid != gettid())
|
if (mutex->type != PTHREAD_MUTEX_NORMAL &&
|
||||||
|
mutex->pid != nxsched_gettid())
|
||||||
|
|
||||||
#else /* CONFIG_PTHREAD_MUTEX_BOTH */
|
#else /* CONFIG_PTHREAD_MUTEX_BOTH */
|
||||||
/* Skip the error check if this is a non-robust NORMAL mutex */
|
/* Skip the error check if this is a non-robust NORMAL mutex */
|
||||||
@ -164,7 +165,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
|
|||||||
* the EPERM error?
|
* the EPERM error?
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (errcheck && mutex->pid != gettid())
|
if (errcheck && mutex->pid != nxsched_gettid())
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
/* No... return an EPERM error.
|
/* No... return an EPERM error.
|
||||||
|
@ -109,7 +109,7 @@ int nxsched_set_scheduler(pid_t pid, int policy,
|
|||||||
|
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
{
|
{
|
||||||
pid = gettid();
|
pid = nxsched_gettid();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Verify that the pid corresponds to a real task */
|
/* Verify that the pid corresponds to a real task */
|
||||||
|
@ -159,7 +159,7 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid,
|
|||||||
|
|
||||||
/* Start the watchdog */
|
/* Start the watchdog */
|
||||||
|
|
||||||
wd_start(&rtcb->waitdog, ticks, nxsem_timeout, gettid());
|
wd_start(&rtcb->waitdog, ticks, nxsem_timeout, nxsched_gettid());
|
||||||
|
|
||||||
/* Now perform the blocking wait. If nxsem_wait() fails, the
|
/* Now perform the blocking wait. If nxsem_wait() fails, the
|
||||||
* negated errno value will be returned below.
|
* negated errno value will be returned below.
|
||||||
|
@ -105,7 +105,7 @@ int nxsem_tickwait(FAR sem_t *sem, uint32_t delay)
|
|||||||
|
|
||||||
/* Start the watchdog with interrupts still disabled */
|
/* Start the watchdog with interrupts still disabled */
|
||||||
|
|
||||||
wd_start(&rtcb->waitdog, delay, nxsem_timeout, gettid());
|
wd_start(&rtcb->waitdog, delay, nxsem_timeout, nxsched_gettid());
|
||||||
|
|
||||||
/* Now perform the blocking wait */
|
/* Now perform the blocking wait */
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ static inline void nxtask_exitstatus(FAR struct task_group_s *group,
|
|||||||
{
|
{
|
||||||
/* No.. Find the exit status entry for this task in the parent TCB */
|
/* No.. Find the exit status entry for this task in the parent TCB */
|
||||||
|
|
||||||
child = group_find_child(group, gettid());
|
child = group_find_child(group, nxsched_gettid());
|
||||||
if (child)
|
if (child)
|
||||||
{
|
{
|
||||||
/* Save the exit status.. For the case of HAVE_GROUP_MEMBERS,
|
/* Save the exit status.. For the case of HAVE_GROUP_MEMBERS,
|
||||||
@ -105,7 +105,7 @@ static inline void nxtask_groupexit(FAR struct task_group_s *group)
|
|||||||
{
|
{
|
||||||
/* No.. Find the exit status entry for this task in the parent TCB */
|
/* No.. Find the exit status entry for this task in the parent TCB */
|
||||||
|
|
||||||
child = group_find_child(group, gettid());
|
child = group_find_child(group, nxsched_gettid());
|
||||||
if (child)
|
if (child)
|
||||||
{
|
{
|
||||||
/* Mark that all members of the child task group has exited */
|
/* Mark that all members of the child task group has exited */
|
||||||
|
@ -178,7 +178,7 @@ int timer_create(clockid_t clockid, FAR struct sigevent *evp,
|
|||||||
|
|
||||||
ret->pt_clock = clockid;
|
ret->pt_clock = clockid;
|
||||||
ret->pt_crefs = 1;
|
ret->pt_crefs = 1;
|
||||||
ret->pt_owner = getpid();
|
ret->pt_owner = nxsched_getpid();
|
||||||
ret->pt_delay = 0;
|
ret->pt_delay = 0;
|
||||||
|
|
||||||
/* Was a struct sigevent provided? */
|
/* Was a struct sigevent provided? */
|
||||||
|
@ -583,7 +583,7 @@ static int mac802154dev_ioctl(FAR struct file *filep, int cmd,
|
|||||||
/* Save the notification events */
|
/* Save the notification events */
|
||||||
|
|
||||||
dev->md_notify_event = macarg->event;
|
dev->md_notify_event = macarg->event;
|
||||||
dev->md_notify_pid = getpid();
|
dev->md_notify_pid = nxsched_getpid();
|
||||||
dev->md_notify_registered = true;
|
dev->md_notify_registered = true;
|
||||||
|
|
||||||
ret = OK;
|
ret = OK;
|
||||||
|
@ -939,7 +939,7 @@ static int macnet_ioctl(FAR struct net_driver_s *dev, int cmd,
|
|||||||
/* Save the notification events */
|
/* Save the notification events */
|
||||||
|
|
||||||
priv->md_notify_event = netmac->u.event;
|
priv->md_notify_event = netmac->u.event;
|
||||||
priv->md_notify_pid = getpid();
|
priv->md_notify_pid = nxsched_getpid();
|
||||||
priv->md_notify_registered = true;
|
priv->md_notify_registered = true;
|
||||||
ret = OK;
|
ret = OK;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user