-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* dbus-object-tree.c DBusObjectTree (internals of DBusConnection)
*
- * Copyright (C) 2003 Red Hat Inc.
+ * Copyright (C) 2003, 2005 Red Hat Inc.
*
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+
+#include <config.h>
#include "dbus-object-tree.h"
#include "dbus-connection-internal.h"
#include "dbus-internals.h"
#include "dbus-hash.h"
#include "dbus-protocol.h"
+#include "dbus-string.h"
#include <string.h>
#include <stdlib.h>
* @brief DBusObjectTree is used by DBusConnection to track the object tree
*
* Types and functions related to DBusObjectTree. These
- * are all internal.
+ * are all library-internal.
*
* @{
*/
+/** Subnode of the object hierarchy */
typedef struct DBusObjectSubtree DBusObjectSubtree;
-static DBusObjectSubtree* _dbus_object_subtree_new (const char **path,
+static DBusObjectSubtree* _dbus_object_subtree_new (const char *name,
const DBusObjectPathVTable *vtable,
void *user_data);
-static void _dbus_object_subtree_ref (DBusObjectSubtree *subtree);
+static DBusObjectSubtree* _dbus_object_subtree_ref (DBusObjectSubtree *subtree);
static void _dbus_object_subtree_unref (DBusObjectSubtree *subtree);
+/**
+ * Internals of DBusObjectTree
+ */
struct DBusObjectTree
{
- int refcount;
- DBusConnection *connection;
+ int refcount; /**< Reference count */
+ DBusConnection *connection; /**< Connection this tree belongs to */
- /* Each subtree is a separate malloc block since that
- * lets us refcount them and maybe helps with
- * reentrancy issues when calling back to application code
- */
- DBusObjectSubtree **subtrees;
- int n_subtrees;
- unsigned int subtrees_sorted : 1;
+ DBusObjectSubtree *root; /**< Root of the tree ("/" node) */
};
+/**
+ * Struct representing a single registered subtree handler, or node
+ * that's a parent of a registered subtree handler. If
+ * message_function != NULL there's actually a handler at this node.
+ */
struct DBusObjectSubtree
{
- DBusAtomic refcount;
- DBusObjectPathUnregisterFunction unregister_function;
- DBusObjectPathMessageFunction message_function;
- void *user_data;
- char *path[1]; /**< Allocated as large as necessary */
+ DBusAtomic refcount; /**< Reference count */
+ DBusObjectSubtree *parent; /**< Parent node */
+ DBusObjectPathUnregisterFunction unregister_function; /**< Function to call on unregister */
+ DBusObjectPathMessageFunction message_function; /**< Function to handle messages */
+ void *user_data; /**< Data for functions */
+ DBusObjectSubtree **subtrees; /**< Child nodes */
+ int n_subtrees; /**< Number of child nodes */
+ int max_subtrees; /**< Number of allocated entries in subtrees */
+ unsigned int invoke_as_fallback : 1; /**< Whether to invoke message_function when child nodes don't handle the message */
+ char name[1]; /**< Allocated as large as necessary */
};
+/**
+ * Creates a new object tree, representing a mapping from paths
+ * to handler vtables.
+ *
+ * @param connection the connection this tree belongs to
+ * @returns the new tree or #NULL if no memory
+ */
DBusObjectTree*
_dbus_object_tree_new (DBusConnection *connection)
{
DBusObjectTree *tree;
-
+
/* the connection passed in here isn't fully constructed,
* so don't do anything more than store a pointer to
* it
*/
-
+
tree = dbus_new0 (DBusObjectTree, 1);
if (tree == NULL)
goto oom;
-
+
tree->refcount = 1;
tree->connection = connection;
+ tree->root = _dbus_object_subtree_new ("/", NULL, NULL);
+ if (tree->root == NULL)
+ goto oom;
+ tree->root->invoke_as_fallback = TRUE;
return tree;
{
dbus_free (tree);
}
-
+
return NULL;
}
-void
+/**
+ * Increment the reference count
+ * @param tree the object tree
+ * @returns the object tree
+ */
+DBusObjectTree *
_dbus_object_tree_ref (DBusObjectTree *tree)
{
_dbus_assert (tree->refcount > 0);
tree->refcount += 1;
+
+ return tree;
}
+/**
+ * Decrement the reference count
+ * @param tree the object tree
+ */
void
_dbus_object_tree_unref (DBusObjectTree *tree)
{
{
_dbus_object_tree_free_all_unlocked (tree);
- dbus_free (tree->subtrees);
dbus_free (tree);
}
}
-static int
-path_cmp (const char **path_a,
- const char **path_b)
-{
- /* strcmp() considers a shorter string less than a longer string if
- * the shorter string is the initial part of the longer. We
- * consider a path with less elements less than a path with more
- * elements.
- */
- int i;
+/** Set to 1 to get a bunch of debug spew about finding the
+ * subtree nodes
+ */
+#define VERBOSE_FIND 0
- i = 0;
- while (path_a[i] != NULL)
- {
- int v;
-
- if (path_b[i] == NULL)
- return 1; /* a is longer than b */
+static DBusObjectSubtree*
+find_subtree_recurse (DBusObjectSubtree *subtree,
+ const char **path,
+ dbus_bool_t create_if_not_found,
+ int *index_in_parent,
+ dbus_bool_t *exact_match)
+{
+ int i, j;
+ dbus_bool_t return_deepest_match;
- _dbus_assert (path_a[i] != NULL);
- _dbus_assert (path_b[i] != NULL);
-
- v = strcmp (path_a[i], path_b[i]);
+ return_deepest_match = exact_match != NULL;
- if (v != 0)
- return v;
+ _dbus_assert (!(return_deepest_match && create_if_not_found));
- ++i;
+ if (path[0] == NULL)
+ {
+#if VERBOSE_FIND
+ _dbus_verbose (" path exhausted, returning %s\n",
+ subtree->name);
+#endif
+ if (exact_match != NULL)
+ *exact_match = TRUE;
+ return subtree;
}
- _dbus_assert (path_a[i] == NULL);
- if (path_b[i] == NULL)
- return 0;
+#if VERBOSE_FIND
+ _dbus_verbose (" searching children of %s for %s\n",
+ subtree->name, path[0]);
+#endif
- /* b is longer than a */
- return -1;
-}
-
-static int
-subtree_cmp (DBusObjectSubtree *subtree_a,
- DBusObjectSubtree *subtree_b)
-{
- return path_cmp ((const char**) subtree_a->path,
- (const char**) subtree_b->path);
-}
-
-static int
-subtree_qsort_cmp (const void *a,
- const void *b)
-{
- DBusObjectSubtree **subtree_a_p = (void*) a;
- DBusObjectSubtree **subtree_b_p = (void*) b;
+ i = 0;
+ j = subtree->n_subtrees;
+ while (i < j)
+ {
+ int k, v;
- return subtree_cmp (*subtree_a_p, *subtree_b_p);
-}
+ k = (i + j) / 2;
+ v = strcmp (path[0], subtree->subtrees[k]->name);
-/* Returns TRUE if container is a parent of child
- */
-static dbus_bool_t
-path_contains (const char **container,
- const char **child)
-{
- int i;
+#if VERBOSE_FIND
+ _dbus_verbose (" %s cmp %s = %d\n",
+ path[0], subtree->subtrees[k]->name,
+ v);
+#endif
+
+ if (v == 0)
+ {
+ if (index_in_parent)
+ {
+#if VERBOSE_FIND
+ _dbus_verbose (" storing parent index %d\n", k);
+#endif
+ *index_in_parent = k;
+ }
+
+ if (return_deepest_match)
+ {
+ DBusObjectSubtree *next;
+
+ next = find_subtree_recurse (subtree->subtrees[k],
+ &path[1], create_if_not_found,
+ index_in_parent, exact_match);
+ if (next == NULL &&
+ subtree->invoke_as_fallback)
+ {
+#if VERBOSE_FIND
+ _dbus_verbose (" no deeper match found, returning %s\n",
+ subtree->name);
+#endif
+ if (exact_match != NULL)
+ *exact_match = FALSE;
+ return subtree;
+ }
+ else
+ return next;
+ }
+ else
+ return find_subtree_recurse (subtree->subtrees[k],
+ &path[1], create_if_not_found,
+ index_in_parent, exact_match);
+ }
+ else if (v < 0)
+ {
+ j = k;
+ }
+ else
+ {
+ i = k + 1;
+ }
+ }
- i = 0;
- while (child[i] != NULL)
+#if VERBOSE_FIND
+ _dbus_verbose (" no match found, current tree %s, create_if_not_found = %d\n",
+ subtree->name, create_if_not_found);
+#endif
+
+ if (create_if_not_found)
{
- int v;
-
- if (container[i] == NULL)
- return TRUE; /* container ran out, child continues;
- * thus the container is a parent of the
- * child.
- */
+ DBusObjectSubtree* child;
+ int child_pos, new_n_subtrees;
- _dbus_assert (container[i] != NULL);
- _dbus_assert (child[i] != NULL);
+#if VERBOSE_FIND
+ _dbus_verbose (" creating subtree %s\n",
+ path[0]);
+#endif
- v = strcmp (container[i], child[i]);
+ child = _dbus_object_subtree_new (path[0],
+ NULL, NULL);
+ if (child == NULL)
+ return NULL;
- if (v != 0)
- return FALSE; /* they overlap until here and then are different,
- * not overlapping
- */
+ new_n_subtrees = subtree->n_subtrees + 1;
+ if (new_n_subtrees > subtree->max_subtrees)
+ {
+ int new_max_subtrees;
+ DBusObjectSubtree **new_subtrees;
+
+ new_max_subtrees = subtree->max_subtrees == 0 ? 1 : 2 * subtree->max_subtrees;
+ new_subtrees = dbus_realloc (subtree->subtrees,
+ new_max_subtrees * sizeof (DBusObjectSubtree*));
+ if (new_subtrees == NULL)
+ {
+ _dbus_object_subtree_unref (child);
+ return NULL;
+ }
+ subtree->subtrees = new_subtrees;
+ subtree->max_subtrees = new_max_subtrees;
+ }
- ++i;
+ /* The binary search failed, so i == j points to the
+ place the child should be inserted. */
+ child_pos = i;
+ _dbus_assert (child_pos < new_n_subtrees &&
+ new_n_subtrees <= subtree->max_subtrees);
+ if (child_pos + 1 < new_n_subtrees)
+ {
+ memmove (&subtree->subtrees[child_pos+1],
+ &subtree->subtrees[child_pos],
+ (new_n_subtrees - child_pos - 1) *
+ sizeof subtree->subtrees[0]);
+ }
+ subtree->subtrees[child_pos] = child;
+
+ if (index_in_parent)
+ *index_in_parent = child_pos;
+ subtree->n_subtrees = new_n_subtrees;
+ child->parent = subtree;
+
+ return find_subtree_recurse (child,
+ &path[1], create_if_not_found,
+ index_in_parent, exact_match);
}
-
- /* Child ran out; if container also did, they are equal;
- * otherwise, the child is a parent of the container.
- */
- if (container[i] == NULL)
- return TRUE; /* equal is counted as containing */
else
- return FALSE;
-}
-
-static void
-ensure_sorted (DBusObjectTree *tree)
-{
- if (tree->subtrees && !tree->subtrees_sorted)
{
- qsort (tree->subtrees,
- tree->n_subtrees,
- sizeof (DBusObjectSubtree*),
- subtree_qsort_cmp);
- tree->subtrees_sorted = TRUE;
+ if (exact_match != NULL)
+ *exact_match = FALSE;
+ return (return_deepest_match && subtree->invoke_as_fallback) ? subtree : NULL;
}
}
-static dbus_bool_t
+static DBusObjectSubtree*
find_subtree (DBusObjectTree *tree,
const char **path,
- int *idx_p)
+ int *index_in_parent)
{
- int i;
-
- if (tree->subtrees == NULL)
- return FALSE;
+ DBusObjectSubtree *subtree;
- ensure_sorted (tree);
+#if VERBOSE_FIND
+ _dbus_verbose ("Looking for exact registered subtree\n");
+#endif
+
+ subtree = find_subtree_recurse (tree->root, path, FALSE, index_in_parent, NULL);
- /* FIXME this should be a binary search,
- * as that's the whole point of the sorting
- */
- i = 0;
- while (i < tree->n_subtrees)
- {
- int v;
+ if (subtree && subtree->message_function == NULL)
+ return NULL;
+ else
+ return subtree;
+}
- v = path_cmp (path,
- (const char**) tree->subtrees[i]->path);
-
- if (v == 0)
- {
- if (idx_p)
- *idx_p = i;
-
- return TRUE;
- }
- else if (v < 0)
- {
- return FALSE;
- }
-
- ++i;
- }
-
- return FALSE;
+static DBusObjectSubtree*
+lookup_subtree (DBusObjectTree *tree,
+ const char **path)
+{
+#if VERBOSE_FIND
+ _dbus_verbose ("Looking for subtree\n");
+#endif
+ return find_subtree_recurse (tree->root, path, FALSE, NULL, NULL);
}
-static dbus_bool_t
+static DBusObjectSubtree*
find_handler (DBusObjectTree *tree,
const char **path,
- int *idx_p)
+ dbus_bool_t *exact_match)
{
- int i;
- int found_so_far;
-
- if (tree->subtrees == NULL)
- return FALSE;
-
- ensure_sorted (tree);
-
- /* FIXME this should be a binary search,
- * as that's the whole point of the sorting
- */
- found_so_far = -1;
- i = 0;
- while (i < tree->n_subtrees)
- {
- /* Longer paths are after shorter, so we scan
- * for the latest containing path in the array.
- * If we did a binary search we'd start with
- * the first search match.
- */
- if (path_contains ((const char**) tree->subtrees[i]->path,
- path))
- found_so_far = i;
- else if (found_so_far >= 0)
- break; /* no need to scan further */
-
- ++i;
- }
-
- if (idx_p)
- *idx_p = found_so_far;
+#if VERBOSE_FIND
+ _dbus_verbose ("Looking for deepest handler\n");
+#endif
+ _dbus_assert (exact_match != NULL);
- return FALSE;
+ *exact_match = FALSE; /* ensure always initialized */
+
+ return find_subtree_recurse (tree->root, path, FALSE, NULL, exact_match);
}
-#ifndef DBUS_DISABLE_CHECKS
-static void
-check_already_exists (DBusObjectTree *tree,
- const char **path)
+static DBusObjectSubtree*
+ensure_subtree (DBusObjectTree *tree,
+ const char **path)
{
- int i;
-
- i = 0;
- while (i < tree->n_subtrees)
- {
- if (path_cmp (path, (const char**) tree->subtrees[i]->path) == 0)
- {
- _dbus_warn ("New path (path[0] = %s) already registered\n",
- path[0]);
- }
- ++i;
- }
-}
+#if VERBOSE_FIND
+ _dbus_verbose ("Ensuring subtree\n");
#endif
+ return find_subtree_recurse (tree->root, path, TRUE, NULL, NULL);
+}
+
+static char *flatten_path (const char **path);
/**
* Registers a new subtree in the global object tree.
*
* @param tree the global object tree
+ * @param fallback #TRUE to handle messages to children of this path
* @param path NULL-terminated array of path elements giving path to subtree
* @param vtable the vtable used to traverse this subtree
* @param user_data user data to pass to methods in the vtable
- * @returns #FALSE if not enough memory
+ * @param error address where an error can be returned
+ * @returns #FALSE if an error (#DBUS_ERROR_NO_MEMORY or
+ * #DBUS_ERROR_OBJECT_PATH_IN_USE) is reported
*/
dbus_bool_t
_dbus_object_tree_register (DBusObjectTree *tree,
+ dbus_bool_t fallback,
const char **path,
const DBusObjectPathVTable *vtable,
- void *user_data)
+ void *user_data,
+ DBusError *error)
{
DBusObjectSubtree *subtree;
- DBusObjectSubtree **new_subtrees;
- int new_n_subtrees;
_dbus_assert (tree != NULL);
- _dbus_assert (vtable->message_function != NULL);
+ _dbus_assert (vtable->message_function != NULL);
_dbus_assert (path != NULL);
-#ifndef DBUS_DISABLE_CHECKS
- check_already_exists (tree, path);
-#endif
- _dbus_assert (path[0] != NULL);
-
- subtree = _dbus_object_subtree_new (path, vtable, user_data);
+
+ subtree = ensure_subtree (tree, path);
if (subtree == NULL)
- return FALSE;
-
- /* FIXME we should do the "double alloc each time" standard thing */
- new_n_subtrees = tree->n_subtrees + 1;
- new_subtrees = dbus_realloc (tree->subtrees,
- new_n_subtrees * sizeof (DBusObjectSubtree*));
- if (new_subtrees == NULL)
{
- subtree->unregister_function = NULL;
- subtree->message_function = NULL;
- _dbus_object_subtree_unref (subtree);
+ _DBUS_SET_OOM (error);
return FALSE;
}
- new_subtrees[tree->n_subtrees] = subtree;
- tree->subtrees_sorted = FALSE;
- tree->n_subtrees = new_n_subtrees;
- tree->subtrees = new_subtrees;
+ if (subtree->message_function != NULL)
+ {
+ if (error != NULL)
+ {
+ char *complete_path = flatten_path (path);
+
+ dbus_set_error (error, DBUS_ERROR_OBJECT_PATH_IN_USE,
+ "A handler is already registered for %s",
+ complete_path ? complete_path
+ : "(cannot represent path: out of memory!)");
+
+ dbus_free (complete_path);
+ }
+
+ return FALSE;
+ }
+
+ subtree->message_function = vtable->message_function;
+ subtree->unregister_function = vtable->unregister_function;
+ subtree->user_data = user_data;
+ subtree->invoke_as_fallback = fallback != FALSE;
return TRUE;
}
{
int i;
DBusObjectSubtree *subtree;
+ DBusObjectPathUnregisterFunction unregister_function;
+ void *user_data;
+ DBusConnection *connection;
_dbus_assert (path != NULL);
- _dbus_assert (path[0] != NULL);
- if (!find_subtree (tree, path, &i))
+ unregister_function = NULL;
+ user_data = NULL;
+
+ subtree = find_subtree (tree, path, &i);
+
+#ifndef DBUS_DISABLE_CHECKS
+ if (subtree == NULL)
{
_dbus_warn ("Attempted to unregister path (path[0] = %s path[1] = %s) which isn't registered\n",
- path[0], path[1] ? path[1] : "null");
- return;
+ path[0] ? path[0] : "null",
+ path[1] ? path[1] : "null");
+ goto unlock;
}
+#else
+ _dbus_assert (subtree != NULL);
+#endif
- _dbus_assert (i >= 0);
-
- subtree = tree->subtrees[i];
-
- /* assumes a 0-byte memmove is OK */
- memmove (&tree->subtrees[i],
- &tree->subtrees[i+1],
- (tree->n_subtrees - i - 1) * sizeof (tree->subtrees[0]));
- tree->n_subtrees -= 1;
+ _dbus_assert (subtree->parent == NULL ||
+ (i >= 0 && subtree->parent->subtrees[i] == subtree));
subtree->message_function = NULL;
-
+
+ unregister_function = subtree->unregister_function;
+ user_data = subtree->user_data;
+
+ subtree->unregister_function = NULL;
+ subtree->user_data = NULL;
+
+ /* If we have no subtrees of our own, remove from
+ * our parent (FIXME could also be more aggressive
+ * and remove our parent if it becomes empty)
+ */
+ if (subtree->parent && subtree->n_subtrees == 0)
+ {
+ /* assumes a 0-byte memmove is OK */
+ memmove (&subtree->parent->subtrees[i],
+ &subtree->parent->subtrees[i+1],
+ (subtree->parent->n_subtrees - i - 1) *
+ sizeof (subtree->parent->subtrees[0]));
+ subtree->parent->n_subtrees -= 1;
+
+ subtree->parent = NULL;
+
+ _dbus_object_subtree_unref (subtree);
+ }
+ subtree = NULL;
+
+unlock:
+ connection = tree->connection;
+
/* Unlock and call application code */
#ifdef DBUS_BUILD_TESTS
- if (tree->connection)
+ if (connection)
#endif
- _dbus_connection_unlock (tree->connection);
-
- if (subtree->unregister_function)
{
- (* subtree->unregister_function) (tree->connection,
- (const char**) subtree->path,
- subtree->user_data);
- subtree->unregister_function = NULL;
+ _dbus_connection_ref_unlocked (connection);
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (connection);
+ }
+
+ if (unregister_function)
+ (* unregister_function) (connection, user_data);
+
+#ifdef DBUS_BUILD_TESTS
+ if (connection)
+#endif
+ dbus_connection_unref (connection);
+}
+
+static void
+free_subtree_recurse (DBusConnection *connection,
+ DBusObjectSubtree *subtree)
+{
+ /* Delete them from the end, for slightly
+ * more robustness against odd reentrancy.
+ */
+ while (subtree->n_subtrees > 0)
+ {
+ DBusObjectSubtree *child;
+
+ child = subtree->subtrees[subtree->n_subtrees - 1];
+ subtree->subtrees[subtree->n_subtrees - 1] = NULL;
+ subtree->n_subtrees -= 1;
+ child->parent = NULL;
+
+ free_subtree_recurse (connection, child);
}
+ /* Call application code */
+ if (subtree->unregister_function)
+ (* subtree->unregister_function) (connection,
+ subtree->user_data);
+
+ subtree->message_function = NULL;
+ subtree->unregister_function = NULL;
+ subtree->user_data = NULL;
+
+ /* Now free ourselves */
_dbus_object_subtree_unref (subtree);
}
* Free all the handlers in the tree. Lock on tree's connection
* must not be held.
*
- * @todo implement
- *
* @param tree the object tree
*/
void
_dbus_object_tree_free_all_unlocked (DBusObjectTree *tree)
{
- /* Delete them from the end, for slightly
- * more robustness against odd reentrancy.
- */
- while (tree->n_subtrees > 0)
+ if (tree->root)
+ free_subtree_recurse (tree->connection,
+ tree->root);
+ tree->root = NULL;
+}
+
+static dbus_bool_t
+_dbus_object_tree_list_registered_unlocked (DBusObjectTree *tree,
+ const char **parent_path,
+ char ***child_entries)
+{
+ DBusObjectSubtree *subtree;
+ char **retval;
+
+ _dbus_assert (parent_path != NULL);
+ _dbus_assert (child_entries != NULL);
+
+ *child_entries = NULL;
+
+ subtree = lookup_subtree (tree, parent_path);
+ if (subtree == NULL)
+ {
+ retval = dbus_new0 (char *, 1);
+ }
+ else
{
- DBusObjectSubtree *subtree;
+ int i;
+ retval = dbus_new0 (char*, subtree->n_subtrees + 1);
+ if (retval == NULL)
+ goto out;
+ i = 0;
+ while (i < subtree->n_subtrees)
+ {
+ retval[i] = _dbus_strdup (subtree->subtrees[i]->name);
+ if (retval[i] == NULL)
+ {
+ dbus_free_string_array (retval);
+ retval = NULL;
+ goto out;
+ }
+ ++i;
+ }
+ }
- subtree = tree->subtrees[tree->n_subtrees - 1];
- tree->subtrees[tree->n_subtrees - 1] = NULL;
- tree->n_subtrees -= 1;
+ out:
+
+ *child_entries = retval;
+ return retval != NULL;
+}
- subtree->message_function = NULL; /* it's been removed */
+static DBusHandlerResult
+handle_default_introspect_and_unlock (DBusObjectTree *tree,
+ DBusMessage *message,
+ const char **path)
+{
+ DBusString xml;
+ DBusHandlerResult result;
+ char **children;
+ int i;
+ DBusMessage *reply;
+ DBusMessageIter iter;
+ const char *v_STRING;
+ dbus_bool_t already_unlocked;
- /* Call application code */
- if (subtree->unregister_function)
+ /* We have the connection lock here */
+
+ already_unlocked = FALSE;
+
+ _dbus_verbose (" considering default Introspect() handler...\n");
+
+ reply = NULL;
+
+ if (!dbus_message_is_method_call (message,
+ DBUS_INTERFACE_INTROSPECTABLE,
+ "Introspect"))
+ {
+#ifdef DBUS_BUILD_TESTS
+ if (tree->connection)
+#endif
{
- (* subtree->unregister_function) (tree->connection,
- (const char**) subtree->path,
- subtree->user_data);
- subtree->unregister_function = NULL;
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (tree->connection);
}
- _dbus_object_subtree_unref (subtree);
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ _dbus_verbose (" using default Introspect() handler!\n");
+
+ if (!_dbus_string_init (&xml))
+ {
+#ifdef DBUS_BUILD_TESTS
+ if (tree->connection)
+#endif
+ {
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (tree->connection);
+ }
+
+ return DBUS_HANDLER_RESULT_NEED_MEMORY;
}
+
+ result = DBUS_HANDLER_RESULT_NEED_MEMORY;
+
+ children = NULL;
+ if (!_dbus_object_tree_list_registered_unlocked (tree, path, &children))
+ goto out;
+
+ if (!_dbus_string_append (&xml, DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE))
+ goto out;
+
+ if (!_dbus_string_append (&xml, "<node>\n"))
+ goto out;
+
+ i = 0;
+ while (children[i] != NULL)
+ {
+ if (!_dbus_string_append_printf (&xml, " <node name=\"%s\"/>\n",
+ children[i]))
+ goto out;
+
+ ++i;
+ }
+
+ if (!_dbus_string_append (&xml, "</node>\n"))
+ goto out;
+
+ reply = dbus_message_new_method_return (message);
+ if (reply == NULL)
+ goto out;
+
+ dbus_message_iter_init_append (reply, &iter);
+ v_STRING = _dbus_string_get_const_data (&xml);
+ if (!dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &v_STRING))
+ goto out;
+
+#ifdef DBUS_BUILD_TESTS
+ if (tree->connection)
+#endif
+ {
+ already_unlocked = TRUE;
+
+ if (!_dbus_connection_send_and_unlock (tree->connection, reply, NULL))
+ goto out;
+ }
+
+ result = DBUS_HANDLER_RESULT_HANDLED;
+
+ out:
+#ifdef DBUS_BUILD_TESTS
+ if (tree->connection)
+#endif
+ {
+ if (!already_unlocked)
+ {
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (tree->connection);
+ }
+ }
+
+ _dbus_string_free (&xml);
+ dbus_free_string_array (children);
+ if (reply)
+ dbus_message_unref (reply);
+
+ return result;
}
/**
* to the handler for /foo/bar before the one for /foo.
*
* @todo thread problems
- *
+ *
* @param tree the global object tree
* @param message the message to dispatch
* @returns whether message was handled successfully
*/
DBusHandlerResult
_dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree,
- DBusMessage *message)
+ DBusMessage *message,
+ dbus_bool_t *found_object)
{
- const char **path;
- int i;
+ char **path;
+ dbus_bool_t exact_match;
DBusList *list;
DBusList *link;
DBusHandlerResult result;
+ DBusObjectSubtree *subtree;
- path = NULL; /* dbus_message_get_object_path (message); */
+#if 0
+ _dbus_verbose ("Dispatch of message by object path\n");
+#endif
+
+ path = NULL;
+ if (!dbus_message_get_path_decomposed (message, &path))
+ {
+#ifdef DBUS_BUILD_TESTS
+ if (tree->connection)
+#endif
+ {
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (tree->connection);
+ }
+
+ _dbus_verbose ("No memory to get decomposed path\n");
- if (path == NULL)
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ return DBUS_HANDLER_RESULT_NEED_MEMORY;
+ }
+ if (path == NULL)
+ {
+#ifdef DBUS_BUILD_TESTS
+ if (tree->connection)
+#endif
+ {
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (tree->connection);
+ }
+
+ _dbus_verbose ("No path field in message\n");
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
/* Find the deepest path that covers the path in the message */
- if (!find_handler (tree, path, &i))
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ subtree = find_handler (tree, (const char**) path, &exact_match);
+
+ if (found_object)
+ *found_object = !!subtree;
/* Build a list of all paths that cover the path in the message */
-
+
list = NULL;
-
- do
+
+ while (subtree != NULL)
{
- DBusObjectSubtree *subtree;
+ if (subtree->message_function != NULL && (exact_match || subtree->invoke_as_fallback))
+ {
+ _dbus_object_subtree_ref (subtree);
+
+ /* run deepest paths first */
+ if (!_dbus_list_append (&list, subtree))
+ {
+ result = DBUS_HANDLER_RESULT_NEED_MEMORY;
+ _dbus_object_subtree_unref (subtree);
+ goto free_and_return;
+ }
+ }
- subtree = tree->subtrees[i];
+ exact_match = FALSE;
+ subtree = subtree->parent;
+ }
- _dbus_object_subtree_ref (subtree);
- _dbus_list_append (&list, subtree);
-
- --i;
-
- } while (i > 0 && path_contains ((const char**) tree->subtrees[i]->path,
- path));
+ _dbus_verbose ("%d handlers in the path tree for this message\n",
+ _dbus_list_get_length (&list));
/* Invoke each handler in the list */
-
+
result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
+
link = _dbus_list_get_first_link (&list);
while (link != NULL)
{
- DBusObjectSubtree *subtree = link->data;
DBusList *next = _dbus_list_get_next_link (&list, link);
-
- /* message_function is NULL if we're unregistered */
+ subtree = link->data;
+
+ /* message_function is NULL if we're unregistered
+ * due to reentrancy
+ */
if (subtree->message_function)
{
+ DBusObjectPathMessageFunction message_function;
+ void *user_data;
+
+ message_function = subtree->message_function;
+ user_data = subtree->user_data;
+
+#if 0
+ _dbus_verbose (" (invoking a handler)\n");
+#endif
+
#ifdef DBUS_BUILD_TESTS
if (tree->connection)
#endif
- _dbus_connection_unlock (tree->connection);
+ {
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (tree->connection);
+ }
/* FIXME you could unregister the subtree in another thread
* before we invoke the callback, and I can't figure out a
* good way to solve this.
*/
-
- result = (* subtree->message_function) (tree->connection,
- message, subtree->user_data);
-
- if (result == DBUS_HANDLER_RESULT_HANDLED)
- goto free_and_return;
+
+ result = (* message_function) (tree->connection,
+ message,
+ user_data);
#ifdef DBUS_BUILD_TESTS
if (tree->connection)
#endif
_dbus_connection_lock (tree->connection);
- }
-
+
+ if (result != DBUS_HANDLER_RESULT_NOT_YET_HANDLED)
+ goto free_and_return;
+ }
+
link = next;
}
+ free_and_return:
+
+ if (result == DBUS_HANDLER_RESULT_NOT_YET_HANDLED)
+ {
+ /* This hardcoded default handler does a minimal Introspect()
+ */
+ result = handle_default_introspect_and_unlock (tree, message,
+ (const char**) path);
+ }
+ else
+ {
#ifdef DBUS_BUILD_TESTS
- if (tree->connection)
+ if (tree->connection)
#endif
- _dbus_connection_unlock (tree->connection);
-
- free_and_return:
+ {
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (tree->connection);
+ }
+ }
+
while (list != NULL)
{
link = _dbus_list_get_first_link (&list);
_dbus_list_remove_link (&list, link);
}
+ dbus_free_string_array (path);
+
return result;
}
/**
- * Allocates a subtree object with a string array appended as one big
- * memory block, so result is freed with one dbus_free(). Returns
- * #NULL if memory allocation fails.
+ * Looks up the data passed to _dbus_object_tree_register() for a
+ * handler at the given path.
*
- * @param array array to duplicate.
+ * @param tree the global object tree
+ * @param path NULL-terminated array of path elements giving path to subtree
+ * @returns the object's user_data or #NULL if none found
+ */
+void*
+_dbus_object_tree_get_user_data_unlocked (DBusObjectTree *tree,
+ const char **path)
+{
+ dbus_bool_t exact_match;
+ DBusObjectSubtree *subtree;
+
+ _dbus_assert (tree != NULL);
+ _dbus_assert (path != NULL);
+
+ /* Find the deepest path that covers the path in the message */
+ subtree = find_handler (tree, (const char**) path, &exact_match);
+
+ if ((subtree == NULL) || !exact_match)
+ {
+ _dbus_verbose ("No object at specified path found\n");
+ return NULL;
+ }
+
+ return subtree->user_data;
+}
+
+/**
+ * Allocates a subtree object.
+ *
+ * @param name name to duplicate.
* @returns newly-allocated subtree
*/
static DBusObjectSubtree*
-allocate_subtree_object (const char **array)
+allocate_subtree_object (const char *name)
{
int len;
- int member_lens;
- int i;
- char *p;
- void *subtree;
- char **path_dest;
- const size_t front_padding = _DBUS_STRUCT_OFFSET (DBusObjectSubtree, path);
-
- if (array == NULL)
- return NULL;
+ DBusObjectSubtree *subtree;
+ const size_t front_padding = _DBUS_STRUCT_OFFSET (DBusObjectSubtree, name);
- member_lens = 0;
- for (len = 0; array[len] != NULL; ++len)
- member_lens += strlen (array[len]) + 1;
-
- subtree = dbus_malloc (front_padding +
- (len + 1) * sizeof (char*) +
- member_lens);
- if (subtree == NULL)
- return NULL;
+ _dbus_assert (name != NULL);
- path_dest = (char**) (((char*) subtree) + front_padding);
-
- path_dest[len] = NULL; /* NULL-terminate the array portion */
- p = ((char*) subtree) + (len + 1) * sizeof (char*) + front_padding;
-
- i = 0;
- while (i < len)
- {
- int this_len;
+ len = strlen (name);
- path_dest[i] = p;
-
- this_len = strlen (array[i]);
- memcpy (p, array[i], this_len + 1);
- p += this_len + 1;
+ subtree = dbus_malloc0 (MAX (front_padding + (len + 1), sizeof (DBusObjectSubtree)));
- ++i;
- }
+ if (subtree == NULL)
+ return NULL;
+
+ memcpy (subtree->name, name, len + 1);
return subtree;
}
static DBusObjectSubtree*
-_dbus_object_subtree_new (const char **path,
+_dbus_object_subtree_new (const char *name,
const DBusObjectPathVTable *vtable,
void *user_data)
{
DBusObjectSubtree *subtree;
- subtree = allocate_subtree_object (path);
+ subtree = allocate_subtree_object (name);
if (subtree == NULL)
goto oom;
- _dbus_assert (path != NULL);
- _dbus_assert (path[0] != NULL);
+ _dbus_assert (name != NULL);
+
+ subtree->parent = NULL;
+
+ if (vtable)
+ {
+ subtree->message_function = vtable->message_function;
+ subtree->unregister_function = vtable->unregister_function;
+ }
+ else
+ {
+ subtree->message_function = NULL;
+ subtree->unregister_function = NULL;
+ }
- subtree->message_function = vtable->message_function;
- subtree->unregister_function = vtable->unregister_function;
subtree->user_data = user_data;
- subtree->refcount.value = 1;
-
+ _dbus_atomic_inc (&subtree->refcount);
+ subtree->subtrees = NULL;
+ subtree->n_subtrees = 0;
+ subtree->max_subtrees = 0;
+ subtree->invoke_as_fallback = FALSE;
+
return subtree;
oom:
- if (subtree)
- {
- dbus_free (subtree);
- }
-
return NULL;
}
-static void
+static DBusObjectSubtree *
_dbus_object_subtree_ref (DBusObjectSubtree *subtree)
{
- _dbus_assert (subtree->refcount.value > 0);
+#ifdef DBUS_DISABLE_ASSERT
_dbus_atomic_inc (&subtree->refcount);
+#else
+ dbus_int32_t old_value;
+
+ old_value = _dbus_atomic_inc (&subtree->refcount);
+ _dbus_assert (old_value > 0);
+#endif
+
+ return subtree;
}
static void
_dbus_object_subtree_unref (DBusObjectSubtree *subtree)
{
- _dbus_assert (subtree->refcount.value > 0);
+ dbus_int32_t old_value;
- if (_dbus_atomic_dec (&subtree->refcount) == 1)
+ old_value = _dbus_atomic_dec (&subtree->refcount);
+ _dbus_assert (old_value > 0);
+
+ if (old_value == 1)
{
_dbus_assert (subtree->unregister_function == NULL);
_dbus_assert (subtree->message_function == NULL);
+
+ dbus_free (subtree->subtrees);
dbus_free (subtree);
}
}
-/** @} */
+/**
+ * Lists the registered fallback handlers and object path handlers at
+ * the given parent_path. The returned array should be freed with
+ * dbus_free_string_array().
+ *
+ * @param tree the object tree
+ * @param parent_path the path to list the child handlers of
+ * @param child_entries returns #NULL-terminated array of children
+ * @returns #FALSE if no memory to allocate the child entries
+ */
+dbus_bool_t
+_dbus_object_tree_list_registered_and_unlock (DBusObjectTree *tree,
+ const char **parent_path,
+ char ***child_entries)
+{
+ dbus_bool_t result;
+ result = _dbus_object_tree_list_registered_unlocked (tree,
+ parent_path,
+ child_entries);
+
#ifdef DBUS_BUILD_TESTS
-#include "dbus-test.h"
-#include <stdio.h>
+ if (tree->connection)
+#endif
+ {
+ _dbus_verbose ("unlock\n");
+ _dbus_connection_unlock (tree->connection);
+ }
+
+ return result;
+}
+
+
+/** Set to 1 to get a bunch of spew about disassembling the path string */
+#define VERBOSE_DECOMPOSE 0
+
+/**
+ * Decompose an object path. A path of just "/" is
+ * represented as an empty vector of strings.
+ * The path need not be nul terminated.
+ *
+ * @param data the path data
+ * @param len the length of the path string
+ * @param path address to store new object path
+ * @param path_len length of stored path
+ */
+dbus_bool_t
+_dbus_decompose_path (const char* data,
+ int len,
+ char ***path,
+ int *path_len)
+{
+ char **retval;
+ int n_components;
+ int i, j, comp;
+
+ _dbus_assert (data != NULL);
+ _dbus_assert (path != NULL);
+
+#if VERBOSE_DECOMPOSE
+ _dbus_verbose ("Decomposing path \"%s\"\n",
+ data);
+#endif
+
+ n_components = 0;
+ if (len > 1) /* if path is not just "/" */
+ {
+ i = 0;
+ while (i < len)
+ {
+ _dbus_assert (data[i] != '\0');
+ if (data[i] == '/')
+ n_components += 1;
+ ++i;
+ }
+ }
+
+ retval = dbus_new0 (char*, n_components + 1);
+
+ if (retval == NULL)
+ return FALSE;
+
+ comp = 0;
+ if (n_components == 0)
+ i = 1;
+ else
+ i = 0;
+ while (comp < n_components)
+ {
+ _dbus_assert (i < len);
+
+ if (data[i] == '/')
+ ++i;
+ j = i;
+
+ while (j < len && data[j] != '/')
+ ++j;
+
+ /* Now [i, j) is the path component */
+ _dbus_assert (i < j);
+ _dbus_assert (data[i] != '/');
+ _dbus_assert (j == len || data[j] == '/');
+
+#if VERBOSE_DECOMPOSE
+ _dbus_verbose (" (component in [%d,%d))\n",
+ i, j);
+#endif
+
+ retval[comp] = _dbus_memdup (&data[i], j - i + 1);
+ if (retval[comp] == NULL)
+ {
+ dbus_free_string_array (retval);
+ return FALSE;
+ }
+ retval[comp][j-i] = '\0';
+#if VERBOSE_DECOMPOSE
+ _dbus_verbose (" (component %d = \"%s\")\n",
+ comp, retval[comp]);
+#endif
+
+ ++comp;
+ i = j;
+ }
+ _dbus_assert (i == len);
+
+ *path = retval;
+ if (path_len)
+ *path_len = n_components;
+
+ return TRUE;
+}
+
+/** @} */
static char*
flatten_path (const char **path)
{
DBusString str;
- int i;
char *s;
-
+
if (!_dbus_string_init (&str))
return NULL;
- i = 0;
- while (path[i])
+ if (path[0] == NULL)
{
- if (!_dbus_string_append_byte (&str, '/'))
- goto nomem;
-
- if (!_dbus_string_append (&str, path[i]))
+ if (!_dbus_string_append_byte (&str, '/'))
goto nomem;
+ }
+ else
+ {
+ int i;
- ++i;
+ i = 0;
+ while (path[i])
+ {
+ if (!_dbus_string_append_byte (&str, '/'))
+ goto nomem;
+
+ if (!_dbus_string_append (&str, path[i]))
+ goto nomem;
+
+ ++i;
+ }
}
if (!_dbus_string_steal_data (&str, &s))
goto nomem;
_dbus_string_free (&str);
-
+
return s;
-
+
nomem:
_dbus_string_free (&str);
return NULL;
}
-static void
-spew_tree (DBusObjectTree *tree)
-{
- int i;
-
- printf ("Tree of %d subpaths\n",
- tree->n_subtrees);
-
- i = 0;
- while (i < tree->n_subtrees)
- {
- char *s;
- s = flatten_path ((const char **) tree->subtrees[i]->path);
+#ifdef DBUS_BUILD_TESTS
- printf (" %d path = %s\n", i, s);
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
- dbus_free (s);
-
- ++i;
- }
-}
+#include "dbus-test.h"
+#include <stdio.h>
-static dbus_bool_t
-test_subtree_cmp (const char **path1,
- const char **path2,
- int expected,
- dbus_bool_t reverse)
+typedef enum
{
- DBusObjectSubtree *subtree1;
- DBusObjectSubtree *subtree2;
- dbus_bool_t retval;
- DBusObjectPathVTable vtable;
+ STR_EQUAL,
+ STR_PREFIX,
+ STR_DIFFERENT
+} StrComparison;
- _DBUS_ZERO (vtable);
+/* Returns TRUE if container is a parent of child
+ */
+static StrComparison
+path_contains (const char **container,
+ const char **child)
+{
+ int i;
- retval = FALSE;
-
- subtree1 = _dbus_object_subtree_new (path1, &vtable, NULL);
- subtree2 = _dbus_object_subtree_new (path2, &vtable, NULL);
- if (subtree1 == NULL || subtree2 == NULL)
- goto out;
+ i = 0;
+ while (child[i] != NULL)
+ {
+ int v;
- _dbus_assert (subtree_cmp (subtree1, subtree2) == expected);
+ if (container[i] == NULL)
+ return STR_PREFIX; /* container ran out, child continues;
+ * thus the container is a parent of the
+ * child.
+ */
- retval = TRUE;
-
- out:
+ _dbus_assert (container[i] != NULL);
+ _dbus_assert (child[i] != NULL);
- if (subtree1)
- _dbus_object_subtree_unref (subtree1);
+ v = strcmp (container[i], child[i]);
- if (subtree2)
- _dbus_object_subtree_unref (subtree2);
+ if (v != 0)
+ return STR_DIFFERENT; /* they overlap until here and then are different,
+ * not overlapping
+ */
- if (retval && reverse)
- {
- /* Verify that the reverse also holds */
- if (expected > 0)
- return test_subtree_cmp (path2, path1, -1, FALSE);
- else if (expected < 0)
- return test_subtree_cmp (path2, path1, 1, FALSE);
- else
- return test_subtree_cmp (path2, path1, 0, FALSE);
+ ++i;
}
-
- return retval;
+
+ /* Child ran out; if container also did, they are equal;
+ * otherwise, the child is a parent of the container.
+ */
+ if (container[i] == NULL)
+ return STR_EQUAL;
+ else
+ return STR_DIFFERENT;
}
+#if 0
static void
-test_path_contains (const char **path1,
- const char **path2,
- dbus_bool_t expected)
+spew_subtree_recurse (DBusObjectSubtree *subtree,
+ int indent)
{
- if (!path_contains (path1, path2) == expected)
- {
- char *s1, *s2;
- s1 = flatten_path (path1);
- s2 = flatten_path (path2);
-
- _dbus_warn ("Expected that path %s %s %s\n",
- s1, expected ? "contains" : "doesn't contain", s2);
-
- dbus_free (s1);
- dbus_free (s2);
-
- exit (1);
- }
-
- if (path_cmp (path1, path2) == 0)
+ int i;
+
+ i = 0;
+ while (i < indent)
{
- if (!path_contains (path2, path1))
- {
- char *s1, *s2;
- s1 = flatten_path (path1);
- s2 = flatten_path (path2);
-
- _dbus_warn ("Expected that path %s contains %s since the paths are equal\n",
- s1, s2);
-
- dbus_free (s1);
- dbus_free (s2);
-
- exit (1);
- }
+ _dbus_verbose (" ");
+ ++i;
}
- /* If path1 contains path2, then path2 can't contain path1 */
- else if (expected && path_contains (path2, path1))
- {
- char *s1, *s2;
- s1 = flatten_path (path1);
- s2 = flatten_path (path2);
-
- _dbus_warn ("Expected that path %s doesn't contain %s\n",
- s1, s2);
+ _dbus_verbose ("%s (%d children)\n",
+ subtree->name, subtree->n_subtrees);
- dbus_free (s1);
- dbus_free (s2);
-
- exit (1);
+ i = 0;
+ while (i < subtree->n_subtrees)
+ {
+ spew_subtree_recurse (subtree->subtrees[i], indent + 2);
+
+ ++i;
}
}
static void
-test_path_copy (const char **path)
+spew_tree (DBusObjectTree *tree)
{
- DBusObjectSubtree *subtree;
-
- subtree = allocate_subtree_object (path);
- if (subtree == NULL)
- return;
-
- _dbus_assert (path_cmp (path, (const char**) subtree->path) == 0);
-
- dbus_free (subtree);
+ spew_subtree_recurse (tree->root, 0);
}
+#endif
+/**
+ * Callback data used in tests
+ */
typedef struct
{
- dbus_bool_t message_handled;
- dbus_bool_t handler_unregistered;
-
+ const char **path; /**< Path */
+ dbus_bool_t handler_fallback; /**< true if the handler may be called as fallback */
+ dbus_bool_t message_handled; /**< Gets set to true if message handler called */
+ dbus_bool_t handler_unregistered; /**< gets set to true if handler is unregistered */
} TreeTestData;
static void
test_unregister_function (DBusConnection *connection,
- const char **path,
void *user_data)
{
TreeTestData *ttd = user_data;
TreeTestData *ttd = user_data;
ttd->message_handled = TRUE;
-
+
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
static dbus_bool_t
do_register (DBusObjectTree *tree,
const char **path,
+ dbus_bool_t fallback,
int i,
TreeTestData *tree_test_data)
{
tree_test_data[i].message_handled = FALSE;
tree_test_data[i].handler_unregistered = FALSE;
-
- if (!_dbus_object_tree_register (tree, path,
+ tree_test_data[i].handler_fallback = fallback;
+ tree_test_data[i].path = path;
+
+ if (!_dbus_object_tree_register (tree, fallback, path,
&vtable,
- &tree_test_data[i]))
+ &tree_test_data[i],
+ NULL))
return FALSE;
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path) ==
+ &tree_test_data[i]);
+
+ return TRUE;
+}
+
+static dbus_bool_t
+do_test_dispatch (DBusObjectTree *tree,
+ const char **path,
+ int i,
+ TreeTestData *tree_test_data,
+ int n_test_data)
+{
+ DBusMessage *message;
+ int j;
+ DBusHandlerResult result;
+ char *flat;
+
+ message = NULL;
+
+ flat = flatten_path (path);
+ if (flat == NULL)
+ goto oom;
+
+ message = dbus_message_new_method_call (NULL,
+ flat,
+ "org.freedesktop.TestInterface",
+ "Foo");
+ dbus_free (flat);
+ if (message == NULL)
+ goto oom;
+
+ j = 0;
+ while (j < n_test_data)
+ {
+ tree_test_data[j].message_handled = FALSE;
+ ++j;
+ }
+
+ result = _dbus_object_tree_dispatch_and_unlock (tree, message, NULL);
+ if (result == DBUS_HANDLER_RESULT_NEED_MEMORY)
+ goto oom;
+
+ _dbus_assert (tree_test_data[i].message_handled);
+
+ j = 0;
+ while (j < n_test_data)
+ {
+ if (tree_test_data[j].message_handled)
+ {
+ if (tree_test_data[j].handler_fallback)
+ _dbus_assert (path_contains (tree_test_data[j].path,
+ path) != STR_DIFFERENT);
+ else
+ _dbus_assert (path_contains (tree_test_data[j].path, path) == STR_EQUAL);
+ }
+ else
+ {
+ if (tree_test_data[j].handler_fallback)
+ _dbus_assert (path_contains (tree_test_data[j].path,
+ path) == STR_DIFFERENT);
+ else
+ _dbus_assert (path_contains (tree_test_data[j].path, path) != STR_EQUAL);
+ }
+
+ ++j;
+ }
+
+ dbus_message_unref (message);
+
+ return TRUE;
+
+ oom:
+ if (message)
+ dbus_message_unref (message);
+ return FALSE;
+}
+
+static size_t
+string_array_length (const char **array)
+{
+ size_t i;
+ for (i = 0; array[i]; i++) ;
+ return i;
+}
+
+typedef struct
+{
+ const char *path;
+ const char *result[20];
+} DecomposePathTest;
+
+static DecomposePathTest decompose_tests[] = {
+ { "/foo", { "foo", NULL } },
+ { "/foo/bar", { "foo", "bar", NULL } },
+ { "/", { NULL } },
+ { "/a/b", { "a", "b", NULL } },
+ { "/a/b/c", { "a", "b", "c", NULL } },
+ { "/a/b/c/d", { "a", "b", "c", "d", NULL } },
+ { "/foo/bar/q", { "foo", "bar", "q", NULL } },
+ { "/foo/bar/this/is/longer", { "foo", "bar", "this", "is", "longer", NULL } }
+};
+
+static dbus_bool_t
+run_decompose_tests (void)
+{
+ int i;
+
+ i = 0;
+ while (i < _DBUS_N_ELEMENTS (decompose_tests))
+ {
+ char **result;
+ int result_len;
+ int expected_len;
+
+ if (!_dbus_decompose_path (decompose_tests[i].path,
+ strlen (decompose_tests[i].path),
+ &result, &result_len))
+ return FALSE;
+
+ expected_len = string_array_length (decompose_tests[i].result);
+
+ if (result_len != (int) string_array_length ((const char**)result) ||
+ expected_len != result_len ||
+ path_contains (decompose_tests[i].result,
+ (const char**) result) != STR_EQUAL)
+ {
+ int real_len = string_array_length ((const char**)result);
+ _dbus_warn ("Expected decompose of %s to have len %d, returned %d, appears to have %d\n",
+ decompose_tests[i].path, expected_len, result_len,
+ real_len);
+ _dbus_warn ("Decompose resulted in elements: { ");
+ i = 0;
+ while (i < real_len)
+ {
+ _dbus_warn ("\"%s\"%s", result[i],
+ (i + 1) == real_len ? "" : ", ");
+ ++i;
+ }
+ _dbus_warn ("}\n");
+ _dbus_assert_not_reached ("path decompose failed\n");
+ }
+
+ dbus_free_string_array (result);
+
+ ++i;
+ }
+
return TRUE;
}
static dbus_bool_t
object_tree_test_iteration (void *data)
{
+ const char *path0[] = { NULL };
const char *path1[] = { "foo", NULL };
const char *path2[] = { "foo", "bar", NULL };
const char *path3[] = { "foo", "bar", "baz", NULL };
const char *path4[] = { "foo", "bar", "boo", NULL };
const char *path5[] = { "blah", NULL };
const char *path6[] = { "blah", "boof", NULL };
+ const char *path7[] = { "blah", "boof", "this", "is", "really", "long", NULL };
+ const char *path8[] = { "childless", NULL };
DBusObjectTree *tree;
- TreeTestData tree_test_data[6];
+ TreeTestData tree_test_data[9];
int i;
-
- test_path_copy (path1);
- test_path_copy (path2);
- test_path_copy (path3);
- test_path_copy (path4);
- test_path_copy (path5);
- test_path_copy (path6);
+ dbus_bool_t exact_match;
+
+ if (!run_decompose_tests ())
+ return FALSE;
tree = NULL;
- test_path_contains (path1, path1, TRUE);
- test_path_contains (path1, path2, TRUE);
- test_path_contains (path1, path3, TRUE);
- test_path_contains (path1, path4, TRUE);
- test_path_contains (path1, path5, FALSE);
- test_path_contains (path1, path6, FALSE);
-
- test_path_contains (path2, path1, FALSE);
- test_path_contains (path2, path2, TRUE);
- test_path_contains (path2, path3, TRUE);
- test_path_contains (path2, path4, TRUE);
- test_path_contains (path2, path5, FALSE);
- test_path_contains (path2, path6, FALSE);
-
- test_path_contains (path3, path1, FALSE);
- test_path_contains (path3, path2, FALSE);
- test_path_contains (path3, path3, TRUE);
- test_path_contains (path3, path4, FALSE);
- test_path_contains (path3, path5, FALSE);
- test_path_contains (path3, path6, FALSE);
-
- test_path_contains (path4, path1, FALSE);
- test_path_contains (path4, path2, FALSE);
- test_path_contains (path4, path3, FALSE);
- test_path_contains (path4, path4, TRUE);
- test_path_contains (path4, path5, FALSE);
- test_path_contains (path4, path6, FALSE);
-
- test_path_contains (path5, path1, FALSE);
- test_path_contains (path5, path2, FALSE);
- test_path_contains (path5, path3, FALSE);
- test_path_contains (path5, path4, FALSE);
- test_path_contains (path5, path5, TRUE);
- test_path_contains (path5, path6, TRUE);
-
- test_path_contains (path6, path1, FALSE);
- test_path_contains (path6, path2, FALSE);
- test_path_contains (path6, path3, FALSE);
- test_path_contains (path6, path4, FALSE);
- test_path_contains (path6, path5, FALSE);
- test_path_contains (path6, path6, TRUE);
-
- if (!test_subtree_cmp (path1, path1, 0, TRUE))
- goto out;
- if (!test_subtree_cmp (path3, path3, 0, TRUE))
- goto out;
- /* When testing -1, the reverse also gets tested */
- if (!test_subtree_cmp (path1, path2, -1, TRUE))
- goto out;
- if (!test_subtree_cmp (path1, path3, -1, TRUE))
- goto out;
- if (!test_subtree_cmp (path2, path3, -1, TRUE))
- goto out;
- if (!test_subtree_cmp (path2, path4, -1, TRUE))
- goto out;
- if (!test_subtree_cmp (path3, path4, -1, TRUE))
- goto out;
- if (!test_subtree_cmp (path5, path1, -1, TRUE))
- goto out;
-
tree = _dbus_object_tree_new (NULL);
if (tree == NULL)
goto out;
-
- if (!do_register (tree, path1, 0, tree_test_data))
+
+ if (!do_register (tree, path0, TRUE, 0, tree_test_data))
goto out;
+
+ _dbus_assert (find_subtree (tree, path0, NULL));
+ _dbus_assert (!find_subtree (tree, path1, NULL));
+ _dbus_assert (!find_subtree (tree, path2, NULL));
+ _dbus_assert (!find_subtree (tree, path3, NULL));
+ _dbus_assert (!find_subtree (tree, path4, NULL));
+ _dbus_assert (!find_subtree (tree, path5, NULL));
+ _dbus_assert (!find_subtree (tree, path6, NULL));
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
+
+ _dbus_assert (find_handler (tree, path0, &exact_match) && exact_match);
+ _dbus_assert (find_handler (tree, path1, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path2, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path3, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path4, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path5, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path6, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path7, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path8, &exact_match) == tree->root && !exact_match);
+ if (!do_register (tree, path1, TRUE, 1, tree_test_data))
+ goto out;
+
+ _dbus_assert (find_subtree (tree, path0, NULL));
_dbus_assert (find_subtree (tree, path1, NULL));
_dbus_assert (!find_subtree (tree, path2, NULL));
_dbus_assert (!find_subtree (tree, path3, NULL));
_dbus_assert (!find_subtree (tree, path4, NULL));
_dbus_assert (!find_subtree (tree, path5, NULL));
_dbus_assert (!find_subtree (tree, path6, NULL));
-
- if (!do_register (tree, path2, 1, tree_test_data))
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
+
+ _dbus_assert (find_handler (tree, path0, &exact_match) && exact_match);
+ _dbus_assert (find_handler (tree, path1, &exact_match) && exact_match);
+ _dbus_assert (find_handler (tree, path2, &exact_match) && !exact_match);
+ _dbus_assert (find_handler (tree, path3, &exact_match) && !exact_match);
+ _dbus_assert (find_handler (tree, path4, &exact_match) && !exact_match);
+ _dbus_assert (find_handler (tree, path5, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path6, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path7, &exact_match) == tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path8, &exact_match) == tree->root && !exact_match);
+
+ if (!do_register (tree, path2, TRUE, 2, tree_test_data))
goto out;
-
- _dbus_assert (find_subtree (tree, path1, NULL));
+
+ _dbus_assert (find_subtree (tree, path1, NULL));
_dbus_assert (find_subtree (tree, path2, NULL));
_dbus_assert (!find_subtree (tree, path3, NULL));
_dbus_assert (!find_subtree (tree, path4, NULL));
_dbus_assert (!find_subtree (tree, path5, NULL));
_dbus_assert (!find_subtree (tree, path6, NULL));
-
- if (!do_register (tree, path3, 2, tree_test_data))
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
+
+ if (!do_register (tree, path3, TRUE, 3, tree_test_data))
goto out;
+ _dbus_assert (find_subtree (tree, path0, NULL));
_dbus_assert (find_subtree (tree, path1, NULL));
_dbus_assert (find_subtree (tree, path2, NULL));
_dbus_assert (find_subtree (tree, path3, NULL));
_dbus_assert (!find_subtree (tree, path4, NULL));
_dbus_assert (!find_subtree (tree, path5, NULL));
_dbus_assert (!find_subtree (tree, path6, NULL));
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
- if (!do_register (tree, path4, 3, tree_test_data))
+ if (!do_register (tree, path4, TRUE, 4, tree_test_data))
goto out;
-
+ _dbus_assert (find_subtree (tree, path0, NULL));
_dbus_assert (find_subtree (tree, path1, NULL));
_dbus_assert (find_subtree (tree, path2, NULL));
- _dbus_assert (find_subtree (tree, path3, NULL));
+ _dbus_assert (find_subtree (tree, path3, NULL));
_dbus_assert (find_subtree (tree, path4, NULL));
_dbus_assert (!find_subtree (tree, path5, NULL));
_dbus_assert (!find_subtree (tree, path6, NULL));
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
- if (!do_register (tree, path5, 4, tree_test_data))
+ if (!do_register (tree, path5, TRUE, 5, tree_test_data))
goto out;
+ _dbus_assert (find_subtree (tree, path0, NULL));
_dbus_assert (find_subtree (tree, path1, NULL));
_dbus_assert (find_subtree (tree, path2, NULL));
_dbus_assert (find_subtree (tree, path3, NULL));
_dbus_assert (find_subtree (tree, path4, NULL));
_dbus_assert (find_subtree (tree, path5, NULL));
_dbus_assert (!find_subtree (tree, path6, NULL));
-
- if (!do_register (tree, path6, 5, tree_test_data))
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
+
+ _dbus_assert (find_handler (tree, path0, &exact_match) == tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path1, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path2, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path3, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path4, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path5, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path6, &exact_match) != tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path7, &exact_match) != tree->root && !exact_match);
+ _dbus_assert (find_handler (tree, path8, &exact_match) == tree->root && !exact_match);
+
+ if (!do_register (tree, path6, TRUE, 6, tree_test_data))
+ goto out;
+
+ _dbus_assert (find_subtree (tree, path0, NULL));
+ _dbus_assert (find_subtree (tree, path1, NULL));
+ _dbus_assert (find_subtree (tree, path2, NULL));
+ _dbus_assert (find_subtree (tree, path3, NULL));
+ _dbus_assert (find_subtree (tree, path4, NULL));
+ _dbus_assert (find_subtree (tree, path5, NULL));
+ _dbus_assert (find_subtree (tree, path6, NULL));
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
+
+ if (!do_register (tree, path7, TRUE, 7, tree_test_data))
+ goto out;
+
+ _dbus_assert (find_subtree (tree, path0, NULL));
+ _dbus_assert (find_subtree (tree, path1, NULL));
+ _dbus_assert (find_subtree (tree, path2, NULL));
+ _dbus_assert (find_subtree (tree, path3, NULL));
+ _dbus_assert (find_subtree (tree, path4, NULL));
+ _dbus_assert (find_subtree (tree, path5, NULL));
+ _dbus_assert (find_subtree (tree, path6, NULL));
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
+
+ if (!do_register (tree, path8, TRUE, 8, tree_test_data))
goto out;
+ _dbus_assert (find_subtree (tree, path0, NULL));
_dbus_assert (find_subtree (tree, path1, NULL));
_dbus_assert (find_subtree (tree, path2, NULL));
_dbus_assert (find_subtree (tree, path3, NULL));
_dbus_assert (find_subtree (tree, path4, NULL));
_dbus_assert (find_subtree (tree, path5, NULL));
_dbus_assert (find_subtree (tree, path6, NULL));
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
+
+ _dbus_assert (find_handler (tree, path0, &exact_match) == tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path1, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path2, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path3, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path4, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path5, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path6, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path7, &exact_match) != tree->root && exact_match);
+ _dbus_assert (find_handler (tree, path8, &exact_match) != tree->root && exact_match);
+
+ /* test the list_registered function */
+
+ {
+ const char *root[] = { NULL };
+ char **child_entries;
+ int nb;
+
+ _dbus_object_tree_list_registered_unlocked (tree, path1, &child_entries);
+ if (child_entries != NULL)
+ {
+ nb = string_array_length ((const char**)child_entries);
+ _dbus_assert (nb == 1);
+ dbus_free_string_array (child_entries);
+ }
+
+ _dbus_object_tree_list_registered_unlocked (tree, path2, &child_entries);
+ if (child_entries != NULL)
+ {
+ nb = string_array_length ((const char**)child_entries);
+ _dbus_assert (nb == 2);
+ dbus_free_string_array (child_entries);
+ }
+
+ _dbus_object_tree_list_registered_unlocked (tree, path8, &child_entries);
+ if (child_entries != NULL)
+ {
+ nb = string_array_length ((const char**)child_entries);
+ _dbus_assert (nb == 0);
+ dbus_free_string_array (child_entries);
+ }
+
+ _dbus_object_tree_list_registered_unlocked (tree, root, &child_entries);
+ if (child_entries != NULL)
+ {
+ nb = string_array_length ((const char**)child_entries);
+ _dbus_assert (nb == 3);
+ dbus_free_string_array (child_entries);
+ }
+ }
/* Check that destroying tree calls unregister funcs */
_dbus_object_tree_unref (tree);
tree = _dbus_object_tree_new (NULL);
if (tree == NULL)
goto out;
-
- if (!do_register (tree, path1, 0, tree_test_data))
+
+ if (!do_register (tree, path0, TRUE, 0, tree_test_data))
+ goto out;
+ if (!do_register (tree, path1, TRUE, 1, tree_test_data))
+ goto out;
+ if (!do_register (tree, path2, TRUE, 2, tree_test_data))
goto out;
- if (!do_register (tree, path2, 1, tree_test_data))
+ if (!do_register (tree, path3, TRUE, 3, tree_test_data))
goto out;
- if (!do_register (tree, path3, 2, tree_test_data))
+ if (!do_register (tree, path4, TRUE, 4, tree_test_data))
goto out;
- if (!do_register (tree, path4, 3, tree_test_data))
+ if (!do_register (tree, path5, TRUE, 5, tree_test_data))
goto out;
- if (!do_register (tree, path5, 4, tree_test_data))
+ if (!do_register (tree, path6, TRUE, 6, tree_test_data))
goto out;
- if (!do_register (tree, path6, 5, tree_test_data))
+ if (!do_register (tree, path7, TRUE, 7, tree_test_data))
goto out;
+ if (!do_register (tree, path8, TRUE, 8, tree_test_data))
+ goto out;
+
+ _dbus_object_tree_unregister_and_unlock (tree, path0);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path0) == NULL);
+ _dbus_assert (!find_subtree (tree, path0, NULL));
+ _dbus_assert (find_subtree (tree, path1, NULL));
+ _dbus_assert (find_subtree (tree, path2, NULL));
+ _dbus_assert (find_subtree (tree, path3, NULL));
+ _dbus_assert (find_subtree (tree, path4, NULL));
+ _dbus_assert (find_subtree (tree, path5, NULL));
+ _dbus_assert (find_subtree (tree, path6, NULL));
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
+
_dbus_object_tree_unregister_and_unlock (tree, path1);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path1) == NULL);
+ _dbus_assert (!find_subtree (tree, path0, NULL));
_dbus_assert (!find_subtree (tree, path1, NULL));
_dbus_assert (find_subtree (tree, path2, NULL));
_dbus_assert (find_subtree (tree, path3, NULL));
_dbus_assert (find_subtree (tree, path4, NULL));
_dbus_assert (find_subtree (tree, path5, NULL));
_dbus_assert (find_subtree (tree, path6, NULL));
-
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
+
_dbus_object_tree_unregister_and_unlock (tree, path2);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path2) == NULL);
+ _dbus_assert (!find_subtree (tree, path0, NULL));
_dbus_assert (!find_subtree (tree, path1, NULL));
_dbus_assert (!find_subtree (tree, path2, NULL));
_dbus_assert (find_subtree (tree, path3, NULL));
_dbus_assert (find_subtree (tree, path4, NULL));
_dbus_assert (find_subtree (tree, path5, NULL));
_dbus_assert (find_subtree (tree, path6, NULL));
-
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
+
_dbus_object_tree_unregister_and_unlock (tree, path3);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path3) == NULL);
+ _dbus_assert (!find_subtree (tree, path0, NULL));
_dbus_assert (!find_subtree (tree, path1, NULL));
_dbus_assert (!find_subtree (tree, path2, NULL));
_dbus_assert (!find_subtree (tree, path3, NULL));
_dbus_assert (find_subtree (tree, path4, NULL));
_dbus_assert (find_subtree (tree, path5, NULL));
_dbus_assert (find_subtree (tree, path6, NULL));
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
_dbus_object_tree_unregister_and_unlock (tree, path4);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path4) == NULL);
+ _dbus_assert (!find_subtree (tree, path0, NULL));
_dbus_assert (!find_subtree (tree, path1, NULL));
_dbus_assert (!find_subtree (tree, path2, NULL));
_dbus_assert (!find_subtree (tree, path3, NULL));
_dbus_assert (!find_subtree (tree, path4, NULL));
_dbus_assert (find_subtree (tree, path5, NULL));
_dbus_assert (find_subtree (tree, path6, NULL));
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
_dbus_object_tree_unregister_and_unlock (tree, path5);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path5) == NULL);
+ _dbus_assert (!find_subtree (tree, path0, NULL));
_dbus_assert (!find_subtree (tree, path1, NULL));
_dbus_assert (!find_subtree (tree, path2, NULL));
_dbus_assert (!find_subtree (tree, path3, NULL));
_dbus_assert (!find_subtree (tree, path4, NULL));
_dbus_assert (!find_subtree (tree, path5, NULL));
_dbus_assert (find_subtree (tree, path6, NULL));
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
_dbus_object_tree_unregister_and_unlock (tree, path6);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path6) == NULL);
+
+ _dbus_assert (!find_subtree (tree, path0, NULL));
+ _dbus_assert (!find_subtree (tree, path1, NULL));
+ _dbus_assert (!find_subtree (tree, path2, NULL));
+ _dbus_assert (!find_subtree (tree, path3, NULL));
+ _dbus_assert (!find_subtree (tree, path4, NULL));
+ _dbus_assert (!find_subtree (tree, path5, NULL));
+ _dbus_assert (!find_subtree (tree, path6, NULL));
+ _dbus_assert (find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
+ _dbus_object_tree_unregister_and_unlock (tree, path7);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path7) == NULL);
+
+ _dbus_assert (!find_subtree (tree, path0, NULL));
+ _dbus_assert (!find_subtree (tree, path1, NULL));
+ _dbus_assert (!find_subtree (tree, path2, NULL));
+ _dbus_assert (!find_subtree (tree, path3, NULL));
+ _dbus_assert (!find_subtree (tree, path4, NULL));
+ _dbus_assert (!find_subtree (tree, path5, NULL));
+ _dbus_assert (!find_subtree (tree, path6, NULL));
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (find_subtree (tree, path8, NULL));
+
+ _dbus_object_tree_unregister_and_unlock (tree, path8);
+ _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path8) == NULL);
+
+ _dbus_assert (!find_subtree (tree, path0, NULL));
_dbus_assert (!find_subtree (tree, path1, NULL));
_dbus_assert (!find_subtree (tree, path2, NULL));
_dbus_assert (!find_subtree (tree, path3, NULL));
_dbus_assert (!find_subtree (tree, path4, NULL));
_dbus_assert (!find_subtree (tree, path5, NULL));
_dbus_assert (!find_subtree (tree, path6, NULL));
+ _dbus_assert (!find_subtree (tree, path7, NULL));
+ _dbus_assert (!find_subtree (tree, path8, NULL));
i = 0;
while (i < (int) _DBUS_N_ELEMENTS (tree_test_data))
/* Register it all again, and test dispatch */
- if (!do_register (tree, path1, 0, tree_test_data))
+ if (!do_register (tree, path0, TRUE, 0, tree_test_data))
goto out;
- if (!do_register (tree, path2, 1, tree_test_data))
+ if (!do_register (tree, path1, FALSE, 1, tree_test_data))
goto out;
- if (!do_register (tree, path3, 2, tree_test_data))
+ if (!do_register (tree, path2, TRUE, 2, tree_test_data))
goto out;
- if (!do_register (tree, path4, 3, tree_test_data))
+ if (!do_register (tree, path3, TRUE, 3, tree_test_data))
goto out;
- if (!do_register (tree, path5, 4, tree_test_data))
+ if (!do_register (tree, path4, TRUE, 4, tree_test_data))
goto out;
- if (!do_register (tree, path6, 5, tree_test_data))
+ if (!do_register (tree, path5, TRUE, 5, tree_test_data))
+ goto out;
+ if (!do_register (tree, path6, FALSE, 6, tree_test_data))
+ goto out;
+ if (!do_register (tree, path7, TRUE, 7, tree_test_data))
+ goto out;
+ if (!do_register (tree, path8, TRUE, 8, tree_test_data))
+ goto out;
+
+#if 0
+ spew_tree (tree);
+#endif
+
+ if (!do_test_dispatch (tree, path0, 0, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
+ goto out;
+ if (!do_test_dispatch (tree, path1, 1, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
+ goto out;
+ if (!do_test_dispatch (tree, path2, 2, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
+ goto out;
+ if (!do_test_dispatch (tree, path3, 3, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
+ goto out;
+ if (!do_test_dispatch (tree, path4, 4, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
+ goto out;
+ if (!do_test_dispatch (tree, path5, 5, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
+ goto out;
+ if (!do_test_dispatch (tree, path6, 6, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
+ goto out;
+ if (!do_test_dispatch (tree, path7, 7, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
+ goto out;
+ if (!do_test_dispatch (tree, path8, 8, tree_test_data, _DBUS_N_ELEMENTS (tree_test_data)))
goto out;
-
- /* FIXME (once messages have an object path field) */
out:
if (tree)
- _dbus_object_tree_unref (tree);
-
+ {
+ /* test ref */
+ _dbus_object_tree_ref (tree);
+ _dbus_object_tree_unref (tree);
+ _dbus_object_tree_unref (tree);
+ }
+
return TRUE;
}
_dbus_test_oom_handling ("object tree",
object_tree_test_iteration,
NULL);
-
+
return TRUE;
}
+#endif /* !DOXYGEN_SHOULD_SKIP_THIS */
+
#endif /* DBUS_BUILD_TESTS */
projects / platform / upstream / dbus.git / blobdiff