[Linux-NTFS-cvs] CVS: dynamic-disk/test compat.c,1.15,1.16 dump.c,1.13,1.14 ldminfo.c,1.28,1.29 ldminfo.h,1.15,1.16

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv5158/test

Modified Files:
	compat.c dump.c ldminfo.c ldminfo.h 
Log Message:
redo previous sweeping changes (typo)
calculate some memory stats


Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/compat.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- compat.c	17 Jun 2002 00:15:13 -0000	1.15
+++ compat.c	17 Jun 2002 01:28:57 -0000	1.16
@@ -38,13 +38,22 @@
 void __brelse (struct buffer_head * buf);
 
-int ldm_a = 0;
-int ldm_f = 0;
+int ldm_mem_alloc = 0;	/* Number of allocations */
+int ldm_mem_free  = 0;	/* Number of frees */
+int ldm_mem_size  = 0;	/* Memory allocated */
+int ldm_mem_maxa  = 0;	/* Max memory allocated */
+int ldm_mem_count = 0;	/* Number of memory blocks */
+int ldm_mem_maxc  = 0;	/* Max memory blocks */
 
 void * __kmalloc (size_t size, int flags, char *fn)
 {
-	void *ptr = malloc (size);
+	void *ptr = malloc (size + sizeof (int));
 	//printf ("malloc %p %6zu in %s\n", ptr, size, fn);
-	ldm_a++;
-	return ptr;
+	ldm_mem_alloc++;
+	ldm_mem_size += size;
+	ldm_mem_maxa = max (ldm_mem_maxa, ldm_mem_size);
+	ldm_mem_count++;
+	ldm_mem_maxc = max (ldm_mem_maxc, ldm_mem_count);
+	*((int *)ptr) = size;
+	return (ptr + sizeof (int));
 }
 
@@ -52,6 +61,8 @@
 {
 	//printf ("free   %p        in %s\n", objp, fn);
-	ldm_f++;
-	free ((void *)objp);
+	ldm_mem_free++;
+	ldm_mem_count--;
+	ldm_mem_size -= *((int *)(objp - sizeof (int)));
+	free ((void *)(objp - sizeof (int)));
 }
 

Index: dump.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/dump.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- dump.c	17 Jun 2002 00:15:13 -0000	1.13
+++ dump.c	17 Jun 2002 01:28:57 -0000	1.14
@@ -139,5 +139,5 @@
 static int dump_vmdb (struct ldmdb *ldb)
 {
-	struct list *item;
+	struct list_head *item;
 	struct vmdb *vm = &ldb->vm;
 
@@ -214,5 +214,5 @@
 static int dump_disks (struct ldmdb *ldb)
 {
-	struct list *disk_item, *part_item;
+	struct list_head *disk_item, *part_item;
 	struct vblk      *disk_vb,   *part_vb;
 
@@ -249,5 +249,5 @@
 static int dump_volumes (struct ldmdb *ldb)
 {
-	struct list *volu_item, *comp_item, *part_item;
+	struct list_head *volu_item, *comp_item, *part_item;
 	struct vblk      *volu_vb,   *comp_vb,   *part_vb;
 

Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- ldminfo.c	17 Jun 2002 00:15:13 -0000	1.28
+++ ldminfo.c	17 Jun 2002 01:28:57 -0000	1.29
@@ -241,5 +241,5 @@
 		close (device);
 
-	//printf ("%d/%d\n", ldm_a, ldm_f);
+	//printf ("%d/%d %d,%d\n", ldm_mem_alloc, ldm_mem_free, ldm_mem_maxa, ldm_mem_maxc);
 	return 0;
 }

Index: ldminfo.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- ldminfo.h	17 Jun 2002 00:15:13 -0000	1.15
+++ ldminfo.h	17 Jun 2002 01:28:57 -0000	1.16
@@ -55,6 +55,10 @@
 extern int debug;
 
-extern int ldm_a;
-extern int ldm_f;
+extern int ldm_mem_alloc;
+extern int ldm_mem_free;
+extern int ldm_mem_size;
+extern int ldm_mem_maxa;
+extern int ldm_mem_count;
+extern int ldm_mem_maxc;
 
 extern struct proc_dir_entry *proc_root_fs;
@@ -84,8 +88,8 @@
 int ldm_validate_tocblocks (struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
 int ldm_validate_vmdb (struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
-int ldm_get_buffers (struct block_device *bdev, unsigned long base, struct vmdb *vm, struct list *lh_bh, struct list *lh_vl);
+int ldm_get_buffers (struct block_device *bdev, unsigned long base, struct vmdb *vm, struct list_head *lh_bh, struct list_head *lh_vl);
 struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb);
-void ldm_free_buffers (struct list *bh);
-void ldm_free_vblks (struct list *vb);
+void ldm_free_buffers (struct list_head *bh);
+void ldm_free_vblks (struct list_head *vb);
 int ldm_get_vblks(struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
 int ldm_combine_vblks (struct ldmdb *ldb);