Skip to content

Commit e0f3acc

Browse files
committed
[OpenMP][Tests][NFC] rename macro to avoid naming clash
Rename a macro and macro use missed in 35ab6d6
1 parent 449e36c commit e0f3acc

File tree

1 file changed

+24
-24
lines changed
  • openmp/tools/multiplex/tests/custom_data_storage

1 file changed

+24
-24
lines changed

openmp/tools/multiplex/tests/custom_data_storage/first-tool.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -240,44 +240,44 @@ ompt_data_t *ompt_get_own_thread_data() {
240240
return get_own_ompt_data(ompt_cds_get_thread_data());
241241
}
242242

243-
#define register_callback2_t(name, type) \
243+
#define register_ompt_callback2_t(name, type) \
244244
do { \
245245
type f_##name = &on_cds_##name; \
246246
if (ompt_set_callback(name, (ompt_callback_t)f_##name) == ompt_set_never) \
247247
printf("0: Could not register callback '" #name "'\n"); \
248248
} while (0)
249249

250-
#define register_callback2(name) register_callback2_t(name, name##_t)
250+
#define register_ompt_callback2(name) register_callback2_t(name, name##_t)
251251

252252
int ompt_cds_initialize(ompt_function_lookup_t lookup, int initial_device_num,
253253
ompt_data_t *tool_data) {
254254
ompt_initialize(lookup, initial_device_num, tool_data);
255255
ompt_cds_get_thread_data = ompt_get_thread_data;
256256
ompt_get_thread_data = ompt_get_own_thread_data;
257257

258-
register_callback(ompt_callback_mutex_acquire);
259-
register_callback_t(ompt_callback_mutex_acquired, ompt_callback_mutex_t);
260-
register_callback_t(ompt_callback_mutex_released, ompt_callback_mutex_t);
261-
register_callback(ompt_callback_nest_lock);
262-
register_callback2(ompt_callback_sync_region);
263-
register_callback2_t(ompt_callback_sync_region_wait,
258+
register_ompt_callback(ompt_callback_mutex_acquire);
259+
register_ompt_callback_t(ompt_callback_mutex_acquired, ompt_callback_mutex_t);
260+
register_ompt_callback_t(ompt_callback_mutex_released, ompt_callback_mutex_t);
261+
register_ompt_callback(ompt_callback_nest_lock);
262+
register_ompt_callback2(ompt_callback_sync_region);
263+
register_ompt_callback2_t(ompt_callback_sync_region_wait,
264264
ompt_callback_sync_region_t);
265-
register_callback2(ompt_callback_control_tool);
266-
register_callback2(ompt_callback_flush);
267-
register_callback2(ompt_callback_cancel);
268-
register_callback2(ompt_callback_implicit_task);
269-
register_callback_t(ompt_callback_lock_init, ompt_callback_mutex_acquire_t);
270-
register_callback_t(ompt_callback_lock_destroy, ompt_callback_mutex_t);
271-
register_callback2(ompt_callback_work);
272-
register_callback2(ompt_callback_master);
273-
register_callback2(ompt_callback_parallel_begin);
274-
register_callback2(ompt_callback_parallel_end);
275-
register_callback2(ompt_callback_task_create);
276-
register_callback2(ompt_callback_task_schedule);
277-
register_callback2(ompt_callback_dependences);
278-
register_callback2(ompt_callback_task_dependence);
279-
register_callback2(ompt_callback_thread_begin);
280-
register_callback2(ompt_callback_thread_end);
265+
register_ompt_callback2(ompt_callback_control_tool);
266+
register_ompt_callback2(ompt_callback_flush);
267+
register_ompt_callback2(ompt_callback_cancel);
268+
register_ompt_callback2(ompt_callback_implicit_task);
269+
register_ompt_callback_t(ompt_callback_lock_init, ompt_callback_mutex_acquire_t);
270+
register_ompt_callback_t(ompt_callback_lock_destroy, ompt_callback_mutex_t);
271+
register_ompt_callback2(ompt_callback_work);
272+
register_ompt_callback2(ompt_callback_master);
273+
register_ompt_callback2(ompt_callback_parallel_begin);
274+
register_ompt_callback2(ompt_callback_parallel_end);
275+
register_ompt_callback2(ompt_callback_task_create);
276+
register_ompt_callback2(ompt_callback_task_schedule);
277+
register_ompt_callback2(ompt_callback_dependences);
278+
register_ompt_callback2(ompt_callback_task_dependence);
279+
register_ompt_callback2(ompt_callback_thread_begin);
280+
register_ompt_callback2(ompt_callback_thread_end);
281281
return 1; // success
282282
}
283283

0 commit comments

Comments
 (0)