* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
struct QFileMonitor {
int fd;
-
QemuMutex lock; /* protects dirs & idmap */
GHashTable *dirs; /* dirname => QFileMonitorDir */
GHashTable *idmap; /* inotify ID => dirname */
typedef struct {
- int id; /* watch ID */
+ int64_t id; /* watch ID */
char *filename; /* optional filter */
QFileMonitorHandler cb;
void *opaque;
typedef struct {
char *path;
- int id; /* inotify ID */
- int nextid; /* watch ID counter */
+ int inotify_id; /* inotify ID */
+ int next_file_id; /* file ID counter */
GArray *watches; /* QFileMonitorWatch elements */
} QFileMonitorDir;
g_assert_not_reached();
}
- trace_qemu_file_monitor_event(mon, dir->path, name, ev->mask, dir->id);
+ trace_qemu_file_monitor_event(mon, dir->path, name, ev->mask,
+ dir->inotify_id);
for (i = 0; i < dir->watches->len; i++) {
QFileMonitorWatch *watch = &g_array_index(dir->watches,
QFileMonitorWatch,
g_idle_add((GSourceFunc)qemu_file_monitor_free_idle, mon);
}
-int
+int64_t
qemu_file_monitor_add_watch(QFileMonitor *mon,
const char *dirpath,
const char *filename,
{
QFileMonitorDir *dir;
QFileMonitorWatch watch;
- int ret = -1;
+ int64_t ret = -1;
qemu_mutex_lock(&mon->lock);
dir = g_hash_table_lookup(mon->dirs, dirpath);
dir = g_new0(QFileMonitorDir, 1);
dir->path = g_strdup(dirpath);
- dir->id = rv;
+ dir->inotify_id = rv;
dir->watches = g_array_new(FALSE, TRUE, sizeof(QFileMonitorWatch));
g_hash_table_insert(mon->dirs, dir->path, dir);
}
}
- watch.id = dir->nextid++;
+ watch.id = (((int64_t)dir->inotify_id) << 32) | dir->next_file_id++;
watch.filename = g_strdup(filename);
watch.cb = cb;
watch.opaque = opaque;
void qemu_file_monitor_remove_watch(QFileMonitor *mon,
const char *dirpath,
- int id)
+ int64_t id)
{
QFileMonitorDir *dir;
gsize i;
}
if (dir->watches->len == 0) {
- inotify_rm_watch(mon->fd, dir->id);
- trace_qemu_file_monitor_disable_watch(mon, dir->path, dir->id);
+ inotify_rm_watch(mon->fd, dir->inotify_id);
+ trace_qemu_file_monitor_disable_watch(mon, dir->path, dir->inotify_id);
- g_hash_table_remove(mon->idmap, GINT_TO_POINTER(dir->id));
+ g_hash_table_remove(mon->idmap, GINT_TO_POINTER(dir->inotify_id));
g_hash_table_remove(mon->dirs, dir->path);
if (g_hash_table_size(mon->dirs) == 0) {