Skip to content

Commit 5212395

Browse files
jsquyresjsquyres
committed
Fix a bunch of compiler warnings in "make check"
There were many compiler warnings, making it difficult to read if there were real issues that needed to be addressed. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
1 parent 96d36f6 commit 5212395

File tree

9 files changed

+168
-111
lines changed

9 files changed

+168
-111
lines changed

‎test/asm/atomic_cmpset.c‎

Lines changed: 78 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -104,71 +104,95 @@ int main(int argc, char *argv[])
104104

105105
/* -- cmpset 32-bit tests -- */
106106

107-
vol32 = 42, old32 = 42, new32 = 50;
107+
vol32 = 42;
108+
old32 = 42;
109+
new32 = 50;
108110
assert(opal_atomic_compare_exchange_strong_32 (&vol32, &old32, new32) == true);
109111
opal_atomic_rmb();
110112
assert(vol32 == new32);
111113
assert(old32 == 42);
112114

113-
vol32 = 42, old32 = 420, new32 = 50;
115+
vol32 = 42;
116+
old32 = 420;
117+
new32 = 50;
114118
assert(opal_atomic_compare_exchange_strong_32 (&vol32, &old32, new32) == false);
115119
opal_atomic_rmb();
116120
assert(vol32 == 42);
117121
assert(old32 == 42);
118122

119-
vol32 = 42, old32 = 42, new32 = 50;
123+
vol32 = 42;
124+
old32 = 42;
125+
new32 = 50;
120126
assert(opal_atomic_compare_exchange_strong_32 (&vol32, &old32, new32) == true);
121127
assert(vol32 == new32);
122128
assert(old32 == 42);
123129

124-
vol32 = 42, old32 = 420, new32 = 50;
130+
vol32 = 42;
131+
old32 = 420;
132+
new32 = 50;
125133
assert(opal_atomic_compare_exchange_strong_acq_32 (&vol32, &old32, new32) == false);
126134
assert(vol32 == 42);
127135
assert(old32 == 42);
128136

129-
vol32 = 42, old32 = 42, new32 = 50;
137+
vol32 = 42;
138+
old32 = 42;
139+
new32 = 50;
130140
assert(opal_atomic_compare_exchange_strong_rel_32 (&vol32, &old32, new32) == true);
131141
opal_atomic_rmb();
132142
assert(vol32 == new32);
133143
assert(old32 == 42);
134144

135-
vol32 = 42, old32 = 420, new32 = 50;
145+
vol32 = 42;
146+
old32 = 420;
147+
new32 = 50;
136148
assert(opal_atomic_compare_exchange_strong_rel_32 (&vol32, &old32, new32) == false);
137149
opal_atomic_rmb();
138150
assert(vol32 == 42);
139151
assert(old32 == 42);
140152

141153
/* -- cmpset 64-bit tests -- */
142154

143-
vol64 = 42, old64 = 42, new64 = 50;
155+
vol64 = 42;
156+
old64 = 42;
157+
new64 = 50;
144158
assert(opal_atomic_compare_exchange_strong_64 (&vol64, &old64, new64) == true);
145159
opal_atomic_rmb();
146160
assert(new64 == vol64);
147161
assert(old64 == 42);
148162

149-
vol64 = 42, old64 = 420, new64 = 50;
163+
vol64 = 42;
164+
old64 = 420;
165+
new64 = 50;
150166
assert(opal_atomic_compare_exchange_strong_64 (&vol64, &old64, new64) == false);
151167
opal_atomic_rmb();
152168
assert(vol64 == 42);
153169
assert(old64 == 42);
154170

155-
vol64 = 42, old64 = 42, new64 = 50;
171+
vol64 = 42;
172+
old64 = 42;
173+
new64 = 50;
156174
assert(opal_atomic_compare_exchange_strong_acq_64 (&vol64, &old64, new64) == true);
157175
assert(vol64 == new64);
158176
assert(old64 == 42);
159177

160-
vol64 = 42, old64 = 420, new64 = 50;
178+
vol64 = 42;
179+
old64 = 420;
180+
new64 = 50;
161181
assert(opal_atomic_compare_exchange_strong_acq_64 (&vol64, &old64, new64) == false);
162182
assert(vol64 == 42);
163183
assert(old64 == 42);
164184

165-
vol64 = 42, old64 = 42, new64 = 50;
185+
vol64 = 42;
186+
old64 = 42;
187+
new64 = 50;
166188
assert(opal_atomic_compare_exchange_strong_rel_64 (&vol64, &old64, new64) == true);
167189
opal_atomic_rmb();
168190
assert(vol64 == new64);
169191
assert(old64 == 42);
170192

171-
vol64 = 42, old64 = 420, new64 = 50;
193+
vol64 = 42;
194+
old64 = 420;
195+
new64 = 50;
172196
assert(opal_atomic_compare_exchange_strong_rel_64 (&vol64, &old64, new64) == false);
173197
opal_atomic_rmb();
174198
assert(vol64 == 42);
@@ -177,13 +201,17 @@ int main(int argc, char *argv[])
177201
/* -- cmpset 128-bit tests -- */
178202

179203
#if OPAL_HAVE_ATOMIC_COMPARE_EXCHANGE_128
180-
vol128 = 42, old128 = 42, new128 = 50;
204+
vol128 = 42;
205+
old128 = 42;
206+
new128 = 50;
181207
assert(opal_atomic_compare_exchange_strong_128 (&vol128, &old128, new128) == true);
182208
opal_atomic_rmb();
183209
assert(new128 == vol128);
184210
assert(old128 == 42);
185211

186-
vol128 = 42, old128 = 420, new128 = 50;
212+
vol128 = 42;
213+
old128 = 420;
214+
new128 = 50;
187215
assert(opal_atomic_compare_exchange_strong_128 (&vol128, &old128, new128) == false);
188216
opal_atomic_rmb();
189217
assert(vol128 == 42);
@@ -192,35 +220,47 @@ int main(int argc, char *argv[])
192220

193221
/* -- cmpset int tests -- */
194222

195-
volint = 42, oldint = 42, newint = 50;
223+
volint = 42;
224+
oldint = 42;
225+
newint = 50;
196226
assert(opal_atomic_compare_exchange_strong (&volint, &oldint, newint) == true);
197227
opal_atomic_rmb();
198228
assert(volint == newint);
199229
assert(oldint == 42);
200230

201-
volint = 42, oldint = 420, newint = 50;
231+
volint = 42;
232+
oldint = 420;
233+
newint = 50;
202234
assert(opal_atomic_compare_exchange_strong (&volint, &oldint, newint) == false);
203235
opal_atomic_rmb();
204236
assert(volint == 42);
205237
assert(oldint == 42);
206238

207-
volint = 42, oldint = 42, newint = 50;
239+
volint = 42;
240+
oldint = 42;
241+
newint = 50;
208242
assert(opal_atomic_compare_exchange_strong_acq (&volint, &oldint, newint) == true);
209243
assert(volint == newint);
210244
assert(oldint == 42);
211245

212-
volint = 42, oldint = 420, newint = 50;
246+
volint = 42;
247+
oldint = 420;
248+
newint = 50;
213249
assert(opal_atomic_compare_exchange_strong_acq (&volint, &oldint, newint) == false);
214250
assert(volint == 42);
215251
assert(oldint == 42);
216252

217-
volint = 42, oldint = 42, newint = 50;
253+
volint = 42;
254+
oldint = 42;
255+
newint = 50;
218256
assert(opal_atomic_compare_exchange_strong_rel (&volint, &oldint, newint) == true);
219257
opal_atomic_rmb();
220258
assert(volint == newint);
221259
assert(oldint == 42);
222260

223-
volint = 42, oldint = 420, newint = 50;
261+
volint = 42;
262+
oldint = 420;
263+
newint = 50;
224264
assert(opal_atomic_compare_exchange_strong_rel (&volint, &oldint, newint) == false);
225265
opal_atomic_rmb();
226266
assert(volint == 42);
@@ -229,35 +269,47 @@ int main(int argc, char *argv[])
229269

230270
/* -- cmpset ptr tests -- */
231271

232-
volptr = 42, oldptr = 42, newptr = 50;
272+
volptr = 42;
273+
oldptr = 42;
274+
newptr = 50;
233275
assert(opal_atomic_compare_exchange_strong_ptr (&volptr, &oldptr, newptr) == true);
234276
opal_atomic_rmb();
235277
assert(volptr == newptr);
236278
assert(oldptr == 42);
237279

238-
volptr = 42, oldptr = 420, newptr = 50;
280+
volptr = 42;
281+
oldptr = 420;
282+
newptr = 50;
239283
assert(opal_atomic_compare_exchange_strong_ptr (&volptr, &oldptr, newptr) == false);
240284
opal_atomic_rmb();
241285
assert(volptr == 42);
242286
assert(oldptr == 42);
243287

244-
volptr = 42, oldptr = 42, newptr = 50;
288+
volptr = 42;
289+
oldptr = 42;
290+
newptr = 50;
245291
assert(opal_atomic_compare_exchange_strong_acq_ptr (&volptr, &oldptr, newptr) == true);
246292
assert(volptr == newptr);
247293
assert(oldptr == 42);
248294

249-
volptr = 42, oldptr = 420, newptr = 50;
295+
volptr = 42;
296+
oldptr = 420;
297+
newptr = 50;
250298
assert(opal_atomic_compare_exchange_strong_acq_ptr (&volptr, &oldptr, newptr) == false);
251299
assert(volptr == 42);
252300
assert(oldptr == 42);
253301

254-
volptr = 42, oldptr = 42, newptr = 50;
302+
volptr = 42;
303+
oldptr = 42;
304+
newptr = 50;
255305
assert(opal_atomic_compare_exchange_strong_rel_ptr (&volptr, &oldptr, newptr) == true);
256306
opal_atomic_rmb();
257307
assert(volptr == newptr);
258308
assert(oldptr == 42);
259309

260-
volptr = 42, oldptr = 420, newptr = 50;
310+
volptr = 42;
311+
oldptr = 420;
312+
newptr = 50;
261313
assert(opal_atomic_compare_exchange_strong_rel_ptr (&volptr, &oldptr, newptr) == false);
262314
opal_atomic_rmb();
263315
assert(volptr == 42);

‎test/class/ompi_rb_tree.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
#define NUM_KEYS 10000
3636
#define SEED 1
37-
int keys[] = {
37+
int global_keys[] = {
3838
0, 1, 2, 3, 4, 5, 6, 7
3939
};
4040

@@ -147,95 +147,95 @@ void test1(void)
147147
test_failure("failed to properly initialize the tree");
148148
}
149149

150-
rc = opal_rb_tree_insert(&tree, &keys[0], &values[0]);
150+
rc = opal_rb_tree_insert(&tree, &global_keys[0], &values[0]);
151151
if(!test_verify_int(OPAL_SUCCESS, rc)) {
152152
test_failure("failed to properly insert a new node");
153153
}
154-
result = opal_rb_tree_find(&tree, &keys[0]);
154+
result = opal_rb_tree_find(&tree, &global_keys[0]);
155155
if(NULL == result) {
156156
test_failure("lookup returned null!");
157157
}
158158
if(!test_verify_int(values[0], *((int *) result))) {
159159
test_failure("failed to properly insert a new node");
160160
}
161161

162-
rc = opal_rb_tree_insert(&tree, &keys[1], &values[1]);
162+
rc = opal_rb_tree_insert(&tree, &global_keys[1], &values[1]);
163163
if(!test_verify_int(OPAL_SUCCESS, rc)) {
164164
test_failure("failed to properly insert a new node");
165165
}
166-
result = opal_rb_tree_find(&tree, &keys[1]);
166+
result = opal_rb_tree_find(&tree, &global_keys[1]);
167167
if(NULL == result) {
168168
test_failure("lookup returned null!");
169169
}
170170
if(!test_verify_int(values[1], *((int *) result))) {
171171
test_failure("failed to properly insert a new node");
172172
}
173173

174-
rc = opal_rb_tree_insert(&tree, &keys[2], &values[2]);
174+
rc = opal_rb_tree_insert(&tree, &global_keys[2], &values[2]);
175175
if(!test_verify_int(OPAL_SUCCESS, rc)) {
176176
test_failure("failed to properly insert a new node");
177177
}
178-
result = opal_rb_tree_find(&tree, &keys[2]);
178+
result = opal_rb_tree_find(&tree, &global_keys[2]);
179179
if(NULL == result) {
180180
test_failure("lookup returned null!");
181181
}
182182
if(!test_verify_int(values[2], *((int *) result))) {
183183
test_failure("failed to properly insert a new node");
184184
}
185185

186-
rc = opal_rb_tree_insert(&tree, &keys[3], &values[3]);
186+
rc = opal_rb_tree_insert(&tree, &global_keys[3], &values[3]);
187187
if(!test_verify_int(OPAL_SUCCESS, rc)) {
188188
test_failure("failed to properly insert a new node");
189189
}
190-
result = opal_rb_tree_find(&tree, &keys[3]);
190+
result = opal_rb_tree_find(&tree, &global_keys[3]);
191191
if(NULL == result) {
192192
test_failure("lookup returned null!");
193193
}
194194
if(!test_verify_int(values[3], *((int *) result))) {
195195
test_failure("failed to properly insert a new node");
196196
}
197197

198-
rc = opal_rb_tree_insert(&tree, &keys[4], &values[4]);
198+
rc = opal_rb_tree_insert(&tree, &global_keys[4], &values[4]);
199199
if(!test_verify_int(OPAL_SUCCESS, rc)) {
200200
test_failure("failed to properly insert a new node");
201201
}
202-
result = opal_rb_tree_find(&tree, &keys[4]);
202+
result = opal_rb_tree_find(&tree, &global_keys[4]);
203203
if(NULL == result) {
204204
test_failure("lookup returned null!");
205205
}
206206
if(!test_verify_int(values[4], *((int *) result))) {
207207
test_failure("failed to properly insert a new node");
208208
}
209209

210-
rc = opal_rb_tree_insert(&tree, &keys[5], &values[5]);
210+
rc = opal_rb_tree_insert(&tree, &global_keys[5], &values[5]);
211211
if(!test_verify_int(OPAL_SUCCESS, rc)) {
212212
test_failure("failed to properly insert a new node");
213213
}
214-
result = opal_rb_tree_find(&tree, &keys[5]);
214+
result = opal_rb_tree_find(&tree, &global_keys[5]);
215215
if(NULL == result) {
216216
test_failure("lookup returned null!");
217217
}
218218
if(!test_verify_int(values[5], *((int *) result))) {
219219
test_failure("failed to properly insert a new node");
220220
}
221221

222-
rc = opal_rb_tree_insert(&tree, &keys[6], &values[6]);
222+
rc = opal_rb_tree_insert(&tree, &global_keys[6], &values[6]);
223223
if(!test_verify_int(OPAL_SUCCESS, rc)) {
224224
test_failure("failed to properly insert a new node");
225225
}
226-
result = opal_rb_tree_find(&tree, &keys[6]);
226+
result = opal_rb_tree_find(&tree, &global_keys[6]);
227227
if(NULL == result) {
228228
test_failure("lookup returned null!");
229229
}
230230
if(!test_verify_int(values[6], *((int *) result))) {
231231
test_failure("failed to properly insert a new node");
232232
}
233233

234-
rc = opal_rb_tree_insert(&tree, &keys[7], &values[7]);
234+
rc = opal_rb_tree_insert(&tree, &global_keys[7], &values[7]);
235235
if(!test_verify_int(OPAL_SUCCESS, rc)) {
236236
test_failure("failed to properly insert a new node");
237237
}
238-
result = opal_rb_tree_find(&tree, &keys[7]);
238+
result = opal_rb_tree_find(&tree, &global_keys[7]);
239239
if(NULL == result) {
240240
test_failure("lookup returned null!");
241241
}
@@ -248,11 +248,11 @@ void test1(void)
248248
test_failure("failed to properly insert a new node");
249249
}
250250

251-
rc = opal_rb_tree_delete(&tree, &keys[0]);
251+
rc = opal_rb_tree_delete(&tree, &global_keys[0]);
252252
if(!test_verify_int(OPAL_SUCCESS, rc)) {
253253
test_failure("failed to properly delete a node");
254254
}
255-
result = opal_rb_tree_find(&tree, &keys[0]);
255+
result = opal_rb_tree_find(&tree, &global_keys[0]);
256256
if(NULL != result) {
257257
test_failure("lookup returned a value instead of null!");
258258
} else {

‎test/class/opal_proc_table.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ static void test_ptable(opal_proc_table_t *table)
181181
fprintf(error_out, "\nTesting integer keys...\n");
182182
for ( j = 0; num_keys[j]; j += 3)
183183
{
184-
opal_process_name_t key;
185-
key.jobid = atoi(num_keys[j]);
186-
key.vpid = atoi(num_keys[j+1]);
187-
opal_proc_table_set_value(table, key, num_keys[j+2]);
184+
opal_process_name_t key2;
185+
key2.jobid = atoi(num_keys[j]);
186+
key2.vpid = atoi(num_keys[j+1]);
187+
opal_proc_table_set_value(table, key2, num_keys[j+2]);
188188
}
189189
validate_table(table, num_keys);
190190
rc = opal_proc_table_get_first_key(table, &key, (void **)&v, (void **)&n1, (void **)&n2);

0 commit comments

Comments
 (0)