X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_allocator.c;h=6db9856532da44cbbcef3a08a41dafc517770137;hp=41200eebb4a71b4b9a48c4a05793782221f7fe3c;hb=cf6888f05f691aa1a357e7e94f9bf7b98174bbc3;hpb=e33554a67753729f6b74677473cf0ec3b8d35a7e

diff --git a/yaffs_allocator.c b/yaffs_allocator.c
index 41200ee..6db9856 100644
--- a/yaffs_allocator.c
+++ b/yaffs_allocator.c
@@ -1,5 +1,5 @@
 /*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
  * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
@@ -7,13 +7,12 @@
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  */
 
 
+
 #include "yaffs_allocator.h"
 #include "yaffs_guts.h"
 #include "yaffs_trace.h"
@@ -21,45 +20,45 @@
 
 #ifdef CONFIG_YAFFS_YMALLOC_ALLOCATOR
 
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_Device *dev)
+void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
 {
 	dev = dev;
 }
 
-void yaffs_init_raw_tnodes_and_objs(yaffs_Device *dev)
+void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
 {
 	dev = dev;
 }
 
-yaffs_Tnode *yaffs_alloc_raw_tnode(yaffs_Device *dev)
+yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
 {
-	return (yaffs_Tnode *)YMALLOC(dev->tnodeSize);
+	return (yaffs_tnode_t *)YMALLOC(dev->tnode_size);
 }
 
-void yaffs_free_raw_tnode(yaffs_Device *dev, yaffs_Tnode *tn)
+void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
 {
 	dev = dev;
 	YFREE(tn);
 }
 
-void yaffs_init_raw_objs(yaffs_Device *dev)
+void yaffs_init_raw_objs(yaffs_dev_t *dev)
 {
 	dev = dev;
 }
 
-void yaffs_deinit_raw_objs(yaffs_Device *dev)
+void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
 {
 	dev = dev;
 }
 
-yaffs_Object *yaffs_alloc_raw_obj(yaffs_Device *dev)
+yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
 {
 	dev = dev;
-	return (yaffs_Object *) YMALLOC(sizeof(yaffs_Object));
+	return (yaffs_obj_t *) YMALLOC(sizeof(yaffs_obj_t));
 }
 
 
-void yaffs_free_raw_obj(yaffs_Device *dev, yaffs_Object *obj)
+void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
 {
 
 	dev = dev;
@@ -68,135 +67,133 @@ void yaffs_free_raw_obj(yaffs_Device *dev, yaffs_Object *obj)
 
 #else
 
-struct yaffs_TnodeList_struct {
-	struct yaffs_TnodeList_struct *next;
-	yaffs_Tnode *tnodes;
+struct yaffs_tnode_list {
+	struct yaffs_tnode_list *next;
+	yaffs_tnode_t *tnodes;
 };
 
-typedef struct yaffs_TnodeList_struct yaffs_TnodeList;
+typedef struct yaffs_tnode_list yaffs_tnodelist_t;
 
-struct yaffs_ObjectList_struct {
-	yaffs_Object *objects;
-	struct yaffs_ObjectList_struct *next;
+struct yaffs_obj_list_struct {
+	yaffs_obj_t *objects;
+	struct yaffs_obj_list_struct *next;
 };
 
-typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
+typedef struct yaffs_obj_list_struct yaffs_obj_list;
 
 
-struct yaffs_AllocatorStruct {
-	int nTnodesCreated;
-	yaffs_Tnode *freeTnodes;
-	int nFreeTnodes;
-	yaffs_TnodeList *allocatedTnodeList;
+struct yaffs_allocator {
+	int n_tnodes_created;
+	yaffs_tnode_t *free_tnodes;
+	int n_free_tnodes;
+	yaffs_tnodelist_t *alloc_tnode_list;
 
-	int nObjectsCreated;
-	yaffs_Object *freeObjects;
-	int nFreeObjects;
+	int n_obj_created;
+	yaffs_obj_t *free_objs;
+	int n_free_objects;
 
-	yaffs_ObjectList *allocatedObjectList;
+	yaffs_obj_list *allocated_obj_list;
 };
 
-typedef struct yaffs_AllocatorStruct yaffs_Allocator;
-
 
-static void yaffs_deinit_raw_tnodes(yaffs_Device *dev)
+static void yaffs_deinit_raw_tnodes(yaffs_dev_t *dev)
 {
 
-	yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
+	struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
 
-	yaffs_TnodeList *tmp;
+	yaffs_tnodelist_t *tmp;
 
 	if(!allocator){
 		YBUG();
 		return;
 	}
 
-	while (allocator->allocatedTnodeList) {
-		tmp = allocator->allocatedTnodeList->next;
+	while (allocator->alloc_tnode_list) {
+		tmp = allocator->alloc_tnode_list->next;
 
-		YFREE(allocator->allocatedTnodeList->tnodes);
-		YFREE(allocator->allocatedTnodeList);
-		allocator->allocatedTnodeList = tmp;
+		YFREE(allocator->alloc_tnode_list->tnodes);
+		YFREE(allocator->alloc_tnode_list);
+		allocator->alloc_tnode_list = tmp;
 
 	}
 
-	allocator->freeTnodes = NULL;
-	allocator->nFreeTnodes = 0;
-	allocator->nTnodesCreated = 0;
+	allocator->free_tnodes = NULL;
+	allocator->n_free_tnodes = 0;
+	allocator->n_tnodes_created = 0;
 }
 
-static void yaffs_init_raw_tnodes(yaffs_Device *dev)
+static void yaffs_init_raw_tnodes(yaffs_dev_t *dev)
 {
-	yaffs_Allocator *allocator = dev->allocator;
+	struct yaffs_allocator *allocator = dev->allocator;
 
 	if(allocator){
-		allocator->allocatedTnodeList = NULL;
-		allocator->freeTnodes = NULL;
-		allocator->nFreeTnodes = 0;
-		allocator->nTnodesCreated = 0;
+		allocator->alloc_tnode_list = NULL;
+		allocator->free_tnodes = NULL;
+		allocator->n_free_tnodes = 0;
+		allocator->n_tnodes_created = 0;
 	} else
 		YBUG();
 }
 
-static int yaffs_create_tnodes(yaffs_Device *dev, int nTnodes)
+static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
 {
-	yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
+	struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
 	int i;
-	yaffs_Tnode *newTnodes;
-	__u8 *mem;
-	yaffs_Tnode *curr;
-	yaffs_Tnode *next;
-	yaffs_TnodeList *tnl;
+	yaffs_tnode_t *new_tnodes;
+	u8 *mem;
+	yaffs_tnode_t *curr;
+	yaffs_tnode_t *next;
+	yaffs_tnodelist_t *tnl;
 
 	if(!allocator){
 		YBUG();
 		return YAFFS_FAIL;
 	}
 
-	if (nTnodes < 1)
+	if (n_tnodes < 1)
 		return YAFFS_OK;
 
 
 	/* make these things */
 
-	newTnodes = YMALLOC(nTnodes * dev->tnodeSize);
-	mem = (__u8 *)newTnodes;
+	new_tnodes = YMALLOC(n_tnodes * dev->tnode_size);
+	mem = (u8 *)new_tnodes;
 
-	if (!newTnodes) {
+	if (!new_tnodes) {
 		T(YAFFS_TRACE_ERROR,
 			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
 		return YAFFS_FAIL;
 	}
 
 	/* New hookup for wide tnodes */
-	for (i = 0; i < nTnodes - 1; i++) {
-		curr = (yaffs_Tnode *) &mem[i * dev->tnodeSize];
-		next = (yaffs_Tnode *) &mem[(i+1) * dev->tnodeSize];
+	for (i = 0; i < n_tnodes - 1; i++) {
+		curr = (yaffs_tnode_t *) &mem[i * dev->tnode_size];
+		next = (yaffs_tnode_t *) &mem[(i+1) * dev->tnode_size];
 		curr->internal[0] = next;
 	}
 
-	curr = (yaffs_Tnode *) &mem[(nTnodes - 1) * dev->tnodeSize];
-	curr->internal[0] = allocator->freeTnodes;
-	allocator->freeTnodes = (yaffs_Tnode *)mem;
+	curr = (yaffs_tnode_t *) &mem[(n_tnodes - 1) * dev->tnode_size];
+	curr->internal[0] = allocator->free_tnodes;
+	allocator->free_tnodes = (yaffs_tnode_t *)mem;
 
-	allocator->nFreeTnodes += nTnodes;
-	allocator->nTnodesCreated += nTnodes;
+	allocator->n_free_tnodes += n_tnodes;
+	allocator->n_tnodes_created += n_tnodes;
 
 	/* Now add this bunch of tnodes to a list for freeing up.
 	 * NB If we can't add this to the management list it isn't fatal
 	 * but it just means we can't free this bunch of tnodes later.
 	 */
 
-	tnl = YMALLOC(sizeof(yaffs_TnodeList));
+	tnl = YMALLOC(sizeof(yaffs_tnodelist_t));
 	if (!tnl) {
 		T(YAFFS_TRACE_ERROR,
 		  (TSTR
 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
 		   return YAFFS_FAIL;
 	} else {
-		tnl->tnodes = newTnodes;
-		tnl->next = allocator->allocatedTnodeList;
-		allocator->allocatedTnodeList = tnl;
+		tnl->tnodes = new_tnodes;
+		tnl->next = allocator->alloc_tnode_list;
+		allocator->alloc_tnode_list = tnl;
 	}
 
 	T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
@@ -205,10 +202,10 @@ static int yaffs_create_tnodes(yaffs_Device *dev, int nTnodes)
 }
 
 
-yaffs_Tnode *yaffs_alloc_raw_tnode(yaffs_Device *dev)
+yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
 {
-	yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
-	yaffs_Tnode *tn = NULL;
+	struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
+	yaffs_tnode_t *tn = NULL;
 
 	if(!allocator){
 		YBUG();
@@ -216,22 +213,22 @@ yaffs_Tnode *yaffs_alloc_raw_tnode(yaffs_Device *dev)
 	}
 
 	/* If there are none left make more */
-	if (!allocator->freeTnodes)
+	if (!allocator->free_tnodes)
 		yaffs_create_tnodes(dev, YAFFS_ALLOCATION_NTNODES);
 
-	if (allocator->freeTnodes) {
-		tn = allocator->freeTnodes;
-		allocator->freeTnodes = allocator->freeTnodes->internal[0];
-		allocator->nFreeTnodes--;
+	if (allocator->free_tnodes) {
+		tn = allocator->free_tnodes;
+		allocator->free_tnodes = allocator->free_tnodes->internal[0];
+		allocator->n_free_tnodes--;
 	}
 
 	return tn;
 }
 
 /* FreeTnode frees up a tnode and puts it back on the free list */
-void yaffs_free_raw_tnode(yaffs_Device *dev, yaffs_Tnode *tn)
+void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
 {
-	yaffs_Allocator *allocator = dev->allocator;
+	struct yaffs_allocator *allocator = dev->allocator;
 
 	if(!allocator){
 		YBUG();
@@ -239,75 +236,75 @@ void yaffs_free_raw_tnode(yaffs_Device *dev, yaffs_Tnode *tn)
 	}
 
 	if (tn) {
-		tn->internal[0] = allocator->freeTnodes;
-		allocator->freeTnodes = tn;
-		allocator->nFreeTnodes++;
+		tn->internal[0] = allocator->free_tnodes;
+		allocator->free_tnodes = tn;
+		allocator->n_free_tnodes++;
 	}
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
+	dev->checkpoint_blocks_required = 0; /* force recalculation*/
 }
 
 
 
-static void yaffs_init_raw_objs(yaffs_Device *dev)
+static void yaffs_init_raw_objs(yaffs_dev_t *dev)
 {
-	yaffs_Allocator *allocator = dev->allocator;
+	struct yaffs_allocator *allocator = dev->allocator;
 
 	if(allocator) {
-		allocator->allocatedObjectList = NULL;
-		allocator->freeObjects = NULL;
-		allocator->nFreeObjects = 0;
+		allocator->allocated_obj_list = NULL;
+		allocator->free_objs = NULL;
+		allocator->n_free_objects = 0;
 	} else
 		YBUG();
 }
 
-static void yaffs_deinit_raw_objs(yaffs_Device *dev)
+static void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
 {
-	yaffs_Allocator *allocator = dev->allocator;
-	yaffs_ObjectList *tmp;
+	struct yaffs_allocator *allocator = dev->allocator;
+	yaffs_obj_list *tmp;
 
 	if(!allocator){
 		YBUG();
 		return;
 	}
 
-	while (allocator->allocatedObjectList) {
-		tmp = allocator->allocatedObjectList->next;
-		YFREE(allocator->allocatedObjectList->objects);
-		YFREE(allocator->allocatedObjectList);
+	while (allocator->allocated_obj_list) {
+		tmp = allocator->allocated_obj_list->next;
+		YFREE(allocator->allocated_obj_list->objects);
+		YFREE(allocator->allocated_obj_list);
 
-		allocator->allocatedObjectList = tmp;
+		allocator->allocated_obj_list = tmp;
 	}
 
-	allocator->freeObjects = NULL;
-	allocator->nFreeObjects = 0;
-	allocator->nObjectsCreated = 0;
+	allocator->free_objs = NULL;
+	allocator->n_free_objects = 0;
+	allocator->n_obj_created = 0;
 }
 
 
-static int yaffs_create_free_objs(yaffs_Device *dev, int nObjects)
+static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
 {
-	yaffs_Allocator *allocator = dev->allocator;
+	struct yaffs_allocator *allocator = dev->allocator;
 
 	int i;
-	yaffs_Object *newObjects;
-	yaffs_ObjectList *list;
+	yaffs_obj_t *new_objs;
+	yaffs_obj_list *list;
 
 	if(!allocator){
 		YBUG();
 		return YAFFS_FAIL;
 	}
 
-	if (nObjects < 1)
+	if (n_obj < 1)
 		return YAFFS_OK;
 
 	/* make these things */
-	newObjects = YMALLOC(nObjects * sizeof(yaffs_Object));
-	list = YMALLOC(sizeof(yaffs_ObjectList));
+	new_objs = YMALLOC(n_obj * sizeof(yaffs_obj_t));
+	list = YMALLOC(sizeof(yaffs_obj_list));
 
-	if (!newObjects || !list) {
-		if (newObjects){
-			YFREE(newObjects);
-			newObjects = NULL;
+	if (!new_objs || !list) {
+		if (new_objs){
+			YFREE(new_objs);
+			new_objs = NULL;
 		}
 		if (list){
 			YFREE(list);
@@ -319,29 +316,29 @@ static int yaffs_create_free_objs(yaffs_Device *dev, int nObjects)
 	}
 
 	/* Hook them into the free list */
-	for (i = 0; i < nObjects - 1; i++) {
-		newObjects[i].siblings.next =
-				(struct ylist_head *)(&newObjects[i + 1]);
+	for (i = 0; i < n_obj - 1; i++) {
+		new_objs[i].siblings.next =
+				(struct ylist_head *)(&new_objs[i + 1]);
 	}
 
-	newObjects[nObjects - 1].siblings.next = (void *)allocator->freeObjects;
-	allocator->freeObjects = newObjects;
-	allocator->nFreeObjects += nObjects;
-	allocator->nObjectsCreated += nObjects;
+	new_objs[n_obj - 1].siblings.next = (void *)allocator->free_objs;
+	allocator->free_objs = new_objs;
+	allocator->n_free_objects += n_obj;
+	allocator->n_obj_created += n_obj;
 
 	/* Now add this bunch of Objects to a list for freeing up. */
 
-	list->objects = newObjects;
-	list->next = allocator->allocatedObjectList;
-	allocator->allocatedObjectList = list;
+	list->objects = new_objs;
+	list->next = allocator->allocated_obj_list;
+	allocator->allocated_obj_list = list;
 
 	return YAFFS_OK;
 }
 
-yaffs_Object *yaffs_alloc_raw_obj(yaffs_Device *dev)
+yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
 {
-	yaffs_Object *obj = NULL;
-	yaffs_Allocator *allocator = dev->allocator;
+	yaffs_obj_t *obj = NULL;
+	struct yaffs_allocator *allocator = dev->allocator;
 
 	if(!allocator) {
 		YBUG();
@@ -349,36 +346,36 @@ yaffs_Object *yaffs_alloc_raw_obj(yaffs_Device *dev)
 	}
 
 	/* If there are none left make more */
-	if (!allocator->freeObjects)
+	if (!allocator->free_objs)
 		yaffs_create_free_objs(dev, YAFFS_ALLOCATION_NOBJECTS);
 
-	if (allocator->freeObjects) {
-		obj = allocator->freeObjects;
-		allocator->freeObjects =
-			(yaffs_Object *) (allocator->freeObjects->siblings.next);
-		allocator->nFreeObjects--;
+	if (allocator->free_objs) {
+		obj = allocator->free_objs;
+		allocator->free_objs =
+			(yaffs_obj_t *) (allocator->free_objs->siblings.next);
+		allocator->n_free_objects--;
 	}
 
 	return obj;
 }
 
 
-void yaffs_free_raw_obj(yaffs_Device *dev, yaffs_Object *obj)
+void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
 {
 
-	yaffs_Allocator *allocator = dev->allocator;
+	struct yaffs_allocator *allocator = dev->allocator;
 
 	if(!allocator)
 		YBUG();
 	else {
 		/* Link into the free list. */
-		obj->siblings.next = (struct ylist_head *)(allocator->freeObjects);
-		allocator->freeObjects = obj;
-		allocator->nFreeObjects++;
+		obj->siblings.next = (struct ylist_head *)(allocator->free_objs);
+		allocator->free_objs = obj;
+		allocator->n_free_objects++;
 	}
 }
 
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_Device *dev)
+void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
 {
 	if(dev->allocator){
 		yaffs_deinit_raw_tnodes(dev);
@@ -390,12 +387,12 @@ void yaffs_deinit_raw_tnodes_and_objs(yaffs_Device *dev)
 		YBUG();
 }
 
-void yaffs_init_raw_tnodes_and_objs(yaffs_Device *dev)
+void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
 {
-	yaffs_Allocator *allocator;
+	struct yaffs_allocator *allocator;
 
 	if(!dev->allocator){
-		allocator = YMALLOC(sizeof(yaffs_Allocator));
+		allocator = YMALLOC(sizeof(struct yaffs_allocator));
 		if(allocator){
 			dev->allocator = allocator;
 			yaffs_init_raw_tnodes(dev);