From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpzYr-0007af-Nu for qemu-devel@nongnu.org; Fri, 30 Sep 2016 11:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpzYo-0007Vb-IZ for qemu-devel@nongnu.org; Fri, 30 Sep 2016 11:17:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpzYo-0007V6-92 for qemu-devel@nongnu.org; Fri, 30 Sep 2016 11:17:14 -0400 From: "Daniel P. Berrange" Date: Fri, 30 Sep 2016 16:16:55 +0100 Message-Id: <1475248620-534-2-git-send-email-berrange@redhat.com> In-Reply-To: <1475248620-534-1-git-send-email-berrange@redhat.com> References: <1475248620-534-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] io: add ability to set a name for IO channels List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , prashanth sunder , "Daniel P. Berrange" 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 an QIOChannel object, we can then set the name on any GSource associated with the channel. Signed-off-by: Daniel P. Berrange --- include/io/channel.h | 13 +++++++++++++ io/channel.c | 24 +++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/include/io/channel.h b/include/io/channel.h index cf1c622..32a9470 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 d1f1ae5..80924c1 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), }; -- 2.7.4