aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-09-30 11:50:18 +0100
committerDaniel P. Berrange <berrange@redhat.com>2016-10-27 09:13:10 +0200
commit20f4aa265ec8442be66f00ee3986a92018b44b7b (patch)
tree96a7f441c86c1c286f083571ab7dc27160b068f1
parentaf8096b2c3b16de3f6237f1ead6a657a7565272f (diff)
io: add ability to set a name for IO channels
The GSource object has ability to have a name, which is useful when debugging performance problems with the mainloop event callbacks that take too long. By associating a name with a QIOChannel object, we can then set the name on any GSource associated with the channel. Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-rw-r--r--include/glib-compat.h7
-rw-r--r--include/io/channel.h13
-rw-r--r--io/channel.c24
3 files changed, 39 insertions, 5 deletions
diff --git a/include/glib-compat.h b/include/glib-compat.h
index 8093163bee..9dfe952c5d 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -304,4 +304,11 @@ static inline void g_slist_free_full(GSList *list, GDestroyNotify free_func)
}
#endif
+#if !GLIB_CHECK_VERSION(2, 26, 0)
+static inline void g_source_set_name(GSource *source, const char *name)
+{
+ /* This is just a debugging aid, so leaving it a no-op */
+}
+#endif
+
#endif
diff --git a/include/io/channel.h b/include/io/channel.h
index cf1c6223fa..32a9470794 100644
--- a/include/io/channel.h
+++ b/include/io/channel.h
@@ -79,6 +79,7 @@ typedef gboolean (*QIOChannelFunc)(QIOChannel *ioc,
struct QIOChannel {
Object parent;
unsigned int features; /* bitmask of QIOChannelFeatures */
+ char *name;
#ifdef _WIN32
HANDLE event; /* For use with GSource on Win32 */
#endif
@@ -159,6 +160,18 @@ void qio_channel_set_feature(QIOChannel *ioc,
QIOChannelFeature feature);
/**
+ * qio_channel_set_name:
+ * @ioc: the channel object
+ * @name: the name of the channel
+ *
+ * Sets the name of the channel, which serves as an aid
+ * to debugging. The name is used when creating GSource
+ * watches for this channel.
+ */
+void qio_channel_set_name(QIOChannel *ioc,
+ const char *name);
+
+/**
* qio_channel_readv_full:
* @ioc: the channel object
* @iov: the array of memory regions to read data into
diff --git a/io/channel.c b/io/channel.c
index d1f1ae5157..80924c1772 100644
--- a/io/channel.c
+++ b/io/channel.c
@@ -37,6 +37,14 @@ void qio_channel_set_feature(QIOChannel *ioc,
}
+void qio_channel_set_name(QIOChannel *ioc,
+ const char *name)
+{
+ g_free(ioc->name);
+ ioc->name = g_strdup(name);
+}
+
+
ssize_t qio_channel_readv_full(QIOChannel *ioc,
const struct iovec *iov,
size_t niov,
@@ -136,7 +144,13 @@ GSource *qio_channel_create_watch(QIOChannel *ioc,
GIOCondition condition)
{
QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc);
- return klass->io_create_watch(ioc, condition);
+ GSource *ret = klass->io_create_watch(ioc, condition);
+
+ if (ioc->name) {
+ g_source_set_name(ret, ioc->name);
+ }
+
+ return ret;
}
@@ -282,24 +296,24 @@ void qio_channel_wait(QIOChannel *ioc,
}
-#ifdef _WIN32
static void qio_channel_finalize(Object *obj)
{
QIOChannel *ioc = QIO_CHANNEL(obj);
+ g_free(ioc->name);
+
+#ifdef _WIN32
if (ioc->event) {
CloseHandle(ioc->event);
}
-}
#endif
+}
static const TypeInfo qio_channel_info = {
.parent = TYPE_OBJECT,
.name = TYPE_QIO_CHANNEL,
.instance_size = sizeof(QIOChannel),
-#ifdef _WIN32
.instance_finalize = qio_channel_finalize,
-#endif
.abstract = true,
.class_size = sizeof(QIOChannelClass),
};