Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement common LVM2_PV_Info cache search and index functions 

Create common cache search and index functions get_attr_by_name() and
get_attr_by_row() as the existing ones, get_pv_attr_by_*() and
get_vg_attr_by_*(), only differ from each other by the string vector
they use.
This commit is contained in:
Mike Fleetwood 2012-08-18 10:35:21 +01:00 committed by Curtis Gedak
parent fdb7e9fe89
commit 96c9fc129c
2 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/LVM2_PV_Info.h
View File

@ -53,6 +53,10 @@ private:
Glib::ustring get_pv_attr_by_row( unsigned int row, unsigned int entry ) const ;
Glib::ustring get_vg_attr_by_name( const Glib::ustring & vgname, unsigned int entry ) const ;
Glib::ustring get_vg_attr_by_row( unsigned int row, unsigned int entry ) const ;
static Glib::ustring get_attr_by_name( const std::vector<Glib::ustring> cache,
const Glib::ustring name, unsigned int entry ) ;
static Glib::ustring get_attr_by_row( const std::vector<Glib::ustring> cache,
unsigned int row, unsigned int entry ) ;
static Byte_Value lvm2_pv_attr_to_num( const Glib::ustring str ) ;
static bool bit_set( const Glib::ustring & attr, unsigned int bit ) ;
static bool lvm2_pv_info_cache_initialized ;

79
src/LVM2_PV_Info.cc
View File

@ -289,54 +289,41 @@ void LVM2_PV_Info::load_lvm2_pv_info_cache()
}
}
//Return PV's nth attribute. Performs linear search of the cache and
// uses the first matching PV entry. Attributes are numbered 0 upward
// using PV_ATTRIBUTE enumeration.
Glib::ustring LVM2_PV_Info::get_pv_attr_by_path( const Glib::ustring & path, unsigned int entry ) const
{
for ( unsigned int i = 0 ; i < lvm2_pv_cache .size() ; i ++ )
{
std::vector<Glib::ustring> pv_attrs ;
Utils::split( lvm2_pv_cache [i], pv_attrs, "," ) ;
if ( PVATTR_PV_NAME < pv_attrs .size() && path == pv_attrs [PVATTR_PV_NAME] )
{
if ( entry < pv_attrs .size() )
return pv_attrs [entry] ;
else
break ;
}
return get_attr_by_name( lvm2_pv_cache, path, entry ) ;
}
return "" ;
}
//Return PV's nth attribute from specified cache row. Row is numbered
// 0 upwards and attributes are numbers numbered 0 upwards using
// PV_ATTRIBUTE enumeration.
Glib::ustring LVM2_PV_Info::get_pv_attr_by_row( unsigned int row, unsigned int entry ) const
{
if ( row >= lvm2_pv_cache .size() )
return "" ;
std::vector<Glib::ustring> pv_attrs ;
Utils::split( lvm2_pv_cache [row], pv_attrs, "," ) ;
if ( entry < pv_attrs .size() )
return pv_attrs [entry] ;
return "" ;
return get_attr_by_row( lvm2_pv_cache, row, entry ) ;
}
//Return VG's nth attribute. Performs linear search of the cache and
// uses the first matching VG entry. Attributes are numbered 0 upward
// using VG_ATTRIBUTE enumeration.
Glib::ustring LVM2_PV_Info::get_vg_attr_by_name( const Glib::ustring & vgname, unsigned int entry ) const
{
for ( unsigned int i = 0 ; i < lvm2_vg_cache .size() ; i ++ )
return get_attr_by_name( lvm2_vg_cache, vgname, entry ) ;
}
Glib::ustring LVM2_PV_Info::get_vg_attr_by_row( unsigned int row, unsigned int entry ) const
{
std::vector<Glib::ustring> vg_attrs ;
Utils::split( lvm2_vg_cache [i], vg_attrs, "," ) ;
if ( VGATTR_VG_NAME < vg_attrs .size() && vgname == vg_attrs [VGATTR_VG_NAME] )
return get_attr_by_row( lvm2_vg_cache, row, entry ) ;
}
//Performs linear search of the cache and uses the first matching name.
// Return nth attribute. Attributes are numbered 0 upward using
// PV_ATTRIBUTE and VG_ATTRIBUTE enumerations for lvm2_pv_cache and
// lvm2_vg_cache respectively.
Glib::ustring LVM2_PV_Info::get_attr_by_name( const std::vector<Glib::ustring> cache,
const Glib::ustring name, unsigned int entry )
{
if ( entry < vg_attrs .size() )
return vg_attrs [entry] ;
for ( unsigned int i = 0 ; i < cache .size() ; i ++ )
{
std::vector<Glib::ustring> attrs ;
Utils::split( cache [i], attrs, "," ) ;
if ( attrs .size() >= 1 && attrs [0] == name )
{
if ( entry < attrs .size() )
return attrs [entry] ;
else
break ;
}
@ -345,17 +332,19 @@ Glib::ustring LVM2_PV_Info::get_vg_attr_by_name( const Glib::ustring & vgname, u
return "" ;
}
//Return VG's nth attribute from specified cache row. Row is numbered
// 0 upwards and attributes are numbers numbered 0 upwards using
// VG_ATTRIBUTE enumeration.
Glib::ustring LVM2_PV_Info::get_vg_attr_by_row( unsigned int row, unsigned int entry ) const
//Lookup row from the cache and return nth attribute. Row is numbered
// 0 upwards and attributes are numbered 0 upwards using PV_ATTRIBUTE
// and VG_ATTRIBUTE enumerations for lvm2_pv_cache and lvm2_vg_cache
// respectively.
Glib::ustring LVM2_PV_Info::get_attr_by_row( const std::vector<Glib::ustring> cache,
unsigned int row, unsigned int entry )
{
if ( row >= lvm2_vg_cache .size() )
if ( row >= cache .size() )
return "" ;
std::vector<Glib::ustring> vg_attrs ;
Utils::split( lvm2_vg_cache [row], vg_attrs, "," ) ;
if ( entry < vg_attrs .size() )
return vg_attrs [entry] ;
std::vector<Glib::ustring> attrs ;
Utils::split( cache [row], attrs, "," ) ;
if ( entry < attrs .size() )
return attrs [entry] ;
return "" ;
}