Antonio Ospite
222b85328e
The standard way to query options in mesa is `os_get_option()` which
abstracts platform-specific mechanisms to get config variables.
However in quite a few places `getenv()` is still used and this may
preclude controlling some options on some systems.
For instance it is not generally possible to use `MESA_DEBUG` on
Android.
So replace most `getenv()` occurrences with `os_get_option()` to
support configuration options more consistently across different
platforms.
Do the same with `secure_getenv()` replacing it with
`os_get_option_secure()`.
The bulk of the proposed changes are mechanically performed by the
following script:
-----------------------------------------------------------------------
#!/bin/sh
set -e
replace() {
# Don't replace in some files, for example where `os_get_option` is defined,
# or in external files
EXCLUDE_FILES_PATTERN='(src/util/os_misc.c|src/util/u_debug.h|src/gtest/include/gtest/internal/gtest-port.h)'
# Don't replace some "system" variables
EXCLUDE_VARS_PATTERN='("XDG|"DISPLAY|"HOME|"TMPDIR|"POSIXLY_CORRECT)'
git grep "[=!( ]$1(" -- src/ | cut -d ':' -f 1 | sort | uniq | \
grep -v -E "$EXCLUDE_FILES_PATTERN" | \
while read -r file;
do
# Don't replace usages of XDG_* variables or HOME
sed -E -e "/$EXCLUDE_VARS_PATTERN/!s/([=!\( ])$1\(/\1$2\(/g" -i "$file";
done
}
# Add const to os_get_option results, to avoid warning about discarded qualifier:
# warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
# but also errors in some cases:
# error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]
add_const_results() {
git grep -l -P '(?<!const )char.*os_get_option' | \
while read -r file;
do
sed -e '/^\s*const/! s/\(char.*os_get_option\)/const \1/g' -i "$file"
done
}
replace 'secure_getenv' 'os_get_option_secure'
replace 'getenv' 'os_get_option'
add_const_results
-----------------------------------------------------------------------
After this, the `#include "util/os_misc.h"` is also added in files where
`os_get_option()` was not used before.
And since the replacements from the script above generated some new
`-Wdiscarded-qualifiers` warnings, those have been addressed as well,
generally by declaring `os_get_option()` results as `const char *` and
adjusting some function declarations.
Finally some replacements caused new errors like:
-----------------------------------------------------------------------
../src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:127:31: error: no matching function for call to 'strtok'
127 | for (n = 0, option = strtok(env_llc_options, " "); option; n++, option = strtok(NULL, " ")) {
| ^~~~~~
/android-ndk-r27c/toolchains/llvm/prebuilt/linux-x86_64/bin/../sysroot/usr/include/string.h:124:17: note: candidate function not viable: 1st argument ('const char *') would lose const qualifier
124 | char* _Nullable strtok(char* _Nullable __s, const char* _Nonnull __delimiter);
| ^ ~~~~~~~~~~~~~~~~~~~
-----------------------------------------------------------------------
Those have been addressed too, copying the const string returned by
`os_get_option()` so that it could be modified.
In particular, the error above has been fixed by copying the `const
char *env_llc_options` variable in
`src/gallium/auxiliary/gallivm/lp_bld_misc.cpp` to a `char *` which can
be tokenized using `strtok()`.
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38128>
116 lines
3.3 KiB
C
116 lines
3.3 KiB
C
/*
|
|
* Copyright © 2020 Advanced Micro Devices, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
/* A collection of unit tests for u_process.c */
|
|
|
|
#include "util/detect_os.h"
|
|
#include "util/os_misc.h"
|
|
#include "util/u_process.h"
|
|
#include <stdio.h>
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
|
|
#if DETECT_OS_WINDOWS && !defined(PATH_MAX)
|
|
#include <windows.h>
|
|
#define PATH_MAX MAX_PATH
|
|
#endif
|
|
|
|
static bool error = false;
|
|
|
|
static void
|
|
expect_equal_str(const char *expected, const char *actual, const char *test)
|
|
{
|
|
if (strcmp(expected, actual)) {
|
|
fprintf (stderr, "Error: Test '%s' failed:\n\t"
|
|
"Expected=\"%s\", Actual=\"%s\"\n",
|
|
test, expected, actual);
|
|
error = true;
|
|
}
|
|
}
|
|
|
|
static void
|
|
test_util_get_process_name (void)
|
|
{
|
|
#if DETECT_OS_WINDOWS
|
|
const char *expected = "process_test.exe";
|
|
#else
|
|
const char *expected = "process_test";
|
|
#endif
|
|
|
|
const char *name_override = os_get_option("MESA_PROCESS_NAME");
|
|
if (name_override)
|
|
expected = name_override;
|
|
|
|
const char *name = util_get_process_name();
|
|
expect_equal_str(expected, name, "util_get_process_name");
|
|
}
|
|
|
|
static void posixify_path(char *path) {
|
|
/* Always using posix separator '/' to check path equal */
|
|
char *p = path;
|
|
for (; *p != '\0'; p += 1) {
|
|
if (*p == '\\') {
|
|
*p = '/';
|
|
}
|
|
}
|
|
}
|
|
|
|
/* This test gets the real path from Meson (BUILD_FULL_PATH env var),
|
|
* and compares it to the output of util_get_process_exec_path.
|
|
*/
|
|
static void
|
|
test_util_get_process_exec_path (void)
|
|
{
|
|
char path[PATH_MAX];
|
|
if (util_get_process_exec_path(path, PATH_MAX) == 0) {
|
|
error = true;
|
|
return;
|
|
}
|
|
posixify_path(path);
|
|
char* build_path = os_get_option_dup("BUILD_FULL_PATH");
|
|
if (!build_path) {
|
|
fprintf(stderr, "BUILD_FULL_PATH environment variable should be set\n");
|
|
error = true;
|
|
return;
|
|
}
|
|
posixify_path(build_path);
|
|
#ifdef __CYGWIN__
|
|
int i = strlen(build_path) - 4;
|
|
if ((i > 0) && (strcmp(&build_path[i], ".exe") == 0))
|
|
build_path[i] = 0;
|
|
#endif
|
|
expect_equal_str(build_path, path, "test_util_get_process_exec_path");
|
|
free(build_path);
|
|
}
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
test_util_get_process_name();
|
|
test_util_get_process_exec_path();
|
|
|
|
return error ? 1 : 0;
|
|
}
|