bryancall commented on code in PR #13733: URL: https://github.com/apache/trafficserver/pull/13733#discussion_r4379608128
########## src/tscore/Demangle.cc: ########## @@ -0,0 +1,79 @@ +/** @file + + Readable C++ type names. + + @section license License + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +#include "tscore/Demangle.h" + +#include <cstdlib> +#include <cxxabi.h> +#include <exception> +#include <memory> + +namespace +{ +struct FreeDeleter { + void + operator()(char *p) const noexcept + { + std::free(p); + } +}; +} // namespace + +namespace ts +{ +std::string +demangle(std::type_info const &type) noexcept +{ + try { + int status = 0; + std::unique_ptr<char, FreeDeleter> name{abi::__cxa_demangle(type.name(), nullptr, nullptr, &status)}; + + return status == 0 && name != nullptr ? name.get() : type.name(); + } catch (...) { + return "<unknown>"; + } +} + +std::string +describe_current_exception() noexcept +{ + std::exception_ptr const ep = std::current_exception(); + + try { + if (!ep) { + return "no active exception"; + } + try { + std::rethrow_exception(ep); + } catch (std::exception const &ex) { + return demangle(typeid(ex)) + ": " + ex.what(); + } catch (...) { + if (std::type_info const *type = abi::__cxa_current_exception_type(); type != nullptr) { + return "exception of type " + demangle(*type); + } Review Comment: ATS only builds with GCC and Clang on Itanium C++ ABI platforms (Linux, macOS, FreeBSD), where `<cxxabi.h>` and both functions are always present. `src/traffic_crashlog/backtrace.cc` already includes `<cxxabi.h>` unguarded, so a guard here would cover a build that cannot happen. ########## tests/uranium_tests/command_argument/test_traffic_cache_tool_bad_aos.py: ########## @@ -0,0 +1,44 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import re + +from tools.uranium.services import ATS, ATSFactory + + +def configure_ats(ats_factory: ATSFactory) -> ATS: + """Create the runroot whose environment locates traffic_cache_tool. + + :param ats_factory: Factory for isolated Traffic Server instances. + """ + + return ats_factory.create("ts") + + +def test_traffic_cache_tool_bad_aos(ats_factory: ATSFactory) -> None: + """A non-numeric --aos is reported by traffic_cache_tool, which exits with 1 instead of aborting. + + std::stoi throws std::invalid_argument on the value. main() must report the exception and + return 1 rather than let it reach std::terminate, which would abort with SIGABRT. + + :param ats_factory: Factory for isolated Traffic Server instances. + """ + _ats = configure_ats(ats_factory) + + _ats.start() + result = _ats.run("traffic_cache_tool", "--aos", "abc", "list") + assert result.returncode == 1, result.output + assert re.search(r"traffic_cache_tool: terminating on an unhandled std::\S*invalid_argument: \S", result.stderr), result.output Review Comment: The pattern is not anchored at the end, so `: \S` only requires at least one non-space character after the colon and matches any longer `what()` text, spaces included. It is meant to check that a message is present without depending on its wording. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
