diff options
| author | attilio <attilio@FreeBSD.org> | 2011-05-31 20:48:58 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2011-05-31 20:48:58 +0000 |
| commit | a924571ff72281d66b56beff01ea2b9ed8de6961 (patch) | |
| tree | 4921b240c37563ec3537c2d9ef82577aa8242c1f /sys/sys | |
| parent | 066c7ac96c87ad7070c7f2469bab58ef10a9f636 (diff) | |
| download | FreeBSD-src-a924571ff72281d66b56beff01ea2b9ed8de6961.zip FreeBSD-src-a924571ff72281d66b56beff01ea2b9ed8de6961.tar.gz | |
Fix KTR_CPUMASK in order to accept a string representing a cpuset_t.
This introduce all the underlying support for making this possible (via
the function cpusetobj_strscan() and keeps ktr_cpumask exported. sparc64
implements its own assembly primitives for tracing events and needs to
properly check it. Anyway the sparc64 logic is not implemented yet due
to lack of knowledge (by me) and time (by marius), but it is just a
matter of using ktr_cpumask when possible.
Tested and fixed by: pluknet
Reviewed by: marius
Diffstat (limited to 'sys/sys')
| -rw-r--r-- | sys/sys/cpuset.h | 1 | ||||
| -rw-r--r-- | sys/sys/ktr.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h index 4525263..030a874 100644 --- a/sys/sys/cpuset.h +++ b/sys/sys/cpuset.h @@ -214,6 +214,7 @@ int cpuset_create_root(struct prison *, struct cpuset **); int cpuset_setproc_update_set(struct proc *, struct cpuset *); int cpusetobj_ffs(const cpuset_t *); char *cpusetobj_strprint(char *, const cpuset_t *); +int cpusetobj_strscan(cpuset_t *, const char *); #else __BEGIN_DECLS diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h index 3b78101..7885b22 100644 --- a/sys/sys/ktr.h +++ b/sys/sys/ktr.h @@ -97,6 +97,9 @@ #ifndef LOCORE +#include <sys/param.h> +#include <sys/_cpuset.h> + struct ktr_entry { u_int64_t ktr_timestamp; int ktr_cpu; @@ -107,7 +110,7 @@ struct ktr_entry { u_long ktr_parms[KTR_PARMS]; }; -extern int ktr_cpumask; +extern cpuset_t ktr_cpumask; extern int ktr_mask; extern int ktr_entries; extern int ktr_verbose; |
