luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 14:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

only query file info in g_file_copy() when we need it

Browse Source 
The default implementation of g_file_copy() checked the size of the file
to copy to give useful progress updates unconditionally. This can cause
long delays on 1-connection FTP servers while it tries to open a second
connection before it returns EBUSY. This patch makes this query only
happen when we actually send progress updates.
This commit is contained in:
Benjamin Otte 2009-06-08 15:27:12 +02:00
parent 0bb5739f32
commit 29a4a0a44d
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gfile.c
View File

@ -2644,6 +2644,9 @@ copy_stream_with_progress (GInputStream *in,
GFileInfo *info; GFileInfo *info;
total_size = -1; total_size = -1;
/* avoid performance impact of querying total size when it's not needed */
if (progress_callback)
{
info = g_file_input_stream_query_info (G_FILE_INPUT_STREAM (in), info = g_file_input_stream_query_info (G_FILE_INPUT_STREAM (in),
G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_ATTRIBUTE_STANDARD_SIZE,
cancellable, NULL); cancellable, NULL);
@ -2667,6 +2670,7 @@ copy_stream_with_progress (GInputStream *in,
g_object_unref (info); g_object_unref (info);
} }
} }
}
if (total_size == -1) if (total_size == -1)
total_size = 0; total_size = 0;