projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: Include git version in output of com_si().
[paraslash.git]
/
buffer_tree.c
diff --git
a/buffer_tree.c
b/buffer_tree.c
index 1b859f520ebf4aa16d0a13df897395d97da423d9..0e460dd30247a70d418d191b1568de41240a93b8 100644
(file)
--- a/
buffer_tree.c
+++ b/
buffer_tree.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2009-201
0
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-201
1
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-603,7
+603,7
@@
size_t btr_next_buffer(struct btr_node *btrn, char **bufp)
*
* This function must be used to get rid of existing buffer references in the
* node's input queue. If no references to a buffer remain, the underlying
*
* This function must be used to get rid of existing buffer references in the
* node's input queue. If no references to a buffer remain, the underlying
- * buffers are either freed (in the non-buffer
tree
case) or the read head of
+ * buffers are either freed (in the non-buffer
pool
case) or the read head of
* the buffer pool is being advanced.
*
* Note that \a numbytes may be smaller than the buffer size. In this case the
* the buffer pool is being advanced.
*
* Note that \a numbytes may be smaller than the buffer size. In this case the
@@
-634,7
+634,7
@@
void btr_consume(struct btr_node *btrn, size_t numbytes)
numbytes -= br->btrb->size - br->consumed;
btr_drop_buffer_reference(br);
}
numbytes -= br->btrb->size - br->consumed;
btr_drop_buffer_reference(br);
}
- assert(
tru
e);
+ assert(
fals
e);
}
/*
* We have a wrap buffer, consume from it. If in total, i.e. including
}
/*
* We have a wrap buffer, consume from it. If in total, i.e. including
@@
-660,9
+660,10
@@
void btr_consume(struct btr_node *btrn, size_t numbytes)
return btr_consume(btrn, sz);
}
return btr_consume(btrn, sz);
}
-
static void flush_input_queue
(struct btr_node *btrn)
+
void btr_drain
(struct btr_node *btrn)
{
struct btr_buffer_reference *br, *tmp;
{
struct btr_buffer_reference *br, *tmp;
+
FOR_EACH_BUFFER_REF_SAFE(br, tmp, btrn)
btr_drop_buffer_reference(br);
}
FOR_EACH_BUFFER_REF_SAFE(br, tmp, btrn)
btr_drop_buffer_reference(br);
}
@@
-670,6
+671,8
@@
static void flush_input_queue(struct btr_node *btrn)
/**
* Free all resources allocated by btr_new_node().
*
/**
* Free all resources allocated by btr_new_node().
*
+ * \param btrn Pointer to a btr node obtained by \ref btr_new_node().
+ *
* Like free(3), it is OK to call this with a \p NULL pointer argument.
*/
void btr_free_node(struct btr_node *btrn)
* Like free(3), it is OK to call this with a \p NULL pointer argument.
*/
void btr_free_node(struct btr_node *btrn)
@@
-700,7
+703,7
@@
void btr_remove_node(struct btr_node *btrn)
PARA_NOTICE_LOG("removing btr node %s from buffer tree\n", btrn->name);
FOR_EACH_CHILD(ch, btrn)
ch->parent = NULL;
PARA_NOTICE_LOG("removing btr node %s from buffer tree\n", btrn->name);
FOR_EACH_CHILD(ch, btrn)
ch->parent = NULL;
-
flush_input_queue
(btrn);
+
btr_drain
(btrn);
if (btrn->parent)
list_del(&btrn->node);
}
if (btrn->parent)
list_del(&btrn->node);
}
@@
-1067,7
+1070,7
@@
struct btr_node *btr_search_node(const char *name, struct btr_node *root)
}
/** 640K ought to be enough for everybody ;) */
}
/** 640K ought to be enough for everybody ;) */
-#define BTRN_MAX_PENDING (
640
* 1024)
+#define BTRN_MAX_PENDING (
96
* 1024)
/**
* Return the current state of a buffer tree node.
/**
* Return the current state of a buffer tree node.