From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtaaS-0001Ic-NE for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtaaQ-00059i-Qw for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:08 -0500 Received: from mail-ww0-f41.google.com ([74.125.82.41]:45371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtaaQ-00058h-JC for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:06 -0500 Received: by wgbdt11 with SMTP id dt11so1786120wgb.4 for ; Sat, 04 Feb 2012 00:03:05 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 4 Feb 2012 09:02:33 +0100 Message-Id: <1328342577-25732-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> References: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 03/27] qom: clean up/optimize object_dynamic_cast List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The interface loop can be performed only on the parent object. It does not need to be done on each interface. Similarly, we can simplify the code by switching early from the implementation object to the parent object. Signed-off-by: Paolo Bonzini --- qom/object.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/qom/object.c b/qom/object.c index 4261944..4d21f0a 100644 --- a/qom/object.c +++ b/qom/object.c @@ -372,7 +372,6 @@ static bool object_is_type(Object *obj, const char *typename) { TypeImpl *target_type = type_get_by_name(typename); TypeImpl *type = obj->class->type; - GSList *i; /* Check if typename is a direct ancestor of type */ while (type) { @@ -383,15 +382,6 @@ static bool object_is_type(Object *obj, const char *typename) type = type_get_parent(type); } - /* Check if obj has an interface of typename */ - for (i = obj->interfaces; i; i = i->next) { - Interface *iface = i->data; - - if (object_is_type(OBJECT(iface), typename)) { - return true; - } - } - return false; } @@ -404,6 +394,24 @@ Object *object_dynamic_cast(Object *obj, const char *typename) return obj; } + /* Check if obj is an interface and its containing object is a direct + * ancestor of typename. In principle we could do this test at the very + * beginning of object_dynamic_cast, avoiding a second call to + * object_is_type. However, casting between interfaces is relatively + * rare, and object_is_type(obj, TYPE_INTERFACE) would fail almost always. + * + * Perhaps we could add a magic value to the object header for increased + * (run-time) type safety and to speed up tests like this one. If we ever + * do that we can revisit the order here. + */ + if (object_is_type(obj, TYPE_INTERFACE)) { + assert(!obj->interfaces); + obj = INTERFACE(obj)->obj; + if (object_is_type(obj, typename)) { + return obj; + } + } + /* Check if obj has an interface of typename */ for (i = obj->interfaces; i; i = i->next) { Interface *iface = i->data; @@ -413,16 +421,6 @@ Object *object_dynamic_cast(Object *obj, const char *typename) } } - /* Check if obj is an interface and its containing object is a direct - * ancestor of typename */ - if (object_is_type(obj, TYPE_INTERFACE)) { - Interface *iface = INTERFACE(obj); - - if (object_is_type(iface->obj, typename)) { - return iface->obj; - } - } - return NULL; } -- 1.7.7.6