LVM2/libdm/mm pool-debug.c

LVM2/libdm/mm pool-debug.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-02-28 19:54:30

Modified files:
	libdm/mm       : pool-debug.c 

Log message:
	Fix void pointer arithmetic warning in pool debug code

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/mm/pool-debug.c.diff?cvsroot=lvm2&r1=1.9&r2=1.10

--- LVM2/libdm/mm/pool-debug.c	2009/07/15 20:02:48	1.9
+++ LVM2/libdm/mm/pool-debug.c	2011/02/28 19:54:30	1.10
@@ -248,7 +248,7 @@
 	}
 	p->object = new;
 
-	memcpy(new->data + new_size - delta, extra, delta);
+	memcpy((char*)new->data + new_size - delta, extra, delta);
 
 	return 1;
 }

LVM2/libdm/mm pool-debug.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-03-30 12:16:16

Modified files:
	libdm/mm       : pool-debug.c 

Log message:
	Simplify pool debug initialization
	
	zalloc pool structure and skip zeroing members.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/mm/pool-debug.c.diff?cvsroot=lvm2&r1=1.10&r2=1.11

--- LVM2/libdm/mm/pool-debug.c	2011/02/28 19:54:30	1.10
+++ LVM2/libdm/mm/pool-debug.c	2011/03/30 12:16:15	1.11
@@ -48,7 +48,7 @@
 
 struct dm_pool *dm_pool_create(const char *name, size_t chunk_hint)
 {
-	struct dm_pool *mem = dm_malloc(sizeof(*mem));
+	struct dm_pool *mem = dm_zalloc(sizeof(*mem));
 
 	if (!mem) {
 		log_error("Couldn't create memory pool %s (size %"
@@ -57,16 +57,6 @@
 	}
 
 	mem->name = name;
-	mem->begun = 0;
-	mem->object = 0;
-	mem->blocks = mem->tail = NULL;
-
-	mem->stats.block_serialno = 0;
-	mem->stats.blocks_allocated = 0;
-	mem->stats.blocks_max = 0;
-	mem->stats.bytes = 0;
-	mem->stats.maxbytes = 0;
-
 	mem->orig_pool = mem;
 
 #ifdef DEBUG_POOL

LVM2/libdm/mm pool-debug.c

[mbroz]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2009-04-02 15:02:19

Modified files:
	libdm/mm       : pool-debug.c 

Log message:
	Fix debug pool grow object to properly support delta=0
	
	(It prints garbage for some reports)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/mm/pool-debug.c.diff?cvsroot=lvm2&r1=1.6&r2=1.7

--- LVM2/libdm/mm/pool-debug.c	2009/03/26 09:25:18	1.6
+++ LVM2/libdm/mm/pool-debug.c	2009/04/02 15:02:18	1.7
@@ -218,14 +218,19 @@
 int dm_pool_grow_object(struct dm_pool *p, const void *extra, size_t delta)
 {
 	struct block *new;
-	size_t size = delta ? : strlen(extra);
+	size_t new_size;
+
+	if (!delta)
+		delta = strlen(extra);
 
 	assert(p->begun);
 
 	if (p->object)
-		size += p->object->size;
+		new_size = delta + p->object->size;
+	else
+		new_size = delta;
 
-	if (!(new = _new_block(size, DEFAULT_ALIGNMENT))) {
+	if (!(new = _new_block(new_size, DEFAULT_ALIGNMENT))) {
 		log_err("Couldn't extend object.");
 		return 0;
 	}
@@ -237,7 +242,7 @@
 	}
 	p->object = new;
 
-	memcpy(new->data + size - delta, extra, delta);
+	memcpy(new->data + new_size - delta, extra, delta);
 
 	return 1;
 }