comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-29 06:35:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

OMP/TRACE: fixed compilation warnings (#3785)

Browse source 
- Adjust trace level if assertions are requested but NDEBUG is defined.
- Avoid warnings about casting away qualifier (-Wcast-qual).
This commit is contained in:
Hans Pabst 2024-11-25 09:11:54 +01:00 • committed by GitHub
parent 262480dea4
commit 9dfcaf3174
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/base/openmp_trace.c
View file

@ -132,7 +132,7 @@ static void openmp_trace_symbol(const void *symbol, char *str, size_t size,
#else
int pipefd[2];
if (NULL != symbol && 0 == pipe(pipefd)) {
void *const backtrace[] = {(void *)symbol};
void *const backtrace[] = {(void *)(uintptr_t)symbol};
backtrace_symbols_fd(backtrace, 1, pipefd[1]);
close(pipefd[1]);
if (0 < read(pipefd[0], str, size)) {
@ -259,7 +259,7 @@ static void openmp_trace_master(ompt_scope_endpoint_t endpoint,
}
if (0 == sync_n) {
assert(OPENMP_TRACE_PTR(codeptr_ra, 0) == codeptr_ra);
parallel_data->ptr = (void *)codeptr_ra;
parallel_data->ptr = (void *)(uintptr_t)codeptr_ra;
openmp_trace_sync = parallel_data;
}
} break;
@ -295,7 +295,8 @@ void openmp_trace_sync_region(ompt_sync_region_t kind,
}
if (0 == sync_n) {
assert(OPENMP_TRACE_PTR(codeptr_ra, 0) == codeptr_ra);
parallel_data->ptr = (void *)OPENMP_TRACE_PTR(codeptr_ra, kind);
parallel_data->ptr =
(void *)(uintptr_t)OPENMP_TRACE_PTR(codeptr_ra, kind);
openmp_trace_sync = parallel_data;
} else if (openmp_trace_level_warn <= openmp_trace_level ||
0 > openmp_trace_level) {
@ -366,7 +367,8 @@ static void openmp_trace_work(ompt_work_t wstype,
const int kind = wstype - ompt_work_sections +
ompt_sync_region_barrier_implementation;
assert(OPENMP_TRACE_PTR(codeptr_ra, 0) == codeptr_ra);
parallel_data->ptr = (void *)OPENMP_TRACE_PTR(codeptr_ra, kind);
parallel_data->ptr =
(void *)(uintptr_t)OPENMP_TRACE_PTR(codeptr_ra, kind);
openmp_trace_sync = parallel_data;
}
} break;
@ -437,6 +439,11 @@ ompt_start_tool_result_t *ompt_start_tool(unsigned int omp_version,
openmp_start_tool.finalize = (ompt_finalize_t)openmp_trace_finalize;
openmp_start_tool.tool_data.ptr = NULL;
result = &openmp_start_tool;
#if defined(NDEBUG)
if (1 == openmp_trace_level) {
openmp_trace_level = 2; /* adjust trace level */
}
#endif
}
return result;
}