Don't return success when the target CPU is offline

dt_status originally expected the behavior.

This fixes a segfault happens in dt_aggregate_go (a user of dt_status)
that depends on the behavior.
This commit is contained in:
ozaki-r 2015-02-18 03:07:56 +00:00
parent f9973cdc30
commit 99f05559ed

View File

@ -41,10 +41,12 @@
#else #else
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/cpuio.h>
#endif #endif
#include <assert.h> #include <assert.h>
#include <libgen.h> #include <libgen.h>
#include <limits.h> #include <limits.h>
#include <paths.h>
#include <dt_impl.h> #include <dt_impl.h>
@ -497,6 +499,25 @@ dt_ioctl(dtrace_hdl_t *dtp, u_long val, void *arg)
return (-1); return (-1);
} }
static bool
cpu_online(processorid_t cpu)
{
cpustate_t cs;
int fd, online = false;
if ((fd = open(_PATH_CPUCTL, O_RDONLY)) < 0)
return false;
cs.cs_id = cpu;
if (ioctl(fd, IOC_CPU_GETSTATE, &cs) == 0) {
if (cs.cs_online)
online = true;
}
close(fd);
return online;
}
int int
dt_status(dtrace_hdl_t *dtp, processorid_t cpu) dt_status(dtrace_hdl_t *dtp, processorid_t cpu)
{ {
@ -506,7 +527,7 @@ dt_status(dtrace_hdl_t *dtp, processorid_t cpu)
#if defined(sun) #if defined(sun)
return (p_online(cpu, P_STATUS)); return (p_online(cpu, P_STATUS));
#else #else
return 1; return cpu_online(cpu) ? 1 : -1;
#endif #endif
} }