diff options
| -rw-r--r-- | source4/build/smb_build/TODO | 6 | ||||
| -rw-r--r-- | source4/lib/talloc/talloc.3 | 489 | ||||
| -rw-r--r-- | source4/main.mk | 12 |
3 files changed, 9 insertions, 498 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO index a9134c35a2..73e296c578 100644 --- a/source4/build/smb_build/TODO +++ b/source4/build/smb_build/TODO @@ -1,4 +1,8 @@ -- saner names for some of the .pc files and libraries (reduce the amount of .pc files?) +- saner names for: + libcli.so.0.0.1 (rename to libsmb?) + libcli_cldap.so.0.0.1 (rename to libcldap?) + libcli_nbt.so.0.0.1 (rename to libnbt?) + libcli_wrepl.so.0.0.1 (rename to libwrepl?) - plugin loading support in ldb - generate headermap.txt diff --git a/source4/lib/talloc/talloc.3 b/source4/lib/talloc/talloc.3 deleted file mode 100644 index bf10943227..0000000000 --- a/source4/lib/talloc/talloc.3 +++ /dev/null @@ -1,489 +0,0 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "TALLOC" 3 "" "" "" -.SH NAME -talloc \- hierarchical reference counted memory pool system with destructors -.SH "SYNOPSIS" - -.nf -#include <talloc/talloc\&.h> -.fi - -.SH "DESCRIPTION" - -.PP -If you are used to talloc from Samba3 then please read this carefully, as talloc has changed a lot\&. - -.PP -The new talloc is a hierarchical, reference counted memory pool system with destructors\&. Quite a mouthful really, but not too bad once you get used to it\&. - -.PP -Perhaps the biggest change from Samba3 is that there is no distinction between a "talloc context" and a "talloc pointer"\&. Any pointer returned from talloc() is itself a valid talloc context\&. This means you can do this: - -.nf - - struct foo *X = talloc(mem_ctx, struct foo); - X\->name = talloc_strdup(X, "foo"); - -.fi - -.PP -and the pointer X\->name would be a "child" of the talloc context X which is itself a child of mem_ctx\&. So if you do talloc_free(mem_ctx) then it is all destroyed, whereas if you do talloc_free(X) then just X and X\->name are destroyed, and if you do talloc_free(X\->name) then just the name element of X is destroyed\&. - -.PP -If you think about this, then what this effectively gives you is an n\-ary tree, where you can free any part of the tree with talloc_free()\&. - -.PP -If you find this confusing, then I suggest you run the testsuite program to watch talloc in action\&. You may also like to add your own tests to testsuite\&.c to clarify how some particular situation is handled\&. - -.SH "TALLOC API" - -.PP -The following is a complete guide to the talloc API\&. Read it all at least twice\&. - -.SS "(type *)talloc(const void *ctx, type);" - -.PP -The talloc() macro is the core of the talloc library\&. It takes a memory \fIctx\fR and a \fItype\fR, and returns a pointer to a new area of memory of the given \fItype\fR\&. - -.PP -The returned pointer is itself a talloc context, so you can use it as the \fIctx\fR argument to more calls to talloc() if you wish\&. - -.PP -The returned pointer is a "child" of the supplied context\&. This means that if you talloc_free() the \fIctx\fR then the new child disappears as well\&. Alternatively you can free just the child\&. - -.PP -The \fIctx\fR argument to talloc() can be NULL, in which case a new top level context is created\&. - -.SS "void *talloc_size(const void *ctx, size_t size);" - -.PP -The function talloc_size() should be used when you don't have a convenient type to pass to talloc()\&. Unlike talloc(), it is not type safe (as it returns a void *), so you are on your own for type checking\&. - -.SS "int talloc_free(void *ptr);" - -.PP -The talloc_free() function frees a piece of talloc memory, and all its children\&. You can call talloc_free() on any pointer returned by talloc()\&. - -.PP -The return value of talloc_free() indicates success or failure, with 0 returned for success and \-1 for failure\&. The only possible failure condition is if \fIptr\fR had a destructor attached to it and the destructor returned \-1\&. See ``talloc_set_destructor()'' for details on destructors\&. - -.PP -If this pointer has an additional parent when talloc_free() is called then the memory is not actually released, but instead the most recently established parent is destroyed\&. See ``talloc_reference()'' for details on establishing additional parents\&. - -.PP -For more control on which parent is removed, see ``talloc_unlink()''\&. - -.PP -talloc_free() operates recursively on its children\&. - -.SS "void *talloc_reference(const void *ctx, const void *ptr);" - -.PP -The talloc_reference() function makes \fIctx\fR an additional parent of \fIptr\fR\&. - -.PP -The return value of talloc_reference() is always the original pointer \fIptr\fR, unless talloc ran out of memory in creating the reference in which case it will return NULL (each additional reference consumes around 48 bytes of memory on intel x86 platforms)\&. - -.PP -If \fIptr\fR is NULL, then the function is a no\-op, and simply returns NULL\&. - -.PP -After creating a reference you can free it in one of the following ways: - -.PP - - -.TP 3 -\(bu -you can talloc_free() any parent of the original pointer\&. That will reduce the number of parents of this pointer by 1, and will cause this pointer to be freed if it runs out of parents\&. -.TP -\(bu -you can talloc_free() the pointer itself\&. That will destroy the most recently established parent to the pointer and leave the pointer as a child of its current parent\&. -.LP - - -.PP -For more control on which parent to remove, see ``talloc_unlink()''\&. - -.SS "int talloc_unlink(const void *ctx, const void *ptr);" - -.PP -The talloc_unlink() function removes a specific parent from \fIptr\fR\&. The \fIctx\fR passed must either be a context used in talloc_reference() with this pointer, or must be a direct parent of ptr\&. - -.PP -Note that if the parent has already been removed using talloc_free() then this function will fail and will return \-1\&. Likewise, if \fIptr\fR is NULL, then the function will make no modifications and return \-1\&. - -.PP -Usually you can just use talloc_free() instead of talloc_unlink(), but sometimes it is useful to have the additional control on which parent is removed\&. - -.SS "void talloc_set_destructor(const void *ptr, int (*destructor)(void *));" - -.PP -The function talloc_set_destructor() sets the \fIdestructor\fR for the pointer \fIptr\fR\&. A \fIdestructor\fR is a function that is called when the memory used by a pointer is about to be released\&. The destructor receives \fIptr\fR as an argument, and should return 0 for success and \-1 for failure\&. - -.PP -The \fIdestructor\fR can do anything it wants to, including freeing other pieces of memory\&. A common use for destructors is to clean up operating system resources (such as open file descriptors) contained in the structure the destructor is placed on\&. - -.PP -You can only place one destructor on a pointer\&. If you need more than one destructor then you can create a zero\-length child of the pointer and place an additional destructor on that\&. - -.PP -To remove a destructor call talloc_set_destructor() with NULL for the destructor\&. - -.PP -If your destructor attempts to talloc_free() the pointer that it is the destructor for then talloc_free() will return \-1 and the free will be ignored\&. This would be a pointless operation anyway, as the destructor is only called when the memory is just about to go away\&. - -.SS "void talloc_increase_ref_count(const void *ptr);" - -.PP -The talloc_increase_ref_count(\fIptr\fR) function is exactly equivalent to: - -.nf -talloc_reference(NULL, ptr); -.fi - -.PP -You can use either syntax, depending on which you think is clearer in your code\&. - -.SS "void talloc_set_name(const void *ptr, const char *fmt, ...);" - -.PP -Each talloc pointer has a "name"\&. The name is used principally for debugging purposes, although it is also possible to set and get the name on a pointer in as a way of "marking" pointers in your code\&. - -.PP -The main use for names on pointer is for "talloc reports"\&. See ``talloc_report()'' and ``talloc_report_full()'' for details\&. Also see ``talloc_enable_leak_report()'' and ``talloc_enable_leak_report_full()''\&. - -.PP -The talloc_set_name() function allocates memory as a child of the pointer\&. It is logically equivalent to: - -.nf -talloc_set_name_const(ptr, talloc_asprintf(ptr, fmt, \&.\&.\&.)); -.fi - -.PP -Note that multiple calls to talloc_set_name() will allocate more memory without releasing the name\&. All of the memory is released when the ptr is freed using talloc_free()\&. - -.SS "void talloc_set_name_const(const void *ptr, const char *name);" - -.PP -The function talloc_set_name_const() is just like talloc_set_name(), but it takes a string constant, and is much faster\&. It is extensively used by the "auto naming" macros, such as talloc_p()\&. - -.PP -This function does not allocate any memory\&. It just copies the supplied pointer into the internal representation of the talloc ptr\&. This means you must not pass a \fIname\fR pointer to memory that will disappear before \fIptr\fR is freed with talloc_free()\&. - -.SS "void *talloc_named(const void *ctx, size_t size, const char *fmt, ...);" - -.PP -The talloc_named() function creates a named talloc pointer\&. It is equivalent to: - -.nf -ptr = talloc_size(ctx, size); -talloc_set_name(ptr, fmt, \&.\&.\&.\&.); -.fi - -.SS "void *talloc_named_const(const void *ctx, size_t size, const char *name);" - -.PP -This is equivalent to: - -.nf -ptr = talloc_size(ctx, size); -talloc_set_name_const(ptr, name); -.fi - -.SS "const char *talloc_get_name(const void *ptr);" - -.PP -This returns the current name for the given talloc pointer, \fIptr\fR\&. See ``talloc_set_name()'' for details\&. - -.SS "void *talloc_init(const char *fmt, ...);" - -.PP -This function creates a zero length named talloc context as a top level context\&. It is equivalent to: - -.nf -talloc_named(NULL, 0, fmt, \&.\&.\&.); -.fi - -.SS "void *talloc_new(void *ctx);" - -.PP -This is a utility macro that creates a new memory context hanging off an exiting context, automatically naming it "talloc_new: __location__" where __location__ is the source line it is called from\&. It is particularly useful for creating a new temporary working context\&. - -.SS "(type *)talloc_realloc(const void *ctx, void *ptr, type, count);" - -.PP -The talloc_realloc() macro changes the size of a talloc pointer\&. It has the following equivalences: - -.nf -talloc_realloc(ctx, NULL, type, 1) ==> talloc(ctx, type); -talloc_realloc(ctx, ptr, type, 0) ==> talloc_free(ptr); -.fi - -.PP -The \fIctx\fR argument is only used if \fIptr\fR is not NULL, otherwise it is ignored\&. - -.PP -talloc_realloc() returns the new pointer, or NULL on failure\&. The call will fail either due to a lack of memory, or because the pointer has more than one parent (see ``talloc_reference()'')\&. - -.SS "void *talloc_realloc_size(const void *ctx, void *ptr, size_t size);" - -.PP -the talloc_realloc_size() function is useful when the type is not known so the type\-safe talloc_realloc() cannot be used\&. - -.SS "void *talloc_steal(const void *new_ctx, const void *ptr);" - -.PP -The talloc_steal() function changes the parent context of a talloc pointer\&. It is typically used when the context that the pointer is currently a child of is going to be freed and you wish to keep the memory for a longer time\&. - -.PP -The talloc_steal() function returns the pointer that you pass it\&. It does not have any failure modes\&. - -.PP -NOTE: It is possible to produce loops in the parent/child relationship if you are not careful with talloc_steal()\&. No guarantees are provided as to your sanity or the safety of your data if you do this\&. - -.SS "off_t talloc_total_size(const void *ptr);" - -.PP -The talloc_total_size() function returns the total size in bytes used by this pointer and all child pointers\&. Mostly useful for debugging\&. - -.PP -Passing NULL is allowed, but it will only give a meaningful result if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. - -.SS "off_t talloc_total_blocks(const void *ptr);" - -.PP -The talloc_total_blocks() function returns the total memory block count used by this pointer and all child pointers\&. Mostly useful for debugging\&. - -.PP -Passing NULL is allowed, but it will only give a meaningful result if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. - -.SS "void talloc_report(const void *ptr, FILE *f);" - -.PP -The talloc_report() function prints a summary report of all memory used by \fIptr\fR\&. One line of report is printed for each immediate child of ptr, showing the total memory and number of blocks used by that child\&. - -.PP -You can pass NULL for the pointer, in which case a report is printed for the top level memory context, but only if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. - -.SS "void talloc_report_full(const void *ptr, FILE *f);" - -.PP -This provides a more detailed report than talloc_report()\&. It will recursively print the entire tree of memory referenced by the pointer\&. References in the tree are shown by giving the name of the pointer that is referenced\&. - -.PP -You can pass NULL for the pointer, in which case a report is printed for the top level memory context, but only if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. - -.SS "void talloc_enable_leak_report(void);" - -.PP -This enables calling of talloc_report(NULL, stderr) when the program exits\&. In Samba4 this is enabled by using the \-\-leak\-report command line option\&. - -.PP -For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don't call this function first then passing NULL to talloc_report() or talloc_report_full() won't give you the full tree printout\&. - -.PP -Here is a typical talloc report: - -.IP -talloc report on 'null_context' (total 267 bytes in 15 blocks) -libcli/auth/spnego_parse\&.c:55 contains 31 bytes in 2 blocks -libcli/auth/spnego_parse\&.c:55 contains 31 bytes in 2 blocks -iconv(UTF8,CP850) contains 42 bytes in 2 blocks -libcli/auth/spnego_parse\&.c:55 contains 31 bytes in 2 blocks -iconv(CP850,UTF8) contains 42 bytes in 2 blocks -iconv(UTF8,UTF\-16LE) contains 45 bytes in 2 blocks -iconv(UTF\-16LE,UTF8) contains 45 bytes in 2 blocks - -.SS "void talloc_enable_leak_report_full(void);" - -.PP -This enables calling of talloc_report_full(NULL, stderr) when the program exits\&. In Samba4 this is enabled by using the \-\-leak\-report\-full command line option\&. - -.PP -For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don't call this function first then passing NULL to talloc_report() or talloc_report_full() won't give you the full tree printout\&. - -.PP -Here is a typical full report: - -.IP -full talloc report on 'root' (total 18 bytes in 8 blocks) -p1 contains 18 bytes in 7 blocks (ref 0) - r1 contains 13 bytes in 2 blocks (ref 0) - reference to: p2 - p2 contains 1 bytes in 1 blocks (ref 1) - x3 contains 1 bytes in 1 blocks (ref 0) - x2 contains 1 bytes in 1 blocks (ref 0) - x1 contains 1 bytes in 1 blocks (ref 0) - -.SS "(type *)talloc_zero(const void *ctx, type);" - -.PP -The talloc_zero() macro is equivalent to: - -.nf -ptr = talloc(ctx, type); -if (ptr) memset(ptr, 0, sizeof(type)); -.fi - -.SS "void *talloc_zero_size(const void *ctx, size_t size)" - -.PP -The talloc_zero_size() function is useful when you don't have a known type\&. - -.SS "void *talloc_memdup(const void *ctx, const void *p, size_t size);" - -.PP -The talloc_memdup() function is equivalent to: - -.nf -ptr = talloc_size(ctx, size); -if (ptr) memcpy(ptr, p, size); -.fi - -.SS "char *talloc_strdup(const void *ctx, const char *p);" - -.PP -The talloc_strdup() function is equivalent to: - -.nf -ptr = talloc_size(ctx, strlen(p)+1); -if (ptr) memcpy(ptr, p, strlen(p)+1); -.fi - -.PP -This function sets the name of the new pointer to the passed string\&. This is equivalent to: - -.nf -talloc_set_name_const(ptr, ptr) -.fi - -.SS "char *talloc_strndup(const void *t, const char *p, size_t n);" - -.PP -The talloc_strndup() function is the talloc equivalent of the C library function strndup(3)\&. - -.PP -This function sets the name of the new pointer to the passed string\&. This is equivalent to: - -.nf -talloc_set_name_const(ptr, ptr) -.fi - -.SS "char *talloc_vasprintf(const void *t, const char *fmt, va_list ap);" - -.PP -The talloc_vasprintf() function is the talloc equivalent of the C library function vasprintf(3)\&. - -.SS "char *talloc_asprintf(const void *t, const char *fmt, ...);" - -.PP -The talloc_asprintf() function is the talloc equivalent of the C library function asprintf(3)\&. - -.PP -This function sets the name of the new pointer to the passed string\&. This is equivalent to: - -.nf -talloc_set_name_const(ptr, ptr) -.fi - -.SS "char *talloc_asprintf_append(char *s, const char *fmt, ...);" - -.PP -The talloc_asprintf_append() function appends the given formatted string to the given string\&. - -.SS "(type *)talloc_array(const void *ctx, type, uint_t count);" - -.PP -The talloc_array() macro is equivalent to: - -.nf -(type *)talloc_size(ctx, sizeof(type) * count); -.fi - -.PP -except that it provides integer overflow protection for the multiply, returning NULL if the multiply overflows\&. - -.SS "void *talloc_array_size(const void *ctx, size_t size, uint_t count);" - -.PP -The talloc_array_size() function is useful when the type is not known\&. It operates in the same way as talloc_array(), but takes a size instead of a type\&. - -.SS "void *talloc_realloc_fn(const void *ctx, void *ptr, size_t size)" - -.PP -This is a non\-macro version of talloc_realloc(), which is useful as libraries sometimes want a realloc function pointer\&. A realloc(3) implementation encapsulates the functionality of malloc(3), free(3) and realloc(3) in one call, which is why it is useful to be able to pass around a single function pointer\&. - -.SS "void *talloc_autofree_context(void);" - -.PP -This is a handy utility function that returns a talloc context which will be automatically freed on program exit\&. This can be used to reduce the noise in memory leak reports\&. - -.SS "void *talloc_check_name(const void *ptr, const char *name);" - -.PP -This function checks if a pointer has the specified \fIname\fR\&. If it does then the pointer is returned\&. It it doesn't then NULL is returned\&. - -.SS "(type *)talloc_get_type(const void *ptr, type);" - -.PP -This macro allows you to do type checking on talloc pointers\&. It is particularly useful for void* private pointers\&. It is equivalent to this: - -.nf -(type *)talloc_check_name(ptr, #type) -.fi - -.SS "talloc_set_type(const void *ptr, type);" - -.PP -This macro allows you to force the name of a pointer to be a particular \fItype\fR\&. This can be used in conjunction with talloc_get_type() to do type checking on void* pointers\&. - -.PP -It is equivalent to this: - -.nf -talloc_set_name_const(ptr, #type) -.fi - -.SH "PERFORMANCE" - -.PP -All the additional features of talloc(3) over malloc(3) do come at a price\&. We have a simple performance test in Samba4 that measures talloc() versus malloc() performance, and it seems that talloc() is about 10% slower than malloc() on my x86 Debian Linux box\&. For Samba, the great reduction in code complexity that we get by using talloc makes this worthwhile, especially as the total overhead of talloc/malloc in Samba is already quite small\&. - -.SH "SEE ALSO" - -.PP -malloc(3), strndup(3), vasprintf(3), asprintf(3), \fIhttp://talloc.samba.org/\fR - -.SH "COPYRIGHT/LICENSE" - -.PP -Copyright (C) Andrew Tridgell 2004 - -.PP -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\&. - -.PP -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\&. - -.PP -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\&. - diff --git a/source4/main.mk b/source4/main.mk index 458421f80d..62197b1560 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -197,14 +197,10 @@ IDL_NDR_SERVER_C_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%_s.c,$( IDL_NDR_EJS_C_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%_ejs.c,$(IDL_FILES)) IDL_NDR_EJS_H_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%_ejs.h,$(IDL_FILES)) -$(IDL_HEADER_FILES): idl -$(IDL_NDR_HEADER_FILES): idl -$(IDL_NDR_PARSE_C_FILES): idl -$(IDL_NDR_CLIENT_C_FILES): idl -$(IDL_NDR_CLIENT_H_FILES): idl -$(IDL_NDR_SERVER_C_FILES): idl -$(IDL_NDR_EJS_C_FILES): idl -$(IDL_NDR_EJS_H_FILES): idl +$(IDL_HEADER_FILES) $(IDL_NDR_HEADER_FILES) $(IDL_NDR_PARSE_C_FILES) \ + $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \ + $(IDL_NDR_SERVER_C_FILES) $(IDL_NDR_EJS_C_FILES) \ + $(IDL_NDR_EJS_H_FILES): idl idl_full: pidl/lib/Parse/Pidl/IDL.pm @CPP="$(CPP)" PERL="$(PERL)" script/build_idl.sh FULL $(PIDL_ARGS) |