Print this page
5042 stop using deprecated atomic functions
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/uts/common/os/kdi.c
+++ new/usr/src/uts/common/os/kdi.c
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21 /*
22 22 * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
23 23 * Use is subject to license terms.
24 24 */
25 25
26 -#pragma ident "%Z%%M% %I% %E% SMI"
27 -
28 26 #include <sys/cpuvar.h>
29 27 #include <sys/kdi_impl.h>
30 28 #include <sys/reboot.h>
31 29 #include <sys/errno.h>
32 30 #include <sys/atomic.h>
33 31 #include <sys/kmem.h>
34 32
35 33 kdi_debugvec_t *kdi_dvec;
36 34 struct modctl *kdi_dmods;
37 35
38 36 static kdi_dtrace_state_t kdi_dtrace_state = KDI_DTSTATE_IDLE;
39 37
40 38 void
41 39 kdi_dvec_vmready(void)
42 40 {
43 41 kdi_dvec->dv_kctl_vmready();
44 42 kdi_dvec->dv_vmready();
45 43 }
46 44
47 45 void
48 46 kdi_dvec_memavail(void)
49 47 {
50 48 /*
51 49 * The driver will allocate more memory (if requested), and will call
52 50 * dv_memavail itself.
53 51 */
54 52 kdi_dvec->dv_kctl_memavail();
55 53 }
56 54
57 55 #if defined(__x86)
58 56 void
59 57 kdi_dvec_handle_fault(greg_t trapno, greg_t pc, greg_t sp, int cpuid)
60 58 {
61 59 kdi_dvec->dv_handle_fault(trapno, pc, sp, cpuid);
62 60 }
63 61 #endif
64 62
65 63 #if defined(__sparc)
66 64 /*
67 65 * Called on the CPU being initialized
68 66 */
69 67 void
70 68 kdi_dvec_cpu_init(struct cpu *cp)
71 69 {
72 70 kdi_dvec->dv_kctl_cpu_init();
73 71 kdi_dvec->dv_cpu_init(cp);
74 72 }
75 73
76 74 void
77 75 kdi_dvec_cpr_restart(void)
78 76 {
79 77 kdi_dvec->dv_kctl_cpu_init();
80 78 kdi_dvec->dv_cpr_restart();
81 79 }
82 80 #endif /* __sparc */
83 81
84 82 void
85 83 kdi_dvec_modavail(void)
86 84 {
87 85 kdi_dvec->dv_kctl_modavail();
88 86 }
89 87
90 88 void
91 89 kdi_dvec_thravail(void)
92 90 {
93 91 kdi_dvec->dv_kctl_thravail();
94 92 }
95 93
96 94 void
97 95 kdi_dvec_mod_loaded(struct modctl *modp)
98 96 {
99 97 kdi_dvec->dv_mod_loaded(modp);
100 98 }
101 99
102 100 void
103 101 kdi_dvec_mod_unloading(struct modctl *modp)
104 102 {
105 103 kdi_dvec->dv_mod_unloading(modp);
106 104 }
107 105
108 106 kdi_dtrace_state_t
109 107 kdi_dtrace_get_state(void)
110 108 {
111 109 return (kdi_dtrace_state);
112 110 }
113 111
114 112 int
115 113 kdi_dtrace_set(kdi_dtrace_set_t transition)
116 114 {
117 115 kdi_dtrace_state_t new, cur;
118 116
119 117 do {
120 118 cur = kdi_dtrace_state;
121 119
122 120 switch (transition) {
123 121 case KDI_DTSET_DTRACE_ACTIVATE:
124 122 if (cur == KDI_DTSTATE_KMDB_BPT_ACTIVE)
125 123 return (EBUSY);
126 124 if (cur == KDI_DTSTATE_DTRACE_ACTIVE)
127 125 return (0);
128 126 new = KDI_DTSTATE_DTRACE_ACTIVE;
129 127 break;
130 128 case KDI_DTSET_DTRACE_DEACTIVATE:
131 129 if (cur == KDI_DTSTATE_KMDB_BPT_ACTIVE)
132 130 return (EBUSY);
133 131 if (cur == KDI_DTSTATE_IDLE)
134 132 return (0);
135 133 new = KDI_DTSTATE_IDLE;
136 134 break;
137 135 case KDI_DTSET_KMDB_BPT_ACTIVATE:
138 136 if (cur == KDI_DTSTATE_DTRACE_ACTIVE)
139 137 return (EBUSY);
140 138 if (cur == KDI_DTSTATE_KMDB_BPT_ACTIVE)
141 139 return (0);
142 140 new = KDI_DTSTATE_KMDB_BPT_ACTIVE;
143 141 break;
↓ open down ↓ |
106 lines elided |
↑ open up ↑ |
144 142 case KDI_DTSET_KMDB_BPT_DEACTIVATE:
145 143 if (cur == KDI_DTSTATE_DTRACE_ACTIVE)
146 144 return (EBUSY);
147 145 if (cur == KDI_DTSTATE_IDLE)
148 146 return (0);
149 147 new = KDI_DTSTATE_IDLE;
150 148 break;
151 149 default:
152 150 return (EINVAL);
153 151 }
154 - } while (cas32((uint_t *)&kdi_dtrace_state, cur, new) != cur);
152 + } while (atomic_cas_32((uint_t *)&kdi_dtrace_state, cur, new) != cur);
155 153
156 154 return (0);
157 155 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX