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

implemented a 'wait_for_node()' function after reading 

* include/GParted_Core.h,
  src/GParted_Core.cc: implemented a 'wait_for_node()' function after
  reading http://bugs.gentoo.org/show_bug.cgi?id=102343. I couldn't
  reproduce the bug myself, but i hope this wil solve it.
  Also made 'set_partition_type()' return a boolean for improved
  errorchecking.
This commit is contained in:
Bart Hakvoort 2005-11-29 14:50:20 +00:00
parent 0e6c78c2b7
commit d32802166b
3 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-11-29 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/GParted_Core.h,
src/GParted_Core.cc: implemented a 'wait_for_node()' function after
reading http://bugs.gentoo.org/show_bug.cgi?id=102343. I couldn't
reproduce the bug myself, but i hope this wil solve it.
Also made 'set_partition_type()' return a boolean for improved
errorchecking.
2005-11-28 Bart Hakvoort <hakvoort@cvs.gnome.org>
* decided to use the Supported enum a bit more efficient in checks
( doh, big deal :P )

3
include/GParted_Core.h
View File

@ -78,7 +78,8 @@ private:
void Show_Error( Glib::ustring message ) ;
void set_proper_filesystem( const Glib::ustring & filesystem ) ;
void set_partition_type( const Glib::ustring & device_path, const Partition & partition ) ;
bool set_partition_type( const Glib::ustring & device_path, const Partition & partition ) ;
bool wait_for_node( const Glib::ustring & node ) ;
bool open_device( const Glib::ustring & device_path ) ;
bool open_device_and_disk( const Glib::ustring & device_path, bool strict = true ) ;

57
src/GParted_Core.cc
View File

@ -370,9 +370,7 @@ bool GParted_Core::Create( const Device & device, Partition & new_partition )
if ( ! p_filesystem )
return true ;
set_partition_type( device .path, new_partition ) ;
return p_filesystem ->Create( new_partition ) ;
return set_partition_type( device .path, new_partition ) && p_filesystem ->Create( new_partition ) ;
}
return false ;
@ -391,11 +389,9 @@ bool GParted_Core::Convert_FS( const Glib::ustring & device_path, const Partitio
close_device_and_disk( ) ;
}
set_partition_type( device_path, partition ) ;
set_proper_filesystem( partition .filesystem ) ;
return p_filesystem ->Create( partition ) ;
return set_partition_type( device_path, partition ) && p_filesystem ->Create( partition ) ;
}
bool GParted_Core::Delete( const Glib::ustring & device_path, const Partition & partition )
@ -412,7 +408,6 @@ bool GParted_Core::Delete( const Glib::ustring & device_path, const Partition &
return_value = ( ped_disk_delete_partition( lp_disk, lp_partition ) && commit( ) ) ;
close_device_and_disk( ) ;
sleep( 1 ) ;//paranoia: give the OS some time to update nodes in /dev
}
return return_value ;
@ -646,12 +641,13 @@ int GParted_Core::Create_Empty_Partition( const Glib::ustring & device_path, Par
if ( ped_disk_add_partition( lp_disk, c_part, constraint ) && commit( ) )
{
//remove all filesystem signatures...
ped_file_system_clobber ( & c_part ->geom ) ;
sleep( 1 ) ;//the OS needs some time to create the devicenode in /dev
ped_file_system_clobber( & c_part ->geom ) ;
new_partition .partition = ped_partition_get_path( c_part ) ;
new_partition .partition_number = c_part ->num ;
if ( ! wait_for_node( new_partition .partition ) )
return 0 ;
}
ped_constraint_destroy( constraint );
@ -685,29 +681,27 @@ bool GParted_Core::Resize_Container_Partition( const Glib::ustring & device_path
if ( fixed_start && constraint ) //create a constraint which keeps de startpoint intact and rounds the end to a cylinderboundary
{
ped_disk_set_partition_geom ( lp_disk, lp_partition, constraint, partition_new .sector_start, partition_new .sector_end ) ;
ped_constraint_destroy ( constraint );
ped_disk_set_partition_geom( lp_disk, lp_partition, constraint, partition_new .sector_start, partition_new .sector_end ) ;
ped_constraint_destroy( constraint );
constraint = NULL ;
ped_geometry_set_start ( & lp_partition ->geom, partition_new .sector_start ) ;
constraint = ped_constraint_exact ( & lp_partition ->geom ) ;
ped_geometry_set_start( & lp_partition ->geom, partition_new .sector_start ) ;
constraint = ped_constraint_exact( & lp_partition ->geom ) ;
}
if ( constraint )
{
if ( ped_disk_set_partition_geom ( lp_disk, lp_partition, constraint, partition_new .sector_start, partition_new .sector_end ) )
if ( ped_disk_set_partition_geom( lp_disk, lp_partition, constraint, partition_new .sector_start, partition_new .sector_end ) )
return_value = commit( ) ;
ped_constraint_destroy ( constraint );
ped_constraint_destroy( constraint );
}
}
close_device_and_disk( ) ;
}
sleep( 1 ) ; //the OS needs time to re-add the devicenode..
return return_value ;
return wait_for_node( partition_new .partition ) && return_value ;
}
bool GParted_Core::Resize_Normal_Using_Libparted( const Glib::ustring & device_path, const Partition & partition_old, const Partition & partition_new )
@ -808,8 +802,10 @@ void GParted_Core::set_proper_filesystem( const Glib::ustring & filesystem )
}
void GParted_Core::set_partition_type( const Glib::ustring & device_path, const Partition & partition )
bool GParted_Core::set_partition_type( const Glib::ustring & device_path, const Partition & partition )
{
bool return_value = false ;
if ( open_device_and_disk( device_path ) )
{
PedFileSystemType * fs_type = ped_file_system_type_get( partition .filesystem .c_str() ) ;
@ -823,11 +819,30 @@ void GParted_Core::set_partition_type( const Glib::ustring & device_path, const
lp_partition = ped_disk_get_partition_by_sector( lp_disk, (partition .sector_end + partition .sector_start) / 2 ) ;
if ( lp_partition && ped_partition_set_system( lp_partition, fs_type ) && commit( ) )
sleep( 1 ) ; //the OS needs some time to update nodes in /dev
return_value = wait_for_node( partition .partition ) ;
}
close_device_and_disk( ) ;
}
return return_value ;
}
bool GParted_Core::wait_for_node( const Glib::ustring & node )
{
//we'll loop for 10 seconds or till 'node' appeares...
for( short t = 0 ; t < 50 ; t++ )
{
if ( access( node .c_str(), F_OK ) == 0 )
{
sleep( 1 ) ; //apperantly the node isn't available immediatly after access returns succesfully :/
return true ;
}
else
usleep( 200000 ) ; //200 milliseconds
}
return false ;
}
bool GParted_Core::open_device( const Glib::ustring & device_path )