Hash :
7a85d114
Author :
Date :
2022-03-25T15:01:17
Use [[nodiscard]] on RAII classes
Scoped* classes provide an RAII way of adding cleanup/restore state/etc
in a robust way. Unfortunatley, it's very easy to mistakenly leave the
variable name, leading to the destructor being called immediately
instead of at the end of the scope:
{
ScopedX(parameters); // instead of ScopedX x(parameters);
// Code here is run after destructor
}
The [[nodiscard]] attribute, if specified on the ScopedX class would
lead to a warning (turned to error with -Werror). This change does
that for classes named *Scoped* in ANGLE.
Bug: chromium:1103817
Change-Id: I65c9922c9b4eba1f9c033e093fe8fe534648ab62
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3552092
Reviewed-by: Lingfeng Yang <lfy@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
// Copyright 2021 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// angle_native_test:
// Contains native implementation for com.android.angle.test.AngleNativeTest.
#include <jni.h>
#include <vector>
#include <android/log.h>
#include <errno.h>
#include <signal.h>
#include <string.h>
#include <unistd.h>
#include "common/angleutils.h"
#include "common/string_utils.h"
// The main function of the program to be wrapped as a test apk.
extern int main(int argc, char **argv);
namespace
{
const char kLogTag[] = "chromium";
const char kCrashedMarker[] = "[ CRASHED ]\n";
// The list of signals which are considered to be crashes.
const int kExceptionSignals[] = {SIGSEGV, SIGABRT, SIGFPE, SIGILL, SIGBUS, -1};
struct sigaction g_old_sa[NSIG];
class ANGLE_NO_DISCARD ScopedMainEntryLogger
{
public:
ScopedMainEntryLogger() { printf(">>ScopedMainEntryLogger\n"); }
~ScopedMainEntryLogger()
{
printf("<<ScopedMainEntryLogger\n");
fflush(stdout);
fflush(stderr);
}
};
// This function runs in a compromised context. It should not allocate memory.
void SignalHandler(int sig, siginfo_t *info, void *reserved)
{
// Output the crash marker.
write(STDOUT_FILENO, kCrashedMarker, sizeof(kCrashedMarker) - 1);
g_old_sa[sig].sa_sigaction(sig, info, reserved);
}
std::string ASCIIJavaStringToUTF8(JNIEnv *env, jstring str)
{
if (!str)
{
return "";
}
const jsize length = env->GetStringLength(str);
if (!length)
{
return "";
}
// JNI's GetStringUTFChars() returns strings in Java "modified" UTF8, so
// instead get the String in UTF16. As the input is ASCII, drop the higher
// bytes.
const jchar *jchars = env->GetStringChars(str, NULL);
const char16_t *chars = reinterpret_cast<const char16_t *>(jchars);
std::string out(chars, chars + length);
env->ReleaseStringChars(str, jchars);
return out;
}
size_t ArgsToArgv(const std::vector<std::string> &args, std::vector<char *> *argv)
{
// We need to pass in a non-const char**.
size_t argc = args.size();
argv->resize(argc + 1);
for (size_t i = 0; i < argc; ++i)
{
(*argv)[i] = const_cast<char *>(args[i].c_str());
}
(*argv)[argc] = NULL; // argv must be NULL terminated.
return argc;
}
void InstallExceptionHandlers()
{
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
sa.sa_sigaction = SignalHandler;
sa.sa_flags = SA_SIGINFO;
for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i)
{
sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]);
}
}
void AndroidLog(int priority, const char *format, ...)
{
va_list args;
va_start(args, format);
__android_log_vprint(priority, kLogTag, format, args);
va_end(args);
}
} // anonymous namespace
extern "C" JNIEXPORT void JNICALL
Java_com_android_angle_test_AngleNativeTest_nativeRunTests(JNIEnv *env,
jclass clazz,
jstring jcommandLineFlags,
jstring jcommandLineFilePath,
jstring jstdoutFilePath)
{
InstallExceptionHandlers();
const std::string commandLineFlags(ASCIIJavaStringToUTF8(env, jcommandLineFlags));
const std::string commandLineFilePath(ASCIIJavaStringToUTF8(env, jcommandLineFilePath));
const std::string stdoutFilePath(ASCIIJavaStringToUTF8(env, jstdoutFilePath));
std::vector<std::string> args;
if (commandLineFilePath.empty())
{
args.push_back("_");
}
else
{
std::string commandLineString;
if (angle::ReadFileToString(commandLineFilePath, &commandLineString))
{
angle::SplitStringAlongWhitespace(commandLineString, &args);
}
}
angle::SplitStringAlongWhitespace(commandLineFlags, &args);
// A few options, such "--gtest_list_tests", will just use printf directly
// Always redirect stdout to a known file.
FILE *stdoutFile = fopen(stdoutFilePath.c_str(), "a+");
if (stdoutFile == NULL)
{
AndroidLog(ANDROID_LOG_ERROR, "Failed to open stdout file: %s: %s\n",
stdoutFilePath.c_str(), strerror(errno));
exit(EXIT_FAILURE);
}
int oldStdout = dup(STDOUT_FILENO);
if (oldStdout == -1)
{
AndroidLog(ANDROID_LOG_ERROR, "Failed to dup stdout: %d\n", errno);
fclose(stdoutFile);
exit(EXIT_FAILURE);
}
int retVal = dup2(fileno(stdoutFile), STDOUT_FILENO);
if (retVal == -1)
{
AndroidLog(ANDROID_LOG_ERROR, "Failed to dup2 stdout to file: %d\n", errno);
fclose(stdoutFile);
close(oldStdout);
exit(EXIT_FAILURE);
}
dup2(STDOUT_FILENO, STDERR_FILENO);
std::vector<char *> argv;
size_t argc = ArgsToArgv(args, &argv);
{
ScopedMainEntryLogger scoped_main_entry_logger;
main(static_cast<int>(argc), &argv[0]);
}
fclose(stdoutFile);
dup2(oldStdout, STDOUT_FILENO);
close(oldStdout);
}