[gparted] Query unallocated space for LVM2 PVs (#499202)

[Curtis Gedak <gedakc src gnome org>]

commit e6290dbbcf0a5cf4557b014ed7cbaa2cea027710
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date:   Thu Mar 8 15:37:31 2012 +0000

    Query unallocated space for LVM2 PVs (#499202)
    
    Add reporting of the LVM2 Physical Volume size allowing the unallocated
    space in the partition to be calculated.
    
    Bug #499202 - gparted does not see the difference if partition size
                  differs from filesystem size

 include/LVM2_PV_Info.h |    2 +
 src/LVM2_PV_Info.cc    |   78 +++++++++++++++++++++++++++++-------------------
 src/lvm2_pv.cc         |   11 +++++--
 3 files changed, 57 insertions(+), 34 deletions(-)
---
diff --git a/include/LVM2_PV_Info.h b/include/LVM2_PV_Info.h
index aa89b8c..126585a 100644
--- a/include/LVM2_PV_Info.h
+++ b/include/LVM2_PV_Info.h
@@ -39,6 +39,7 @@ public:
 	~LVM2_PV_Info() ;
 	bool is_lvm2_pv_supported() ;
 	Glib::ustring get_vg_name( const Glib::ustring & path ) ;
+	Byte_Value get_size_bytes( const Glib::ustring & path ) ;
 	Byte_Value get_free_bytes( const Glib::ustring & path ) ;
 	bool has_active_lvs( const Glib::ustring & path ) ;
 	bool is_vg_exported( const Glib::ustring & vgname ) ;
@@ -49,6 +50,7 @@ private:
 	void load_lvm2_pv_info_cache() ;
 	Glib::ustring get_pv_attr_by_path( const Glib::ustring & path, unsigned int entry ) ;
 	Glib::ustring get_pv_attr_by_row( unsigned int row, unsigned int entry ) ;
+	Byte_Value lvm2_pv_attr_to_num( const Glib::ustring str ) ;
 	static bool lvm2_pv_info_cache_initialized ;
 	static bool lvm_found ;
 	static std::vector<Glib::ustring> lvm2_pv_cache ;
diff --git a/src/LVM2_PV_Info.cc b/src/LVM2_PV_Info.cc
index 76ef257..6365d84 100644
--- a/src/LVM2_PV_Info.cc
+++ b/src/LVM2_PV_Info.cc
@@ -23,11 +23,12 @@ namespace GParted
 enum PV_ATTRIBUTE
 {
 	PVATTR_PV_NAME = 0,
-	PVATTR_PV_FREE = 1,
-	PVATTR_VG_NAME = 2,
-	PVATTR_VG_BITS = 3,
-	PVATTR_LV_NAME = 4,
-	PVATTR_LV_BITS = 5
+	PVATTR_PV_SIZE = 1,
+	PVATTR_PV_FREE = 2,
+	PVATTR_VG_NAME = 3,
+	PVATTR_VG_BITS = 4,
+	PVATTR_LV_NAME = 5,
+	PVATTR_LV_BITS = 6
 } ;
 
 //Data model:
@@ -35,21 +36,21 @@ enum PV_ATTRIBUTE
 //                      - Has the cache been loaded let?
 //  lvm_found           - Is the "lvm" command available?
 //  lvm2_pv_cache       - String vector storing attributes of a PV.
-//                        Attributes are: pv_name,pv_free,vg_name,
-//                        vg_attr,lv_name,lv_attr.  Pv_free is the
-//                        number of free bytes, see vgs(8) and lvs(8)
-//                        for details of vg_attr and lv_attr
-//                        respectively.
+//                        Attributes are: pv_name,pv_size,pv_free,
+//                        vg_name,vg_attr,lv_name,lv_attr.  Pv_size and
+//                        pv_free are the size of the PV and number of
+//                        free bytes.  See vgs(8) and lvs(8) for details
+//                        of vg_attr and lv_attr respectively.
 //                        E.g.
-//                        ["/dev/sda10,2147483648,,r-----,,",
-//                         "/dev/sda11,2143289344,GParted-VG1,wz--n-,,",
-//                         "/dev/sda12,1619001344,GParted-VG2,wz--n-,lvol0,-wi---",
-//                         "/dev/sda12,1619001344,GParted-VG2,wz--n-,,",
-//                         "/dev/sda13,830472192,GParted_VG3,wz--n-,lvol0,-wi-a-",
-//                         "/dev/sda13,830472192,GParted_VG3,wz--n-,lvol1,-wi-a-",
-//                         "/dev/sda13,830472192,GParted_VG3,wz--n-,,",
-//                         "/dev/sda14,1828716544,GParted-VG4,wzx-n-,lvol0,-wi---",
-//                         "/dev/sda14,1828716544,GParted-VG4,wzx-n-,,"]
+//                        ["/dev/sda10,2147483648,2147483648,,r-----,,",
+//                         "/dev/sda11,2143289344,2143289344,GParted-VG1,wz--n-,,",
+//                         "/dev/sda12,2143289344,1619001344,GParted-VG2,wz--n-,lvol0,-wi---",
+//                         "/dev/sda12,2143289344,1619001344,GParted-VG2,wz--n-,,",
+//                         "/dev/sda13,2143289344,830472192,GParted_VG3,wz--n-,lvol0,-wi-a-",
+//                         "/dev/sda13,2143289344,830472192,GParted_VG3,wz--n-,lvol1,-wi-a-",
+//                         "/dev/sda13,2143289344,830472192,GParted_VG3,wz--n-,,",
+//                         "/dev/sda14,2143289344,1828716544,GParted-VG4,wzx-n-,lvol0,-wi---",
+//                         "/dev/sda14,2143289344,1828716544,GParted-VG4,wzx-n-,,"]
 //  error_messages      - String vector storing whole cache error
 //                        messsages.
 
@@ -91,21 +92,20 @@ Glib::ustring LVM2_PV_Info::get_vg_name( const Glib::ustring & path )
 	return get_pv_attr_by_path( path, PVATTR_VG_NAME ) ;
 }
 
+//Return PV size in bytes, or -1 for error.
+Byte_Value LVM2_PV_Info::get_size_bytes( const Glib::ustring & path )
+{
+	initialize_if_required() ;
+	Glib::ustring str = get_pv_attr_by_path( path, PVATTR_PV_SIZE ) ;
+	return lvm2_pv_attr_to_num( str ) ;
+}
+
 //Return number of free bytes in the PV, or -1 for error.
 Byte_Value LVM2_PV_Info::get_free_bytes( const Glib::ustring & path )
 {
 	initialize_if_required() ;
-	Byte_Value free_bytes = -1 ;
-	Glib::ustring fb_str = get_pv_attr_by_path( path, PVATTR_PV_FREE ) ;
-	if ( fb_str != "" )
-	{
-		gchar * suffix ;
-		free_bytes = (Byte_Value) g_ascii_strtoll( fb_str .c_str(), & suffix, 10 ) ;
-		if ( free_bytes < 0 || ( free_bytes == 0 && suffix == fb_str ) )
-			//Negative number or conversion failed
-			free_bytes = -1 ;
-	}
-	return free_bytes ;
+	Glib::ustring str = get_pv_attr_by_path( path, PVATTR_PV_FREE ) ;
+	return lvm2_pv_attr_to_num( str ) ;
 }
 
 //Report if any LVs are active in the VG stored in the PV.
@@ -217,7 +217,7 @@ void LVM2_PV_Info::load_lvm2_pv_info_cache()
 
 		//Load LVM2 PV attribute cache.  Output PV attributes in
 		//  PV_ATTRIBUTE order
-		Glib::ustring cmd = "lvm pvs --config \"log{command_names=0}\" --nosuffix --noheadings --separator , --units b -o pv_name,pv_free,vg_name,vg_attr,lv_name,lv_attr" ;
+		Glib::ustring cmd = "lvm pvs --config \"log{command_names=0}\" --nosuffix --noheadings --separator , --units b -o pv_name,pv_size,pv_free,vg_name,vg_attr,lv_name,lv_attr" ;
 		if ( ! Utils::execute_command( cmd, output, error, true ) )
 		{
 			if ( output != "" )
@@ -281,4 +281,20 @@ Glib::ustring LVM2_PV_Info::get_pv_attr_by_row( unsigned int row, unsigned int e
 	return "" ;
 }
 
+//Return string converted to a number, or -1 for error.
+//Used to convert PVs size or free bytes.
+Byte_Value LVM2_PV_Info::lvm2_pv_attr_to_num( const Glib::ustring str )
+{
+	Byte_Value num = -1 ;
+	if ( str != "" )
+	{
+		gchar * suffix ;
+		num = (Byte_Value) g_ascii_strtoll( str .c_str(), & suffix, 10 ) ;
+		if ( num < 0 || ( num == 0 && suffix == str ) )
+			//Negative number or conversion failed
+			num = -1 ;
+	}
+	return num ;
+}
+
 }//GParted
diff --git a/src/lvm2_pv.cc b/src/lvm2_pv.cc
index d085a8e..8188471 100644
--- a/src/lvm2_pv.cc
+++ b/src/lvm2_pv.cc
@@ -39,9 +39,14 @@ FS lvm2_pv::get_filesystem_support()
 void lvm2_pv::set_used_sectors( Partition & partition )
 {
 	LVM2_PV_Info lvm2_pv_info ;
-	Byte_Value free_bytes = lvm2_pv_info .get_free_bytes( partition .get_path() ) ;
-	if ( free_bytes >= 0 )
-		partition .Set_Unused( Utils::round( double(free_bytes) / double(partition .sector_size) ) ) ;
+	T = (Sector) lvm2_pv_info .get_size_bytes( partition .get_path() ) ;
+	N = (Sector) lvm2_pv_info .get_free_bytes( partition .get_path() ) ;
+	if ( T > -1 && N > -1 )
+	{
+		T = Utils::round( T / double(partition .sector_size) ) ;
+		N = Utils::round( N / double(partition .sector_size) ) ;
+		partition .set_sector_usage( T, N ) ;
+	}
 
 	std::vector<Glib::ustring> error_messages = lvm2_pv_info .get_error_messages( partition .get_path() ) ;
 	if ( ! error_messages .empty() )