-/*
- * Directory tree build/traverse routines
- *
- * Kern Sibbald, June MMII
- *
-*/
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2002-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-2012 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
- modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ modify it under the terms of version three of the GNU Affero General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ * Directory tree build/traverse routines
+ *
+ * Kern Sibbald, June MMII
+ *
+*/
#include "bacula.h"
#include "findlib/find.h"
+#define B_PAGE_SIZE 4096
+#define MAX_PAGES 2400
+#define MAX_BUF_SIZE (MAX_PAGES * B_PAGE_SIZE) /* approx 10MB */
/* Forward referenced subroutines */
static TREE_NODE *search_and_insert_tree_node(char *fname, int type,
memset(root, 0, sizeof(TREE_ROOT));
/* Assume filename + node = 40 characters average length */
size = count * (BALIGN(sizeof(TREE_NODE)) + 40);
- if (count > 1000000 || size > 10000000) {
- size = 10000000;
+ if (count > 1000000 || size > (MAX_BUF_SIZE / 2)) {
+ size = MAX_BUF_SIZE;
}
Dmsg2(400, "count=%d size=%d\n", count, size);
malloc_buf(root, size);
int size = sizeof(TREE_NODE);
node = (TREE_NODE *)tree_alloc(root, size);
memset(node, 0, size);
+ node->delta_seq = -1;
return node;
}
root->mem->mem -= asize;
}
-
+void tree_remove_node(TREE_ROOT *root, TREE_NODE *node)
+{
+ int asize = BALIGN(sizeof(TREE_NODE));
+ node->parent->child.remove(node);
+ if ((root->mem->mem - asize) == (char *)node) {
+ free_tree_node(root);
+ } else {
+ Dmsg0(0, "Can't release tree node\n");
+ }
+}
/*
* Allocate bytes for filename in tree structure.
if (root->mem->rem < asize) {
uint32_t mb_size;
- if (root->total_size >= 1000000) {
- mb_size = 1000000;
+ if (root->total_size >= (MAX_BUF_SIZE / 2)) {
+ mb_size = MAX_BUF_SIZE;
} else {
- mb_size = 100000;
+ mb_size = MAX_BUF_SIZE / 2;
}
malloc_buf(root, mb_size);
}
void free_tree(TREE_ROOT *root)
{
struct s_mem *mem, *rel;
+ uint32_t freed_blocks = 0;
for (mem=root->mem; mem; ) {
rel = mem;
mem = mem->next;
free(rel);
+ freed_blocks++;
}
if (root->cached_path) {
free_pool_memory(root->cached_path);
root->cached_path = NULL;
}
- Dmsg2(400, "Total size=%u blocks=%d\n", root->total_size, root->blocks);
+ Dmsg3(100, "Total size=%u blocks=%u freed_blocks=%u\n", root->total_size, root->blocks, freed_blocks);
free(root);
+ garbage_collect_memory();
return;
}
+/* Add Delta part for this node */
+void tree_add_delta_part(TREE_ROOT *root, TREE_NODE *node,
+ JobId_t JobId, int32_t FileIndex)
+{
+ struct delta_list *elt =
+ (struct delta_list*) tree_alloc(root, sizeof(struct delta_list));
+
+ elt->next = node->delta_list;
+ elt->JobId = JobId;
+ elt->FileIndex = FileIndex;
+ node->delta_list = elt;
+}
/*
* Insert a node in the tree. This is the main subroutine
TREE_NODE *node, *found_node;
node = new_tree_node(root);
node->fname = fname;
- found_node = (TREE_NODE *)parent->child.binary_insert(node, node_compare);
+ found_node = (TREE_NODE *)parent->child.insert(node, node_compare);
if (found_node != node) { /* already in list */
free_tree_node(root); /* free node allocated above */
found_node->inserted = false;
char *p;
int len;
TREE_NODE *cd;
+ char save_char;
+ int match;
if (*path == 0) {
return node;
&& strncmp(cd->fname, path, len) == 0) {
break;
}
+ /* fnmatch has no len in call so we truncate the string */
+ save_char = path[len];
+ path[len] = 0;
+ match = fnmatch(path, cd->fname, 0) == 0;
+ path[len] = save_char;
+ if (match) {
+ break;
+ }
}
if (!cd || (cd->type == TN_FILE && !tree_node_has_child(cd))) {
return NULL;
bstrncpy(file, dir->d_name, sizeof(file));
snprintf(pathbuf, MAXPATHLEN-1, "%s/%s", path, file);
if (lstat(pathbuf, &statbuf) < 0) {
- printf("lstat() failed. ERR=%s\n", strerror(errno));
+ berrno be;
+ printf("lstat() failed. ERR=%s\n", be.bstrerror(errno));
continue;
}
// printf("got file=%s, pathbuf=%s\n", file, pathbuf);