/*
- * Copyright (C) 2009-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
bnd->child->parent = btrn;
goto out;
}
- PARA_EMERG_LOG("inserting internal nodes not yet supported.\n");
- exit(EXIT_FAILURE);
- assert(bnd->child->parent == bnd->parent);
+ list_add_tail(&btrn->node, &bnd->parent->children);
+ list_move(&bnd->child->node, &btrn->children);
+ bnd->child->parent = btrn;
+ PARA_INFO_LOG("added %s as internal node\n", bnd->name);
out:
return btrn;
}
{
struct btr_buffer *btrb;
- assert(size != 0);
+ if (size == 0)
+ return;
if (list_empty(&btrn->children)) {
free(buf);
return;
{
struct btr_buffer *btrb;
- assert(size != 0);
+ if (size == 0)
+ return;
if (list_empty(&btrn->children))
return;
btrb = new_btrb((char *)buf, size);
char *buf;
size_t avail;
- assert(size != 0);
+ if (size == 0)
+ return;
if (list_empty(&btrn->children))
return;
avail = btr_pool_get_buffer(btrp, &buf);
*
* \param btrn The node whose input queue is to be queried.
* \param omit Number of bytes to be omitted.
- * \param bufp Result pointer.
+ * \param bufp Result pointer. It is OK to pass \p NULL here.
*
* If a buffer tree node needs more input data but can not consume the data it
* already has (because it might be needed again later) this function can be
}
/**
- * Execute a inter-node command on a parent node.
+ * Execute an inter-node command on the given node or on a parent node.
*
* \param btrn The node to start looking.
* \param command The command to execute.
* \param value_result Additional arguments and result value.
*
- * This function traverses the buffer tree upwards and looks for parent nodes
- * of \a btrn that understands \a command. On the first such node the command
- * is executed, and the result is stored in \a value_result.
+ * This function traverses the buffer tree from \a btrn upwards and looks for
+ * the first node that understands \a command. On this node \a command is
+ * executed, and the result is stored in \a value_result.
*
* \return \p -ENOTSUP if no parent node of \a btrn understands \a command.
* Otherwise the return value of the command handler is returned.
+ *
+ * \sa \ref receiver::execute, filter::execute, writer::execute.
*/
int btr_exec_up(struct btr_node *btrn, const char *command, char **value_result)
{
int ret;
for (; btrn; btrn = btrn->parent) {
- struct btr_node *parent = btrn->parent;
- if (!parent)
- return -ERRNO_TO_PARA_ERROR(ENOTSUP);
- if (!parent->execute)
+ if (!btrn->execute)
continue;
- PARA_INFO_LOG("parent: %s, cmd: %s\n", parent->name, command);
- ret = parent->execute(parent, command, value_result);
+ PARA_INFO_LOG("executing %s on %s\n", command, btrn->name);
+ ret = btrn->execute(btrn, command, value_result);
if (ret == -ERRNO_TO_PARA_ERROR(ENOTSUP))
continue;
if (ret < 0)
return ret;
if (value_result && *value_result)
- PARA_INFO_LOG("%s(%s): %s\n", command, parent->name,
+ PARA_INFO_LOG("%s(%s): %s\n", command, btrn->name,
*value_result);
return 1;
}
{
*tv = btrn->start;
}
+
+struct btr_node *btr_parent(struct btr_node *btrn)
+{
+ return btrn->parent;
+}