mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk gtk) more heap pruning, in tr_core 

Tweak how we loop through the torrents in the model, again to avoid unnecessary GtkTreePath temporaries.
This commit is contained in:
Jordan Lee 2011-04-13 22:16:50 +00:00
parent 6cd1dcb574
commit fdbe7dc2da
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/tr-core.c
View File

@ -1405,11 +1405,8 @@ gtr_compare_double( const double a, const double b, int decimal_places )
return 0;
}
static gboolean
update_foreach( GtkTreeModel * model,
GtkTreePath * path UNUSED,
GtkTreeIter * iter,
gpointer data UNUSED )
static void
update_foreach( GtkTreeModel * model, GtkTreeIter * iter )
{
int oldActivity, newActivity;
int oldActivePeerCount, newActivePeerCount;
@ -1478,17 +1475,21 @@ update_foreach( GtkTreeModel * model,
MC_RECHECK_PROGRESS, newRecheckProgress,
-1 );
}
/* cleanup */
return FALSE;
}
void
gtr_core_update( TrCore * core )
{
/* refresh the model */
gtk_tree_model_foreach( core_raw_model( core ), update_foreach, NULL );
GtkTreeIter iter;
GtkTreeModel * model;
/* update the model */
model = core_raw_model( core );
if( gtk_tree_model_iter_nth_child( model, &iter, NULL, 0 ) ) do
update_foreach( model, &iter );
while( gtk_tree_model_iter_next( model, &iter ) );
/* update hibernation */
core_maybe_inhibit_hibernation( core );
}
@ -1850,7 +1851,7 @@ gtr_core_get_active_torrent_count( TrCore * core )
size_t activeCount = 0;
GtkTreeModel * model = core_raw_model( core );
if( gtk_tree_model_get_iter_first( model, &iter ) ) do
if( gtk_tree_model_iter_nth_child( model, &iter, NULL, 0 ) ) do
{
int activity;
gtk_tree_model_get( model, &iter, MC_ACTIVITY, &activity, -1 );

24
gtk/tr-prefs.c
View File

@ -614,21 +614,19 @@ struct remote_page
static void
refreshWhitelist( struct remote_page * page )
{
GtkTreeIter iter;
GtkTreeIter iter;
GString * gstr = g_string_new( NULL );
GtkTreeModel * model = GTK_TREE_MODEL( page->store );
GString * gstr = g_string_new( NULL );
if( gtk_tree_model_get_iter_first( model, &iter ) ) do
{
char * address;
gtk_tree_model_get( model, &iter,
COL_ADDRESS, &address,
-1 );
g_string_append( gstr, address );
g_string_append( gstr, "," );
g_free( address );
}
while( gtk_tree_model_iter_next( model, &iter ) );
if( gtk_tree_model_iter_nth_child( model, &iter, NULL, 0 ) ) do
{
char * address;
gtk_tree_model_get( model, &iter, COL_ADDRESS, &address, -1 );
g_string_append( gstr, address );
g_string_append( gstr, "," );
g_free( address );
}
while( gtk_tree_model_iter_next( model, &iter ) );
g_string_truncate( gstr, gstr->len - 1 ); /* remove the trailing comma */