mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-08-03 18:00:24 +00:00
Code Activity

log_help: Fix mem leaks

Browse source 
`_content` vector owns elements so that when the `ContentListing` is deleted so is the content.
Remove `get_content()` method in favour of `begin()` and `end()` const iterators.
More `const` in general, and iterations over `ContentListing` use `&content` to avoid copying data.
This commit is contained in:
Krystine Sherwin 2025-07-23 12:24:14 +12:00
parent c4f685c057
commit 3e8746e78b
No known key found for this signature in database
3 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

27
kernel/log_help.cc
View file

@ -21,7 +21,7 @@
USING_YOSYS_NAMESPACE USING_YOSYS_NAMESPACE
Json ContentListing::to_json() { Json ContentListing::to_json() const {
Json::object object; Json::object object;
object["type"] = type; object["type"] = type;
if (body.length()) object["body"] = body; if (body.length()) object["body"] = body;
@ -29,7 +29,7 @@ Json ContentListing::to_json() {
if (source_line != 0) object["source_line"] = source_line; if (source_line != 0) object["source_line"] = source_line;
object["options"] = Json(options); object["options"] = Json(options);
Json::array content_array; Json::array content_array;
for (auto child : _content) content_array.push_back(child->to_json()); for (auto child : _content) content_array.push_back(child.to_json());
object["content"] = content_array; object["content"] = content_array;
return object; return object;
} }
@ -73,9 +73,8 @@ ContentListing* ContentListing::open_option(const string &text,
const source_location location) const source_location location)
{ {
log_assert(type.compare("root") == 0 || type.compare("usage") == 0); log_assert(type.compare("root") == 0 || type.compare("usage") == 0);
auto option = new ContentListing("option", text, location); add_content("option", text, location);
add_content(option); return back();
return option;
} }
#define MAX_LINE_LEN 80 #define MAX_LINE_LEN 80
@ -131,20 +130,20 @@ PrettyHelp *PrettyHelp::get_current()
return current_help; return current_help;
} }
void PrettyHelp::log_help() void PrettyHelp::log_help() const
{ {
for (auto content : _root_listing.get_content()) { for (auto &content : _root_listing) {
if (content->type.compare("usage") == 0) { if (content.type.compare("usage") == 0) {
log_pass_str(content->body, 1, true); log_pass_str(content.body, 1, true);
log("\n"); log("\n");
} else if (content->type.compare("option") == 0) { } else if (content.type.compare("option") == 0) {
log_pass_str(content->body, 1); log_pass_str(content.body, 1);
for (auto text : content->get_content()) { for (auto text : content) {
log_pass_str(text->body, 2); log_pass_str(text.body, 2);
log("\n"); log("\n");
} }
} else { } else {
log_pass_str(content->body, 0); log_pass_str(content.body, 0);
log("\n"); log("\n");
} }
} }

36
kernel/log_help.h
View file

@ -26,7 +26,7 @@
YOSYS_NAMESPACE_BEGIN YOSYS_NAMESPACE_BEGIN
class ContentListing { class ContentListing {
vector<ContentListing *> _content; vector<ContentListing> _content;
public: public:
string type; string type;
string body; string body;
@ -45,22 +45,17 @@ public:
ContentListing(string type, string body, source_location location) : ContentListing(string type, string body, source_location location) :
ContentListing(type, body, location.file_name(), location.line()) { } ContentListing(type, body, location.file_name(), location.line()) { }
void add_content(ContentListing *new_content) {
_content.push_back(new_content);
}
void add_content(string type, string body, source_location location) { void add_content(string type, string body, source_location location) {
auto new_content = new ContentListing(type, body, location); _content.push_back({type, body, location});
add_content(new_content);
} }
bool has_content() { return _content.size() != 0; } bool has_content() const { return _content.size() != 0; }
const vector<ContentListing *> get_content() {
const vector<ContentListing *> content = _content; vector<ContentListing>::const_iterator begin() const { return _content.cbegin(); }
return content; vector<ContentListing>::const_iterator end() const { return _content.cend(); }
}
ContentListing* back() { ContentListing* back() {
return _content.back(); return &_content.back();
} }
void set_option(string key, string val = "") { void set_option(string key, string val = "") {
@ -95,7 +90,7 @@ public:
const source_location location = source_location::current() const source_location location = source_location::current()
); );
Json to_json(); Json to_json() const;
}; };
class PrettyHelp class PrettyHelp
@ -113,18 +108,19 @@ public:
static PrettyHelp *get_current(); static PrettyHelp *get_current();
bool has_content() { return _root_listing.has_content(); } bool has_content() const { return _root_listing.has_content(); }
const vector<ContentListing *> get_content() {
return _root_listing.get_content(); vector<ContentListing>::const_iterator begin() const { return _root_listing.begin(); }
} vector<ContentListing>::const_iterator end() const { return _root_listing.end(); }
ContentListing* get_root() { ContentListing* get_root() {
return &_root_listing; return &_root_listing;
} }
void set_group(const string g) { group = g; } void set_group(const string g) { group = g; }
bool has_group() { return group.compare("unknown") != 0; } bool has_group() const { return group.compare("unknown") != 0; }
void log_help(); void log_help() const;
}; };
YOSYS_NAMESPACE_END YOSYS_NAMESPACE_END

4
kernel/register.cc
View file

@ -923,8 +923,8 @@ struct HelpPass : public Pass {
json.name(name.c_str()); json.begin_object(); json.name(name.c_str()); json.begin_object();
json.entry("title", title); json.entry("title", title);
json.name("content"); json.begin_array(); json.name("content"); json.begin_array();
for (auto content : cmd_help.get_content()) for (auto &content : cmd_help)
json.value(content->to_json()); json.value(content.to_json());
json.end_array(); json.end_array();
json.entry("group", cmd_help.group); json.entry("group", cmd_help.group);
json.entry("source_file", pass->location.file_name()); json.entry("source_file", pass->location.file_name());