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

InotifyUpdate: allocate the root dynamically

Browse Source
This commit is contained in:
Max Kellermann 2013-01-30 16:35:24 +01:00
parent 4ecf09f9e6
commit f7d8e6c40c
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/InotifyUpdate.cxx
View File

@ -56,7 +56,6 @@ struct WatchDirectory {
GList *children; GList *children;
WatchDirectory() = default;
WatchDirectory(WatchDirectory *_parent, const char *_name, WatchDirectory(WatchDirectory *_parent, const char *_name,
int _descriptor) int _descriptor)
:parent(_parent), name(g_strdup(_name)), :parent(_parent), name(g_strdup(_name)),
@ -68,7 +67,7 @@ static InotifySource *inotify_source;
static InotifyQueue *inotify_queue; static InotifyQueue *inotify_queue;
static unsigned inotify_max_depth; static unsigned inotify_max_depth;
static WatchDirectory inotify_root; static WatchDirectory *inotify_root;
static std::map<int, WatchDirectory *> inotify_directories; static std::map<int, WatchDirectory *> inotify_directories;
static void static void
@ -322,10 +321,8 @@ mpd_inotify_init(unsigned max_depth)
inotify_max_depth = max_depth; inotify_max_depth = max_depth;
inotify_root.name = g_strdup(path.c_str()); int descriptor = inotify_source->Add(path.c_str(), IN_MASK, &error);
inotify_root.descriptor = inotify_source->Add(path.c_str(), if (descriptor < 0) {
IN_MASK, &error);
if (inotify_root.descriptor < 0) {
g_warning("%s", error->message); g_warning("%s", error->message);
g_error_free(error); g_error_free(error);
delete inotify_source; delete inotify_source;
@ -333,9 +330,11 @@ mpd_inotify_init(unsigned max_depth)
return; return;
} }
tree_add_watch_directory(&inotify_root); inotify_root = new WatchDirectory(nullptr, path.c_str(), descriptor);
recursive_watch_subdirectories(&inotify_root, path.c_str(), 0); tree_add_watch_directory(inotify_root);
recursive_watch_subdirectories(inotify_root, path.c_str(), 0);
inotify_queue = new InotifyQueue(*main_loop); inotify_queue = new InotifyQueue(*main_loop);
@ -357,8 +356,7 @@ mpd_inotify_finish(void)
g_free(directory->name); g_free(directory->name);
g_list_free(directory->children); g_list_free(directory->children);
if (directory != &inotify_root) delete directory;
delete directory;
} }
inotify_directories.clear(); inotify_directories.clear();