From: Matthias Clasen Date: Mon, 5 Dec 2005 15:54:58 +0000 (+0000) Subject: fix a formatting problem X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=cab5611661b78028a0cb2170552ceb22cf34e039;p=dana%2Fcg-glib.git fix a formatting problem --- diff --git a/docs/reference/glib/tmpl/memory_slices.sgml b/docs/reference/glib/tmpl/memory_slices.sgml index 643dd4cc..8a170676 100644 --- a/docs/reference/glib/tmpl/memory_slices.sgml +++ b/docs/reference/glib/tmpl/memory_slices.sgml @@ -6,10 +6,10 @@ efficient way to allocate groups of equal-sized chunks of memory. -Memory slices provide a space-efficient and multi processing scalable +Memory slices provide a space-efficient and multi-processing scalable way to allocate equal-sized pieces of memory, just like the original -#GMemChunks (from GLib <= 2.8), while avoiding their excessive -memroy-waste scalability and performance problems. +#GMemChunks (from GLib <= 2.8), while avoiding their excessive +memory-waste, scalability and performance problems. @@ -21,8 +21,8 @@ memory allocator. USENIX 1994, and [Bonwick01] Bonwick and Jonathan Adams, Magazines and vmem: Extending the slab allocator to many cpu's and arbitrary resources. USENIX 2001 . -It uses posix_memalign() to optimize allocations of many equally -sized chunks, and has per-thread free lists (the so-called magazine layer) +It uses posix_memalign() to optimize allocations of many equally-sized +chunks, and has per-thread free lists (the so-called magazine layer) to quickly satisfy allocation requests of already known structure sizes. This is accompanied by extra caching logic to keep freed memory around for some time before returning it to the system. Memory that is unused @@ -85,12 +85,10 @@ object size used at allocation time is still available when freeing. g_slice_free (GRealArray, array); - - @@ -98,7 +96,7 @@ object size used at allocation time is still available when freeing. Allocates a block of memory from the slice allocator. The block adress handed out is guaranteed to be aligned -to at leats 2 * sizeof (void*). +to at least 2 * sizeof (void*). @block_size: the number of bytes to allocate @@ -128,21 +126,8 @@ and the @block_size has to match the size specified upon allocation. @mem_block: a pointer to the block to free @Since: 2.10 - - -Frees a linked list of memory blocks. The memory blocks must be equal-sized, -allocated via -g_slice_alloc() or g_slice_alloc0() -and linked together by a next pointer (similar to #GSList) -stored in the word of each block denoted by @next_offset. -The @block_size has to match the size specified upon allocation. - -@block_size: the size of the blocks -@mem_chain: a pointer to the first block -@next_offset: the offset of the next pointer -@Since: 2.10 - + Frees a linked list of memory blocks of structure type @type. The memory blocks must be equal-sized, allocated via @@ -150,10 +135,14 @@ g_slice_alloc() or g_slice_alloc0() and linked together by a @next pointer (similar to #GSList). The name of the @next field in @type is passed as third argument. -@type: the type of the @mem_chain blocks + +@block_size: @mem_chain: a pointer to the first block of the chain -@next: the field name of the next pointer in @type +@next_offset: @Since: 2.10 + +@type: the type of the @mem_chain blocks +@next: the field name of the next pointer in @type @@ -189,6 +178,9 @@ from the slice allocator. It calls g_slice_free1() using @type: the type of the block to free, typically a structure name -@mem_block: a pointer to the block to free +@mem: @Since: 2.10 + +@mem_block: a pointer to the block to free +