summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-23 18:04:16 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-23 18:04:16 +0200
commitd70efa57ceae1011a6a55d57d0152fd1bc2bb192 (patch)
tree92ee7a3f33ea51f34a33fee094eaed651215a3d3 /lib
parent2f265feb174de1f743e8102ad34b3bdbcd2897cc (diff)
parentd805c714bb79a709716ec0373670283bfcd23c3c (diff)
downloadsamba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.gz
samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.bz2
samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.zip
Merge branch 'master' of git://git.samba.org/samba
Conflicts: lib/util/asn1_proto.h
Diffstat (limited to 'lib')
-rw-r--r--lib/util/config.mk1
-rw-r--r--lib/util/talloc_stack.c130
-rw-r--r--lib/util/talloc_stack.h56
-rw-r--r--lib/util/util.h1
-rw-r--r--lib/util/xfile.c25
5 files changed, 208 insertions, 5 deletions
diff --git a/lib/util/config.mk b/lib/util/config.mk
index f564efbe61..61e193b0c4 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -26,6 +26,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
idtree.o \
become_daemon.o \
rbtree.o \
+ talloc_stack.o \
params.o)
PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
diff --git a/lib/util/talloc_stack.c b/lib/util/talloc_stack.c
new file mode 100644
index 0000000000..2722fb9676
--- /dev/null
+++ b/lib/util/talloc_stack.c
@@ -0,0 +1,130 @@
+/*
+ Unix SMB/CIFS implementation.
+ Implement a stack of talloc contexts
+ Copyright (C) Volker Lendecke 2007
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ 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
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+ * Implement a stack of talloc frames.
+ *
+ * When a new talloc stackframe is allocated with talloc_stackframe(), then
+ * the TALLOC_CTX returned with talloc_tos() is reset to that new
+ * frame. Whenever that stack frame is TALLOC_FREE()'ed, then the reverse
+ * happens: The previous talloc_tos() is restored.
+ *
+ * This API is designed to be robust in the sense that if someone forgets to
+ * TALLOC_FREE() a stackframe, then the next outer one correctly cleans up and
+ * resets the talloc_tos().
+ *
+ * This robustness feature means that we can't rely on a linked list with
+ * talloc destructors because in a hierarchy of talloc destructors the parent
+ * destructor is called before its children destructors. The child destructor
+ * called after the parent would set the talloc_tos() to the wrong value.
+ */
+
+#include "includes.h"
+
+static int talloc_stacksize;
+static int talloc_stack_arraysize;
+static TALLOC_CTX **talloc_stack;
+
+static int talloc_pop(TALLOC_CTX *frame)
+{
+ int i;
+
+ for (i=talloc_stacksize-1; i>0; i--) {
+ if (frame == talloc_stack[i]) {
+ break;
+ }
+ talloc_free(talloc_stack[i]);
+ }
+
+ talloc_stacksize = i;
+ return 0;
+}
+
+/*
+ * Create a new talloc stack frame.
+ *
+ * When free'd, it frees all stack frames that were created after this one and
+ * not explicitly freed.
+ */
+
+static TALLOC_CTX *talloc_stackframe_internal(size_t poolsize)
+{
+ TALLOC_CTX **tmp, *top, *parent;
+
+ if (talloc_stack_arraysize < talloc_stacksize + 1) {
+ tmp = TALLOC_REALLOC_ARRAY(NULL, talloc_stack, TALLOC_CTX *,
+ talloc_stacksize + 1);
+ if (tmp == NULL) {
+ goto fail;
+ }
+ talloc_stack = tmp;
+ talloc_stack_arraysize = talloc_stacksize + 1;
+ }
+
+ if (talloc_stacksize == 0) {
+ parent = talloc_stack;
+ }
+ else {
+ parent = talloc_stack[talloc_stacksize-1];
+ }
+
+ if (poolsize) {
+ top = talloc_pool(parent, poolsize);
+ } else {
+ top = talloc_new(parent);
+ }
+
+ if (top == NULL) {
+ goto fail;
+ }
+
+ talloc_set_destructor(top, talloc_pop);
+
+ talloc_stack[talloc_stacksize++] = top;
+ return top;
+
+ fail:
+ smb_panic("talloc_stackframe failed");
+ return NULL;
+}
+
+TALLOC_CTX *talloc_stackframe(void)
+{
+ return talloc_stackframe_internal(0);
+}
+
+TALLOC_CTX *talloc_stackframe_pool(size_t poolsize)
+{
+ return talloc_stackframe_internal(poolsize);
+}
+
+/*
+ * Get us the current top of the talloc stack.
+ */
+
+TALLOC_CTX *talloc_tos(void)
+{
+ if (talloc_stacksize == 0) {
+ talloc_stackframe();
+ DEBUG(0, ("no talloc stackframe around, leaking memory\n"));
+ }
+
+ return talloc_stack[talloc_stacksize-1];
+}
diff --git a/lib/util/talloc_stack.h b/lib/util/talloc_stack.h
new file mode 100644
index 0000000000..bb22b8a029
--- /dev/null
+++ b/lib/util/talloc_stack.h
@@ -0,0 +1,56 @@
+/*
+ Unix SMB/CIFS implementation.
+ Implement a stack of talloc contexts
+ Copyright (C) Volker Lendecke 2007
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ 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
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+ * Implement a stack of talloc frames.
+ *
+ * When a new talloc stackframe is allocated with talloc_stackframe(), then
+ * the TALLOC_CTX returned with talloc_tos() is reset to that new
+ * frame. Whenever that stack frame is TALLOC_FREE()'ed, then the reverse
+ * happens: The previous talloc_tos() is restored.
+ *
+ * This API is designed to be robust in the sense that if someone forgets to
+ * TALLOC_FREE() a stackframe, then the next outer one correctly cleans up and
+ * resets the talloc_tos().
+ *
+ */
+
+#ifndef _TALLOC_STACK_H
+#define _TALLOC_STACK_H
+
+#include "../talloc/talloc.h"
+
+/*
+ * Create a new talloc stack frame.
+ *
+ * When free'd, it frees all stack frames that were created after this one and
+ * not explicitly freed.
+ */
+
+TALLOC_CTX *talloc_stackframe(void);
+TALLOC_CTX *talloc_stackframe_pool(size_t poolsize);
+
+/*
+ * Get us the current top of the talloc stack.
+ */
+
+TALLOC_CTX *talloc_tos(void);
+
+#endif
diff --git a/lib/util/util.h b/lib/util/util.h
index fc651d58af..e72df023a9 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -44,6 +44,7 @@ extern const char *panic_action;
#include "../lib/util/xfile.h"
#include "../lib/util/mutex.h"
#include "../lib/util/byteorder.h"
+#include "../lib/util/talloc_stack.h"
/**
* assert macros
diff --git a/lib/util/xfile.c b/lib/util/xfile.c
index 94b0ee9b18..cf195706db 100644
--- a/lib/util/xfile.c
+++ b/lib/util/xfile.c
@@ -329,12 +329,27 @@ int x_fgetc(XFILE *f)
/** simulate fread */
size_t x_fread(void *p, size_t size, size_t nmemb, XFILE *f)
{
+ size_t remaining = size * nmemb;
size_t total = 0;
- while (total < size*nmemb) {
- int c = x_fgetc(f);
- if (c == EOF) break;
- (total+(char *)p)[0] = (char)c;
- total++;
+
+ while (remaining > 0) {
+ size_t thistime;
+
+ x_fillbuf(f);
+
+ if (f->bufused == 0) {
+ f->flags |= X_FLAG_EOF;
+ break;
+ }
+
+ thistime = MIN(f->bufused, remaining);
+
+ memcpy((char *)p+total, f->next, thistime);
+
+ f->next += thistime;
+ f->bufused -= thistime;
+ remaining -= thistime;
+ total += thistime;
}
return total/size;
}