From 44b728958ae9a48bb56591532e5db9867311c1b9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 23 Oct 2008 15:35:21 +0200 Subject: Use common error definitions. --- lib/util/asn1_proto.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/util') diff --git a/lib/util/asn1_proto.h b/lib/util/asn1_proto.h index 9b7b4d26d5..972f7a3591 100644 --- a/lib/util/asn1_proto.h +++ b/lib/util/asn1_proto.h @@ -1,5 +1,5 @@ -#ifndef _____LIB_UTIL_ASN1_PROTO_H__ -#define _____LIB_UTIL_ASN1_PROTO_H__ +#ifndef ___HOME_JELMER_SAMBA4_GIT_SOURCE3____SOURCE4____LIB_UTIL_ASN1_PROTO_H__ +#define ___HOME_JELMER_SAMBA4_GIT_SOURCE3____SOURCE4____LIB_UTIL_ASN1_PROTO_H__ #undef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) @@ -10,7 +10,7 @@ * used outside this particular subsystem! */ -/* The following definitions come from ../lib/util/asn1.c */ +/* The following definitions come from /home/jelmer/samba4.git/source3/../source4/../lib/util/asn1.c */ struct asn1_data *asn1_init(TALLOC_CTX *mem_ctx); void asn1_free(struct asn1_data *data); @@ -55,5 +55,5 @@ NTSTATUS asn1_full_tag(DATA_BLOB blob, uint8_t tag, size_t *packet_size); #undef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) -#endif /* _____LIB_UTIL_ASN1_PROTO_H__ */ +#endif /* ___HOME_JELMER_SAMBA4_GIT_SOURCE3____SOURCE4____LIB_UTIL_ASN1_PROTO_H__ */ -- cgit From cf659fa4fe7369ac58ef547f744c0ff3f9fb137a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 23 Oct 2008 17:27:30 +0200 Subject: Import talloc_stack into util library. --- lib/util/config.mk | 1 + lib/util/talloc_stack.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/util/talloc_stack.h | 56 +++++++++++++++++++++ lib/util/util.h | 1 + 4 files changed, 188 insertions(+) create mode 100644 lib/util/talloc_stack.c create mode 100644 lib/util/talloc_stack.h (limited to 'lib/util') diff --git a/lib/util/config.mk b/lib/util/config.mk index 5488534f26..0eaabbf86b 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 -- cgit From 3f0406f609899e88f15f90688c0e49beadc72568 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 23 Oct 2008 15:43:36 +0200 Subject: Optimize x_fread to speed up the smbclient put command --- lib/util/xfile.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'lib/util') 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; } -- cgit