oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

InotifyUpdate: use std::map instead of GTree

Browse Source
This commit is contained in:
Max Kellermann 2013-01-30 15:41:38 +01:00
parent 4d6b9611ae
commit 6805fa2fa0
1 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/InotifyUpdate.cxx
View File

@ -26,6 +26,9 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include <glib.h> #include <glib.h>
#include <map>
#include <assert.h> #include <assert.h>
#include <sys/inotify.h> #include <sys/inotify.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -59,40 +62,31 @@ static InotifyQueue *inotify_queue;
static unsigned inotify_max_depth; static unsigned inotify_max_depth;
static struct watch_directory inotify_root; static struct watch_directory inotify_root;
static GTree *inotify_directories; static std::map<int, watch_directory *> inotify_directories;
static gint
compare(gconstpointer a, gconstpointer b)
{
if (a < b)
return -1;
else if (a > b)
return 1;
else
return 0;
}
static void static void
tree_add_watch_directory(struct watch_directory *directory) tree_add_watch_directory(struct watch_directory *directory)
{ {
g_tree_insert(inotify_directories, inotify_directories.insert(std::make_pair(directory->descriptor,
GINT_TO_POINTER(directory->descriptor), directory); directory));
} }
static void static void
tree_remove_watch_directory(struct watch_directory *directory) tree_remove_watch_directory(struct watch_directory *directory)
{ {
G_GNUC_UNUSED auto i = inotify_directories.find(directory->descriptor);
bool found = g_tree_remove(inotify_directories, assert(i != inotify_directories.end());
GINT_TO_POINTER(directory->descriptor)); inotify_directories.erase(i);
assert(found);
} }
static struct watch_directory * static struct watch_directory *
tree_find_watch_directory(int wd) tree_find_watch_directory(int wd)
{ {
return (struct watch_directory *) auto i = inotify_directories.find(wd);
g_tree_lookup(inotify_directories, GINT_TO_POINTER(wd)); if (i == inotify_directories.end())
return nullptr;
return i->second;
} }
static void static void
@ -337,7 +331,6 @@ mpd_inotify_init(unsigned max_depth)
return; return;
} }
inotify_directories = g_tree_new(compare);
tree_add_watch_directory(&inotify_root); tree_add_watch_directory(&inotify_root);
recursive_watch_subdirectories(&inotify_root, path.c_str(), 0); recursive_watch_subdirectories(&inotify_root, path.c_str(), 0);
@ -347,21 +340,6 @@ mpd_inotify_init(unsigned max_depth)
g_debug("watching music directory"); g_debug("watching music directory");
} }
static gboolean
free_watch_directory(G_GNUC_UNUSED gpointer key, gpointer value,
G_GNUC_UNUSED gpointer data)
{
struct watch_directory *directory = (struct watch_directory *)value;
g_free(directory->name);
g_list_free(directory->children);
if (directory != &inotify_root)
g_slice_free(struct watch_directory, directory);
return false;
}
void void
mpd_inotify_finish(void) mpd_inotify_finish(void)
{ {
@ -371,6 +349,15 @@ mpd_inotify_finish(void)
delete inotify_queue; delete inotify_queue;
delete inotify_source; delete inotify_source;
g_tree_foreach(inotify_directories, free_watch_directory, NULL); for (auto i : inotify_directories) {
g_tree_destroy(inotify_directories); watch_directory *directory = i.second;
g_free(directory->name);
g_list_free(directory->children);
if (directory != &inotify_root)
g_slice_free(struct watch_directory, directory);
}
inotify_directories.clear();
} }