gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-24 18:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the monitor and call_when_ready counts to avoid iterating over the

Browse source 
2009-01-13  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-directory-async.c:
        * libnautilus-private/nautilus-directory-private.h:
	Use the monitor and call_when_ready counts to avoid
	iterating over the potentially long lists.


svn path=/trunk/; revision=14851
This commit is contained in:
Alexander Larsson 2009-01-13 12:52:57 +00:00 committed by Alexander Larsson
parent 41eca956af
commit 4736393539
3 changed files with 39 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-01-13 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-directory-async.c:
* libnautilus-private/nautilus-directory-private.h:
Use the monitor and call_when_ready counts to avoid
iterating over the potentially long lists.
2009-01-13 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-directory-private.h:

79
libnautilus-private/nautilus-directory-async.c
View file

@ -1122,23 +1122,13 @@ directory_load_done (NautilusDirectory *directory,
static gboolean
is_anyone_waiting_for_metafile (NautilusDirectory *directory)
{
GList *node;
ReadyCallback *callback;
Monitor *monitor;
for (node = directory->details->call_when_ready_list; node != NULL; node = node->next) {
callback = node->data;
if (REQUEST_WANTS_TYPE (callback->request, REQUEST_METAFILE)) {
return TRUE;
}
if (directory->details->call_when_ready_counters[REQUEST_METAFILE] > 0) {
return TRUE;
}
for (node = directory->details->monitor_list; node != NULL; node = node->next) {
monitor = node->data;
if (REQUEST_WANTS_TYPE (monitor->request, REQUEST_METAFILE)) {
return TRUE;
}
}
if (directory->details->monitor_counters[REQUEST_METAFILE] > 0) {
return TRUE;
}
return FALSE;
}
@ -2002,24 +1992,12 @@ nautilus_directory_has_active_request_for_file (NautilusDirectory *directory,
gboolean
nautilus_directory_is_anyone_monitoring_file_list (NautilusDirectory *directory)
{
GList *node;
ReadyCallback *callback;
Monitor *monitor;
for (node = directory->details->call_when_ready_list;
node != NULL; node = node->next) {
callback = node->data;
if (REQUEST_WANTS_TYPE (callback->request, REQUEST_FILE_LIST)) {
return TRUE;
}
if (directory->details->call_when_ready_counters[REQUEST_FILE_LIST] > 0) {
return TRUE;
}
for (node = directory->details->monitor_list;
node != NULL; node = node->next) {
monitor = node->data;
if (REQUEST_WANTS_TYPE (monitor->request, REQUEST_FILE_LIST)) {
return TRUE;
}
if (directory->details->monitor_counters[REQUEST_FILE_LIST] > 0) {
return TRUE;
}
return FALSE;
@ -2421,26 +2399,31 @@ is_needy (NautilusFile *file,
}
directory = file->details->directory;
for (node = directory->details->call_when_ready_list;
node != NULL; node = node->next) {
callback = node->data;
if (callback->active &&
REQUEST_WANTS_TYPE (callback->request, request_type_wanted)) {
if (callback->file == file) {
return TRUE;
}
if (callback->file == NULL
&& file != directory->details->as_file) {
return TRUE;
if (directory->details->call_when_ready_counters[request_type_wanted] > 0) {
for (node = directory->details->call_when_ready_list;
node != NULL; node = node->next) {
callback = node->data;
if (callback->active &&
REQUEST_WANTS_TYPE (callback->request, request_type_wanted)) {
if (callback->file == file) {
return TRUE;
}
if (callback->file == NULL
&& file != directory->details->as_file) {
return TRUE;
}
}
}
}
for (node = directory->details->monitor_list;
node != NULL; node = node->next) {
monitor = node->data;
if (REQUEST_WANTS_TYPE (monitor->request, request_type_wanted)) {
if (monitor_includes_file (monitor, file)) {
return TRUE;
if (directory->details->monitor_counters[request_type_wanted] > 0) {
for (node = directory->details->monitor_list;
node != NULL; node = node->next) {
monitor = node->data;
if (REQUEST_WANTS_TYPE (monitor->request, request_type_wanted)) {
if (monitor_includes_file (monitor, file)) {
return TRUE;
}
}
}
}

2
libnautilus-private/nautilus-directory-private.h
View file

@ -65,7 +65,7 @@ typedef enum {
/* A request for information about one or more files. */
typedef guint32 Request;
typedef guint32 RequestCounter[REQUEST_TYPE_LAST];
typedef gint32 RequestCounter[REQUEST_TYPE_LAST];
#define REQUEST_WANTS_TYPE(request, type) ((request) & (1<<(type)))
#define REQUEST_SET_TYPE(request, type) (request) |= (1<<(type))