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

replaced 'device_partitions' with 'partitions' use new Device::partitions 

* include/Device.h,
  src/Device.cc: replaced 'device_partitions' with 'partitions'
* src/Win_GParted.cc: use new Device::partitions
* include/Partition.h,
  src/Partition.cc: added 'realpath'
* src/Dialog_Partition_Info.cc: use Partition::realpath..
* include/GParted_Core.h,
  src/GParted_Core.cc:use ped_partition_get_path() instead of
  constructing it ourselves. (#325800)
  Also use global maps for mountpoints and shortpaths to prevent
  fileaccess from happening more then once per scan.
This commit is contained in:
Bart Hakvoort 2006-01-05 20:01:34 +00:00
parent 58506080aa
commit 7052e18d79
9 changed files with 147 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2006-01-05 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/Device.h,
src/Device.cc: replaced 'device_partitions' with 'partitions'
* src/Win_GParted.cc: use new Device::partitions
* include/Partition.h,
src/Partition.cc: added 'realpath'
* src/Dialog_Partition_Info.cc: use Partition::realpath..
* include/GParted_Core.h,
src/GParted_Core.cc:use ped_partition_get_path() instead of
constructing it ourselves. (#325800)
Also use global maps for mountpoints and
shortpaths to prevent fileaccess from happening more then once per
scan.
2006-01-04 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-01-04 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/Partition.h, * include/Partition.h,

8
include/Device.h
View File

@ -27,12 +27,12 @@ class Device
{ {
public: public:
Device( ) ; Device() ;
~Device( ) ; ~Device() ;
void Reset( ) ; void Reset() ;
std::vector<Partition> device_partitions ; std::vector<Partition> partitions ;
Sector length; Sector length;
long heads ; long heads ;
long sectors ; long sectors ;

10
include/GParted_Core.h
View File

@ -32,8 +32,6 @@
#include "../include/hfsplus.h" #include "../include/hfsplus.h"
#include "../include/reiser4.h" #include "../include/reiser4.h"
#include <glibmm/ustring.h>
#include <vector> #include <vector>
#include <fstream> #include <fstream>
@ -65,9 +63,11 @@ public:
std::vector<Glib::ustring> get_disklabeltypes( ) ; std::vector<Glib::ustring> get_disklabeltypes( ) ;
private: private:
GParted::FILESYSTEM Get_Filesystem( ) ; //temporary function.. asa new checks ripple through in libparted i'll remove it. GParted::FILESYSTEM get_filesystem() ;
void set_device_partitions( Device & device ) ; void set_device_partitions( Device & device ) ;
void set_mountpoints( std::vector<Partition> & partitions, bool first_time = true ) ; void init_maps() ;
void set_mountpoints( std::vector<Partition> & partitions ) ;
void set_short_paths( std::vector<Partition> & partitions ) ;
void set_used_sectors( std::vector<Partition> & partitions ) ; void set_used_sectors( std::vector<Partition> & partitions ) ;
void insert_unallocated( const Glib::ustring & device_path, std::vector<Partition> & partitions, Sector start, Sector end, bool inside_extended ) ; void insert_unallocated( const Glib::ustring & device_path, std::vector<Partition> & partitions, Sector start, Sector end, bool inside_extended ) ;
Glib::ustring get_short_path( const Glib::ustring & real_path ) ; Glib::ustring get_short_path( const Glib::ustring & real_path ) ;
@ -97,8 +97,8 @@ private:
Partition partition_temp ; Partition partition_temp ;
FS fs ; FS fs ;
//used in set_mountpoints()
std::map<Glib::ustring, Glib::ustring> mount_info ; std::map<Glib::ustring, Glib::ustring> mount_info ;
std::map<Glib::ustring, Glib::ustring> short_paths ;
std::map<Glib::ustring, Glib::ustring>::iterator iter ; std::map<Glib::ustring, Glib::ustring>::iterator iter ;
PedDevice *lp_device ; PedDevice *lp_device ;

1
include/Partition.h
View File

@ -78,6 +78,7 @@ public:
//some public members //some public members
Glib::ustring partition;//the symbolic path (e.g. /dev/hda1 ) Glib::ustring partition;//the symbolic path (e.g. /dev/hda1 )
Glib::ustring realpath ;
Glib::ustring device_path ; Glib::ustring device_path ;
int partition_number; int partition_number;
PartitionType type;// UNALLOCATED, PRIMARY, LOGICAL, etc... PartitionType type;// UNALLOCATED, PRIMARY, LOGICAL, etc...

10
src/Device.cc
View File

@ -20,14 +20,14 @@
namespace GParted namespace GParted
{ {
Device::Device( ) Device::Device()
{ {
Reset( ) ; Reset() ;
} }
void Device::Reset( ) void Device::Reset()
{ {
device_partitions .clear( ) ; partitions .clear() ;
length = 0 ; length = 0 ;
heads = sectors = cylinders = cylsize = 0 ; heads = sectors = cylinders = cylsize = 0 ;
model = path = realpath = disktype = "" ; model = path = realpath = disktype = "" ;
@ -35,7 +35,7 @@ void Device::Reset( )
readonly = false ; readonly = false ;
} }
Device::~Device( ) Device::~Device()
{ {
} }

8
src/Dialog_Partition_Info.cc
View File

@ -169,15 +169,11 @@ void Dialog_Partition_Info::Display_Info( )
table ->attach( * Utils::mk_label( "<b>" + (Glib::ustring) _( "Path:" ) + "</b>" ), 0, 1, top, bottom, Gtk::FILL ) ; table ->attach( * Utils::mk_label( "<b>" + (Glib::ustring) _( "Path:" ) + "</b>" ), 0, 1, top, bottom, Gtk::FILL ) ;
table ->attach( * Utils::mk_label( partition .partition ), 1, 2, top++, bottom++, Gtk::FILL ) ; table ->attach( * Utils::mk_label( partition .partition ), 1, 2, top++, bottom++, Gtk::FILL ) ;
//realpath (this sucks)
char real_path[4096] ;
realpath( partition .partition .c_str( ) , real_path ) ;
//only show realpath if it's diffent from the short path... //only show realpath if it's diffent from the short path...
if ( partition.partition != real_path ) if ( partition .partition != partition .realpath )
{ {
table ->attach( * Utils::mk_label( "<b>" + (Glib::ustring) _( "Real Path:" ) + "</b>" ), 0, 1, top, bottom, Gtk::FILL ) ; table ->attach( * Utils::mk_label( "<b>" + (Glib::ustring) _( "Real Path:" ) + "</b>" ), 0, 1, top, bottom, Gtk::FILL ) ;
table ->attach( * Utils::mk_label( real_path ), 1,2, top++, bottom++, Gtk::FILL ) ; table ->attach( * Utils::mk_label( partition .realpath ), 1, 2, top++, bottom++, Gtk::FILL ) ;
} }
//status //status

203
src/GParted_Core.cc
View File

@ -81,10 +81,13 @@ void GParted_Core::get_devices( std::vector<Device> & devices )
Device temp_device ; Device temp_device ;
std::vector<Glib::ustring> device_paths ; std::vector<Glib::ustring> device_paths ;
lp_device = ped_device_get_next( NULL ); init_maps() ;
//in certain cases (e.g. when there's a cd in the cdrom-drive) ped_device_probe_all will find a 'ghost' device that has no name or contains /* in certain cases (e.g. when there's a cd in the cdrom-drive) ped_device_probe_all will find a
//random garbage. Those 2 checks try to prevent such a ghostdevice from being initialized.. (tested over a 1000 times with and without cd) * 'ghost' device that has no name or contains random garbage.
* Those checks try to prevent such a ghostdevice from being initialized..
*/
lp_device = ped_device_get_next( NULL );
while ( lp_device ) while ( lp_device )
{ {
if ( strlen( lp_device ->path ) > 6 && if ( strlen( lp_device ->path ) > 6 &&
@ -97,6 +100,7 @@ void GParted_Core::get_devices( std::vector<Device> & devices )
} }
close_device_and_disk() ; close_device_and_disk() ;
for ( unsigned int t = 0 ; t < device_paths .size() ; t++ ) for ( unsigned int t = 0 ; t < device_paths .size() ; t++ )
{ {
if ( open_device_and_disk( device_paths[ t ], false ) ) if ( open_device_and_disk( device_paths[ t ], false ) )
@ -124,11 +128,12 @@ void GParted_Core::get_devices( std::vector<Device> & devices )
temp_device .max_prims = ped_disk_get_max_primary_partition_count( lp_disk ) ; temp_device .max_prims = ped_disk_get_max_primary_partition_count( lp_disk ) ;
set_device_partitions( temp_device ) ; set_device_partitions( temp_device ) ;
set_short_paths( temp_device .partitions ) ;
if ( temp_device .highest_busy ) if ( temp_device .highest_busy )
set_mountpoints( temp_device .device_partitions ) ; set_mountpoints( temp_device .partitions ) ;
set_used_sectors( temp_device .device_partitions ) ; set_used_sectors( temp_device .partitions ) ;
if ( temp_device .highest_busy ) if ( temp_device .highest_busy )
temp_device .readonly = ! ped_disk_commit_to_os( lp_disk ) ; temp_device .readonly = ! ped_disk_commit_to_os( lp_disk ) ;
@ -141,17 +146,58 @@ void GParted_Core::get_devices( std::vector<Device> & devices )
Partition partition_temp ; Partition partition_temp ;
partition_temp .Set_Unallocated( temp_device .path, 0, temp_device .length, false ); partition_temp .Set_Unallocated( temp_device .path, 0, temp_device .length, false );
temp_device .device_partitions .push_back( partition_temp ); temp_device .partitions .push_back( partition_temp );
} }
devices .push_back( temp_device ) ; devices .push_back( temp_device ) ;
close_device_and_disk( ) ; close_device_and_disk() ;
} }
} }
//clear leftover information...
mount_info .clear() ;
short_paths .clear() ;
}
void GParted_Core::init_maps()
{
//initialize mountpoints..
std::ifstream input( "/proc/mounts" ) ;
if ( input )
{
char node[255], mountpoint[255] ;
std::string line ;
while ( getline( input, line ) )
if ( line .length() > 0 && line[ 0 ] == '/' && sscanf( line .c_str(), "%s %s", node, mountpoint ) == 2 )
mount_info[ node ] = mountpoint ;
input .close() ;
}
//initialize shortpaths...
std::ifstream proc_partitions( "/proc/partitions" ) ;
if ( proc_partitions )
{
char c_str[255] ;
std::string line ;
while ( getline( proc_partitions, line ) )
if ( sscanf( line .c_str(), "%*d %*d %*d %255s", c_str ) == 1 )
{
line = "/dev/" ;
line += c_str ;
if ( realpath( line .c_str(), c_str ) )
short_paths[ line ] = c_str ;
}
proc_partitions .close() ;
}
} }
GParted::FILESYSTEM GParted_Core::Get_Filesystem( ) GParted::FILESYSTEM GParted_Core::get_filesystem()
{ {
//standard libparted filesystems.. //standard libparted filesystems..
if ( lp_partition && lp_partition ->fs_type ) if ( lp_partition && lp_partition ->fs_type )
@ -213,46 +259,46 @@ void GParted_Core::set_device_partitions( Device & device )
int EXT_INDEX = -1 ; int EXT_INDEX = -1 ;
//clear partitions //clear partitions
device .device_partitions .clear( ) ; device .partitions .clear() ;
lp_partition = ped_disk_next_partition( lp_disk, NULL ) ; lp_partition = ped_disk_next_partition( lp_disk, NULL ) ;
while ( lp_partition ) while ( lp_partition )
{ {
partition_temp .Reset( ) ; partition_temp .Reset() ;
switch ( lp_partition ->type ) switch ( lp_partition ->type )
{ {
case PED_PARTITION_NORMAL: case PED_PARTITION_NORMAL:
case PED_PARTITION_LOGICAL: case PED_PARTITION_LOGICAL:
partition_temp .Set( device .path, partition_temp .Set( device .path,
device .path + Utils::num_to_str( lp_partition ->num ), ped_partition_get_path( lp_partition ),
lp_partition ->num, lp_partition ->num,
lp_partition ->type == 0 ? GParted::TYPE_PRIMARY : GParted::TYPE_LOGICAL, lp_partition ->type == 0 ? GParted::TYPE_PRIMARY : GParted::TYPE_LOGICAL,
Get_Filesystem( ), lp_partition ->geom .start, get_filesystem(),
lp_partition ->geom .end, lp_partition ->geom .start,
lp_partition ->type, lp_partition ->geom .end,
ped_partition_is_busy( lp_partition ) ); lp_partition ->type,
ped_partition_is_busy( lp_partition ) );
partition_temp .flags = Get_Flags( ) ; partition_temp .flags = Get_Flags() ;
if ( partition_temp .busy && partition_temp .partition_number > device .highest_busy ) if ( partition_temp .busy && partition_temp .partition_number > device .highest_busy )
device .highest_busy = partition_temp .partition_number ; device .highest_busy = partition_temp .partition_number ;
break ; break ;
case PED_PARTITION_EXTENDED: case PED_PARTITION_EXTENDED:
partition_temp.Set( device .path, partition_temp.Set( device .path,
device .path + Utils::num_to_str( lp_partition ->num ), device .path + Utils::num_to_str( lp_partition ->num ),
lp_partition ->num , lp_partition ->num,
GParted::TYPE_EXTENDED , GParted::TYPE_EXTENDED,
GParted::FS_EXTENDED , GParted::FS_EXTENDED,
lp_partition ->geom .start , lp_partition ->geom .start,
lp_partition ->geom .end , lp_partition ->geom .end,
false , false,
ped_partition_is_busy( lp_partition ) ); ped_partition_is_busy( lp_partition ) );
partition_temp .flags = Get_Flags( ) ; partition_temp .flags = Get_Flags() ;
EXT_INDEX = device .device_partitions .size ( ) ; EXT_INDEX = device .partitions .size() ;
break ; break ;
default: default:
@ -263,9 +309,9 @@ void GParted_Core::set_device_partitions( Device & device )
if ( partition_temp .sector_end > -1 ) if ( partition_temp .sector_end > -1 )
{ {
if ( ! partition_temp .inside_extended ) if ( ! partition_temp .inside_extended )
device .device_partitions .push_back( partition_temp ); device .partitions .push_back( partition_temp );
else else
device .device_partitions[ EXT_INDEX ] .logicals .push_back( partition_temp ) ; device .partitions[ EXT_INDEX ] .logicals .push_back( partition_temp ) ;
} }
//next partition (if any) //next partition (if any)
@ -274,34 +320,16 @@ void GParted_Core::set_device_partitions( Device & device )
if ( EXT_INDEX > -1 ) if ( EXT_INDEX > -1 )
insert_unallocated( device .path, insert_unallocated( device .path,
device .device_partitions[ EXT_INDEX ] .logicals, device .partitions[ EXT_INDEX ] .logicals,
device .device_partitions[ EXT_INDEX ] .sector_start, device .partitions[ EXT_INDEX ] .sector_start,
device .device_partitions[ EXT_INDEX ] .sector_end, device .partitions[ EXT_INDEX ] .sector_end,
true ) ; true ) ;
insert_unallocated( device .path, device .device_partitions, 0, device .length -1, false ) ; insert_unallocated( device .path, device .partitions, 0, device .length -1, false ) ;
} }
void GParted_Core::set_mountpoints( std::vector<Partition> & partitions, bool first_time ) void GParted_Core::set_mountpoints( std::vector<Partition> & partitions )
{ {
if ( first_time )
{
std::ifstream input( "/proc/mounts" ) ;
if ( input )
{
char node[255], mountpoint[255] ;
std::string line ;
while ( getline( input, line ) )
if ( line .length() > 0 && line[ 0 ] == '/' && sscanf( line .c_str(),"%s %s", node, mountpoint ) == 2 )
mount_info[ node ] = mountpoint ;
input .close() ;
}
}
for ( unsigned int t = 0 ; t < partitions .size() ; t++ ) for ( unsigned int t = 0 ; t < partitions .size() ; t++ )
{ {
if ( partitions[ t ] .busy && partitions[ t ] .filesystem != GParted::FS_LINUX_SWAP ) if ( partitions[ t ] .busy && partitions[ t ] .filesystem != GParted::FS_LINUX_SWAP )
@ -318,14 +346,36 @@ void GParted_Core::set_mountpoints( std::vector<Partition> & partitions, bool fi
partitions[ t ] .mountpoint = "/" ; partitions[ t ] .mountpoint = "/" ;
} }
else if ( partitions[ t ] .type == GParted::TYPE_EXTENDED ) else if ( partitions[ t ] .type == GParted::TYPE_EXTENDED )
set_mountpoints( partitions[ t ] .logicals, false ) ; set_mountpoints( partitions[ t ] .logicals ) ;
} }
} }
if ( first_time )
mount_info .clear() ;
} }
void GParted_Core::set_short_paths( std::vector<Partition> & partitions )
{
for ( unsigned int t =0 ; t < partitions .size() ; t++ )
{
partitions[ t ] .partition = get_short_path( partitions[ t ] .partition ) ;
if ( partitions[ t ] .type == GParted::TYPE_EXTENDED )
set_short_paths( partitions[ t ] .logicals ) ;
}
}
Glib::ustring GParted_Core::get_short_path( const Glib::ustring & real_path )
{
temp = real_path ;
iter = short_paths .find( real_path );
if ( iter != short_paths .end() )
{
temp = iter ->second ;
short_paths .erase( iter ) ;
}
return temp ;
}
void GParted_Core::set_used_sectors( std::vector<Partition> & partitions ) void GParted_Core::set_used_sectors( std::vector<Partition> & partitions )
{ {
struct statvfs sfs ; struct statvfs sfs ;
@ -636,37 +686,6 @@ std::vector<Glib::ustring> GParted_Core::get_disklabeltypes( )
return disklabeltypes ; return disklabeltypes ;
} }
Glib::ustring GParted_Core::get_short_path( const Glib::ustring & real_path )
{
char c_str[255] ;
std::string line ;
temp = real_path ;
std::ifstream input( "/proc/partitions" ) ;
if ( input )
{
while ( getline( input, line ) )
{
if ( sscanf( line .c_str(), "%*d %*d %*d %255s", c_str ) == 1 )
{
line = "/dev/" ;
line += c_str ;
if ( realpath( line .c_str(), c_str ) && real_path == c_str )
{
temp = c_str ;
break ;
}
}
}
input .close() ;
}
return temp ;
}
void GParted_Core::LP_Set_Used_Sectors( Partition & partition ) void GParted_Core::LP_Set_Used_Sectors( Partition & partition )
{ {
PedFileSystem *fs = NULL; PedFileSystem *fs = NULL;

4
src/Partition.cc
View File

@ -27,7 +27,7 @@ Partition::Partition()
void Partition::Reset() void Partition::Reset()
{ {
partition = error = flags = mountpoint = "" ; partition = realpath = error = flags = mountpoint = "" ;
status = GParted::STAT_REAL ; status = GParted::STAT_REAL ;
type = GParted::TYPE_UNALLOCATED ; type = GParted::TYPE_UNALLOCATED ;
filesystem = GParted::FS_UNALLOCATED ; filesystem = GParted::FS_UNALLOCATED ;
@ -48,7 +48,7 @@ void Partition::Set( const Glib::ustring & device_path,
bool busy ) bool busy )
{ {
this ->device_path = device_path ; this ->device_path = device_path ;
this ->partition = partition; this ->partition = realpath = partition;
this ->partition_number = partition_number; this ->partition_number = partition_number;
this ->type = type; this ->type = type;
this ->filesystem = filesystem; this ->filesystem = filesystem;

4
src/Win_GParted.cc
View File

@ -510,7 +510,7 @@ void Win_GParted::Add_Operation( OperationType operationtype, const Partition &
void Win_GParted::Refresh_Visual( ) void Win_GParted::Refresh_Visual( )
{ {
std::vector<Partition> partitions = devices[ current_device ] .device_partitions ; std::vector<Partition> partitions = devices[ current_device ] .partitions ;
liststore_operations ->clear(); liststore_operations ->clear();
//make all operations visible //make all operations visible
@ -998,7 +998,7 @@ void Win_GParted::activate_resize( )
return ; return ;
} }
std::vector <Partition> partitions = devices[ current_device ] .device_partitions ; std::vector <Partition> partitions = devices[ current_device ] .partitions ;
if ( operations .size( ) ) if ( operations .size( ) )
for (unsigned int t = 0 ; t < operations .size( ) ; t++ ) for (unsigned int t = 0 ; t < operations .size( ) ; t++ )