mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 07:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix printing of arguments

Browse Source
This commit is contained in:
Simon Cruanes 2023-12-27 12:30:24 -05:00
parent bf75b9fab0
commit 5ecd3a5e83
No known key found for this signature in database
GPG Key ID: EBFFF6F283F3A2B4
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
import-fuchsia/src/import-fuchsia.cpp
View File

@ -85,20 +85,18 @@ struct DecodeState {
// Append a string representation of `val` to `res` // Append a string representation of `val` to `res`
void appendArgumentValue(std::string &res, ArgumentValue &val) { void appendArgumentValue(std::string &res, ArgumentValue &val) {
char buf[32]; buf[31]=0;
if (std::holds_alternative<std::string>(val)) { if (std::holds_alternative<std::string>(val)) {
res += std::get<std::string>(val); res += std::get<std::string>(val);
} else if (std::holds_alternative<uint64_t>(val)) { } else if (std::holds_alternative<uint64_t>(val)) {
char buf[32];
snprintf(buf, 31, "%" PRIu64, std::get<uint64_t>(val)); snprintf(buf, 31, "%" PRIu64, std::get<uint64_t>(val));
res += buf; res.append(buf);
} else if (std::holds_alternative<int64_t>(val)) { } else if (std::holds_alternative<int64_t>(val)) {
char buf[32];
snprintf(buf, 31, "%" PRId64, std::get<int64_t>(val)); snprintf(buf, 31, "%" PRId64, std::get<int64_t>(val));
res += buf; res.append(buf);
} else if (std::holds_alternative<bool>(val)) { } else if (std::holds_alternative<bool>(val)) {
res += std::get<bool>(val) ? "true" : "false"; res += std::get<bool>(val) ? "true" : "false";
} else if (std::holds_alternative<double>(val)) { } else if (std::holds_alternative<double>(val)) {
char buf[32];
snprintf(buf, 31, "%.5f", std::get<double>(val)); snprintf(buf, 31, "%.5f", std::get<double>(val));
res += buf; res += buf;
} }
@ -284,14 +282,12 @@ void readArgument(std::vector<Argument> &args, DecodeState &dec,
} break; } break;
case 7: case 7:
// pointer // pointer
case 8: case 8: {
// koid // koid
{ uint64_t i = r.p[offset];
uint64_t i = r.p[offset]; offset += 1;
offset += 1; value = i;
value = i; } break;
}
break;
case 9: { case 9: {
// bool // bool
bool b = (bool)((header >> 32) & 1); bool b = (bool)((header >> 32) & 1);
@ -309,7 +305,6 @@ void readArgument(std::vector<Argument> &args, DecodeState &dec,
void readArguments(std::vector<Argument> &args, DecodeState &dec, Record r, void readArguments(std::vector<Argument> &args, DecodeState &dec, Record r,
size_t &offset, const int n_args) { size_t &offset, const int n_args) {
args.clear(); args.clear();
for (int i = 0; i < n_args; ++i) for (int i = 0; i < n_args; ++i)
readArgument(args, dec, r, offset); readArgument(args, dec, r, offset);
} }
@ -317,7 +312,7 @@ void readArguments(std::vector<Argument> &args, DecodeState &dec, Record r,
// text made of arguments // text made of arguments
void printArgumentsToString(std::string &res, std::vector<Argument> &args) { void printArgumentsToString(std::string &res, std::vector<Argument> &args) {
for (auto &kv : args) { for (auto &kv : args) {
res += kv.name; res += kv.name.data();
res += ": "; res += ": ";
appendArgumentValue(res, kv.value); appendArgumentValue(res, kv.value);
res += "\n"; res += "\n";