From fd54558a83f0f494ed0d7d45c4c023bcfb826f18 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 18 Sep 2001 21:46:26 +0000 Subject: [PATCH] - If we ever do the per-cpu KTR stuff, the index won't be volatile as it will be private to each CPU. - Re-style(9) the globaldata structures. There really needs to be a MI struct pcpu that has a MD struct mdpcpu member at some point. --- sys/alpha/include/globaldata.h | 2 +- sys/alpha/include/pcpu.h | 2 +- sys/amd64/include/pcpu.h | 28 ++++++++++++++-------------- sys/i386/include/globaldata.h | 28 ++++++++++++++-------------- sys/i386/include/pcpu.h | 28 ++++++++++++++-------------- sys/ia64/include/globaldata.h | 18 +++++++++--------- sys/ia64/include/pcpu.h | 18 +++++++++--------- sys/powerpc/include/globaldata.h | 20 ++++++++++---------- sys/powerpc/include/pcpu.h | 20 ++++++++++---------- sys/sparc64/include/globaldata.h | 2 +- sys/sparc64/include/pcpu.h | 2 +- 11 files changed, 84 insertions(+), 84 deletions(-) diff --git a/sys/alpha/include/globaldata.h b/sys/alpha/include/globaldata.h index 38d952762fe9..d0ba7064cad7 100644 --- a/sys/alpha/include/globaldata.h +++ b/sys/alpha/include/globaldata.h @@ -61,7 +61,7 @@ struct globaldata { SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[0]; #endif diff --git a/sys/alpha/include/pcpu.h b/sys/alpha/include/pcpu.h index 38d952762fe9..d0ba7064cad7 100644 --- a/sys/alpha/include/pcpu.h +++ b/sys/alpha/include/pcpu.h @@ -61,7 +61,7 @@ struct globaldata { SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[0]; #endif diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h index f02354d05bbc..46c26c444fbf 100644 --- a/sys/amd64/include/pcpu.h +++ b/sys/amd64/include/pcpu.h @@ -52,23 +52,23 @@ * other processors" */ struct globaldata { - struct globaldata *gd_prvspace; /* self-reference */ - struct thread *gd_curthread; - struct thread *gd_npxthread; - struct pcb *gd_curpcb; - struct thread *gd_idlethread; - struct timeval gd_switchtime; - struct i386tss gd_common_tss; - int gd_switchticks; - struct segment_descriptor gd_common_tssd; - struct segment_descriptor *gd_tss_gdt; - int gd_currentldt; - u_int gd_cpuid; - u_int gd_other_cpus; + struct globaldata *gd_prvspace; /* Self-reference */ + struct thread *gd_curthread; + struct thread *gd_npxthread; + struct pcb *gd_curpcb; + struct thread *gd_idlethread; + struct timeval gd_switchtime; + struct i386tss gd_common_tss; + int gd_switchticks; + struct segment_descriptor gd_common_tssd; + struct segment_descriptor *gd_tss_gdt; + int gd_currentldt; + u_int gd_cpuid; + u_int gd_other_cpus; SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[KTR_SIZE]; #endif diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h index f02354d05bbc..46c26c444fbf 100644 --- a/sys/i386/include/globaldata.h +++ b/sys/i386/include/globaldata.h @@ -52,23 +52,23 @@ * other processors" */ struct globaldata { - struct globaldata *gd_prvspace; /* self-reference */ - struct thread *gd_curthread; - struct thread *gd_npxthread; - struct pcb *gd_curpcb; - struct thread *gd_idlethread; - struct timeval gd_switchtime; - struct i386tss gd_common_tss; - int gd_switchticks; - struct segment_descriptor gd_common_tssd; - struct segment_descriptor *gd_tss_gdt; - int gd_currentldt; - u_int gd_cpuid; - u_int gd_other_cpus; + struct globaldata *gd_prvspace; /* Self-reference */ + struct thread *gd_curthread; + struct thread *gd_npxthread; + struct pcb *gd_curpcb; + struct thread *gd_idlethread; + struct timeval gd_switchtime; + struct i386tss gd_common_tss; + int gd_switchticks; + struct segment_descriptor gd_common_tssd; + struct segment_descriptor *gd_tss_gdt; + int gd_currentldt; + u_int gd_cpuid; + u_int gd_other_cpus; SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[KTR_SIZE]; #endif diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h index f02354d05bbc..46c26c444fbf 100644 --- a/sys/i386/include/pcpu.h +++ b/sys/i386/include/pcpu.h @@ -52,23 +52,23 @@ * other processors" */ struct globaldata { - struct globaldata *gd_prvspace; /* self-reference */ - struct thread *gd_curthread; - struct thread *gd_npxthread; - struct pcb *gd_curpcb; - struct thread *gd_idlethread; - struct timeval gd_switchtime; - struct i386tss gd_common_tss; - int gd_switchticks; - struct segment_descriptor gd_common_tssd; - struct segment_descriptor *gd_tss_gdt; - int gd_currentldt; - u_int gd_cpuid; - u_int gd_other_cpus; + struct globaldata *gd_prvspace; /* Self-reference */ + struct thread *gd_curthread; + struct thread *gd_npxthread; + struct pcb *gd_curpcb; + struct thread *gd_idlethread; + struct timeval gd_switchtime; + struct i386tss gd_common_tss; + int gd_switchticks; + struct segment_descriptor gd_common_tssd; + struct segment_descriptor *gd_tss_gdt; + int gd_currentldt; + u_int gd_cpuid; + u_int gd_other_cpus; SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[KTR_SIZE]; #endif diff --git a/sys/ia64/include/globaldata.h b/sys/ia64/include/globaldata.h index 50f49908424e..4190c004d5b6 100644 --- a/sys/ia64/include/globaldata.h +++ b/sys/ia64/include/globaldata.h @@ -44,14 +44,14 @@ * point at the globaldata structure. */ struct globaldata { - struct thread *gd_curthread; /* current thread */ - struct thread *gd_idlethread; /* idle thread */ - struct thread *gd_fpcurthread; /* fp state owner */ - struct pcb *gd_curpcb; /* current pcb */ - struct timeval gd_switchtime; - int gd_switchticks; - u_int gd_cpuid; /* this cpu number */ - u_int gd_other_cpus; /* all other cpus */ + struct thread *gd_curthread; /* current thread */ + struct thread *gd_idlethread; /* idle thread */ + struct thread *gd_fpcurthread; /* fp state owner */ + struct pcb *gd_curpcb; /* current pcb */ + struct timeval gd_switchtime; + int gd_switchticks; + u_int gd_cpuid; /* this cpu number */ + u_int gd_other_cpus; /* all other cpus */ u_int64_t gd_pending_ipis; /* pending IPI events */ struct pmap *gd_current_pmap; /* which pmap is active */ u_int32_t gd_next_asn; /* next ASN to allocate */ @@ -60,7 +60,7 @@ struct globaldata { SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[0]; #endif diff --git a/sys/ia64/include/pcpu.h b/sys/ia64/include/pcpu.h index 50f49908424e..4190c004d5b6 100644 --- a/sys/ia64/include/pcpu.h +++ b/sys/ia64/include/pcpu.h @@ -44,14 +44,14 @@ * point at the globaldata structure. */ struct globaldata { - struct thread *gd_curthread; /* current thread */ - struct thread *gd_idlethread; /* idle thread */ - struct thread *gd_fpcurthread; /* fp state owner */ - struct pcb *gd_curpcb; /* current pcb */ - struct timeval gd_switchtime; - int gd_switchticks; - u_int gd_cpuid; /* this cpu number */ - u_int gd_other_cpus; /* all other cpus */ + struct thread *gd_curthread; /* current thread */ + struct thread *gd_idlethread; /* idle thread */ + struct thread *gd_fpcurthread; /* fp state owner */ + struct pcb *gd_curpcb; /* current pcb */ + struct timeval gd_switchtime; + int gd_switchticks; + u_int gd_cpuid; /* this cpu number */ + u_int gd_other_cpus; /* all other cpus */ u_int64_t gd_pending_ipis; /* pending IPI events */ struct pmap *gd_current_pmap; /* which pmap is active */ u_int32_t gd_next_asn; /* next ASN to allocate */ @@ -60,7 +60,7 @@ struct globaldata { SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[0]; #endif diff --git a/sys/powerpc/include/globaldata.h b/sys/powerpc/include/globaldata.h index 4d664497214b..07376926f76a 100644 --- a/sys/powerpc/include/globaldata.h +++ b/sys/powerpc/include/globaldata.h @@ -44,15 +44,15 @@ * point at the globaldata structure. */ struct globaldata { - struct thread *gd_curthread; /* current thread */ - struct thread *gd_idlethread; /* idle thread */ - struct thread *gd_fpcurthread; /* fp state owner */ - struct pcb *gd_curpcb; /* current pcb */ - struct timeval gd_switchtime; - int gd_switchticks; - u_int gd_cpuid; /* this cpu number */ - u_int gd_other_cpus; /* all other cpus */ - int gd_inside_intr; + struct thread *gd_curthread; /* current thread */ + struct thread *gd_idlethread; /* idle thread */ + struct thread *gd_fpcurthread; /* fp state owner */ + struct pcb *gd_curpcb; /* current pcb */ + struct timeval gd_switchtime; + int gd_switchticks; + u_int gd_cpuid; /* this cpu number */ + u_int gd_other_cpus; /* all other cpus */ + int gd_inside_intr; u_int32_t gd_next_asn; /* next ASN to allocate */ u_int32_t gd_current_asngen; /* ASN rollover check */ u_int32_t gd_intr_nesting_level; /* interrupt recursion */ @@ -60,7 +60,7 @@ struct globaldata { SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[KTR_SIZE]; #endif diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h index 4d664497214b..07376926f76a 100644 --- a/sys/powerpc/include/pcpu.h +++ b/sys/powerpc/include/pcpu.h @@ -44,15 +44,15 @@ * point at the globaldata structure. */ struct globaldata { - struct thread *gd_curthread; /* current thread */ - struct thread *gd_idlethread; /* idle thread */ - struct thread *gd_fpcurthread; /* fp state owner */ - struct pcb *gd_curpcb; /* current pcb */ - struct timeval gd_switchtime; - int gd_switchticks; - u_int gd_cpuid; /* this cpu number */ - u_int gd_other_cpus; /* all other cpus */ - int gd_inside_intr; + struct thread *gd_curthread; /* current thread */ + struct thread *gd_idlethread; /* idle thread */ + struct thread *gd_fpcurthread; /* fp state owner */ + struct pcb *gd_curpcb; /* current pcb */ + struct timeval gd_switchtime; + int gd_switchticks; + u_int gd_cpuid; /* this cpu number */ + u_int gd_other_cpus; /* all other cpus */ + int gd_inside_intr; u_int32_t gd_next_asn; /* next ASN to allocate */ u_int32_t gd_current_asngen; /* ASN rollover check */ u_int32_t gd_intr_nesting_level; /* interrupt recursion */ @@ -60,7 +60,7 @@ struct globaldata { SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[KTR_SIZE]; #endif diff --git a/sys/sparc64/include/globaldata.h b/sys/sparc64/include/globaldata.h index 325bd0856b78..75ce626d6074 100644 --- a/sys/sparc64/include/globaldata.h +++ b/sys/sparc64/include/globaldata.h @@ -56,7 +56,7 @@ struct globaldata { SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[0]; #endif diff --git a/sys/sparc64/include/pcpu.h b/sys/sparc64/include/pcpu.h index 325bd0856b78..75ce626d6074 100644 --- a/sys/sparc64/include/pcpu.h +++ b/sys/sparc64/include/pcpu.h @@ -56,7 +56,7 @@ struct globaldata { SLIST_ENTRY(globaldata) gd_allcpu; struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU - volatile int gd_ktr_idx; /* Index into trace table */ + int gd_ktr_idx; /* Index into trace table */ char *gd_ktr_buf; char gd_ktr_buf_data[0]; #endif