mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
479f8de1b3
This patch c++ifies the osdata structure: osdata_column, osdata_item and osdata. char* are replaced with std::string and VEC are replaced with std::vector. This allows to get rid of a great deal of cleanup and free'ing code. I replaced the splay tree in list_available_thread_groups with an std::map. Unless there's a good advantage to keep using a splay tree, I think using the standard type should make things simpler to understand. gdb/ChangeLog: * osdata.h: Include vector isntead of vec.h. (osdata_column_s): Remove typedef. (struct osdata_column): Add constructor. <name, value>: Change type to std::string. (DEF_VEC_O (osdata_column_s)): Remove. (osdata_item_s): Remove typedef. (struct osdata_item) <columns>: Change type to std::vector. (DEF_VEC_O (osdata_item_s)): Remove. (struct osdata): Add constructor. <type>: Change type to std::string. <items>: Change type to std::vector. (osdata_p): Remove typedef. (DEF_VEC_P (osdata_p)): Remove. (osdata_parse): Return a unique_ptr. (osdata_free): Remove. (make_cleanup_osdata_free): Remove. (get_osdata): Return a unique_ptr. (get_osdata_column): Return pointer to std::string, take a reference to osdata_item as parameter. * osdata.c (struct osdata_parsing_data) <osdata>: Change type to unique_ptr. <property_name>: Change type to std::string. (osdata_start_osdata): Allocate osdata with new and adjust. (osdata_start_item): Adjust. (osdata_start_column): Adjust. (osdata_end_column): Adjust. (clear_parsing_data): Remove. (osdata_parse): Return a unique_ptr and adjust, remove cleanup. (osdata_item_clear): Remove. (get_osdata): return a unique_ptr and adjust. (get_osdata_column): Return a pointer to std::string and adjust. (info_osdata): Adjust. * mi/mi-main.c: Include <map>. (free_vector_of_osdata_items): Remove. (list_available_thread_groups): Adjust, use std::map instead of splay tree.
61 lines
1.6 KiB
C++
61 lines
1.6 KiB
C++
/* Routines for handling XML generic OS data provided by target.
|
|
|
|
Copyright (C) 2008-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef OSDATA_H
|
|
#define OSDATA_H
|
|
|
|
#include <vector>
|
|
|
|
struct osdata_column
|
|
{
|
|
osdata_column (std::string &&name_, std::string &&value_)
|
|
: name (std::move (name_)), value (std::move (value_))
|
|
{}
|
|
|
|
std::string name;
|
|
std::string value;
|
|
};
|
|
|
|
struct osdata_item
|
|
{
|
|
std::vector<osdata_column> columns;
|
|
};
|
|
|
|
struct osdata
|
|
{
|
|
osdata (std::string &&type_)
|
|
: type (std::move (type_))
|
|
{}
|
|
|
|
std::string type;
|
|
std::vector<osdata_item> items;
|
|
};
|
|
|
|
std::unique_ptr<osdata> osdata_parse (const char *xml);
|
|
std::unique_ptr<osdata> get_osdata (const char *type);
|
|
const std::string *get_osdata_column (const osdata_item &item,
|
|
const char *name);
|
|
|
|
/* Dump TYPE info to the current uiout builder. If TYPE is either
|
|
NULL or empty, then dump the top level table that lists the
|
|
available types of OS data. */
|
|
void info_osdata (const char *type);
|
|
|
|
#endif /* OSDATA_H */
|