Changeset 578:f375bbe921b8

Timestamp:

06/04/08 22:06:55 (7 months ago)

Author:

David Anderson <dave@…>

Branch:

default

Message:

Make the TLSF memory allocator into a library.

Location:

nxos

Files:

• base/lib/memalloc/_tlsf.c.inc (moved) (moved from nxos/base/_tlsf.c.inc) (6 diffs)
• base/lib/memalloc/_tlsf.h (moved) (moved from nxos/base/_tlsf.h)
• base/lib/memalloc/memalloc.c (moved) (moved from nxos/base/memalloc.c) (2 diffs)
• base/lib/memalloc/memalloc.h (moved) (moved from nxos/base/memalloc.h) (1 diff)
• systems/marvin/main.c (modified) (2 diffs)
• systems/marvin/scheduler.c (modified) (3 diffs)
• systems/marvin/semaphore.c (modified) (2 diffs)

nxos/base/lib/memalloc/_tlsf.c.inc

@@ -1 @@
-/* 
+/*
  * Two Levels Segregate Fit memory allocator (TLSF)
  * Version 2.3.2
@@ -24 +24 @@
  * - Add 64 bit support. It now runs on x86_64 and solaris64.
  * - I also tested this on vxworks/32and solaris/32 and i386/32 processors.
- * - Remove assembly code. I could not measure any performance difference 
+ * - Remove assembly code. I could not measure any performance difference
  *   on my core2 processor. This also makes the code more portable.
  * - Moved defines/typedefs from tlsf.h to tlsf.c
- * - Changed MIN_BLOCK_SIZE to sizeof (free_ptr_t) and BHDR_OVERHEAD to 
- *   (sizeof (bhdr_t) - MIN_BLOCK_SIZE). This does not change the fact 
- *    that the minumum size is still sizeof 
+ * - Changed MIN_BLOCK_SIZE to sizeof (free_ptr_t) and BHDR_OVERHEAD to
+ *   (sizeof (bhdr_t) - MIN_BLOCK_SIZE). This does not change the fact
+ *    that the minumum size is still sizeof
  *   (bhdr_t).
  * - Changed all C++ comment style to C style. (// -> /.* ... *./)
- * - Used ls_bit instead of ffs and ms_bit instead of fls. I did this to 
- *   avoid confusion with the standard ffs function which returns 
+ * - Used ls_bit instead of ffs and ms_bit instead of fls. I did this to
+ *   avoid confusion with the standard ffs function which returns
  *   different values.
- * - Created set_bit/clear_bit fuctions because they are not present 
+ * - Created set_bit/clear_bit fuctions because they are not present
  *   on x86_64.
  * - Added locking support + extra file target.h to show how to use it.
@@ -42 +42 @@
  * - Implemented realloc clever support.
  * - Added some test code in the example directory.
- *        
- *
- * (Oct 23 2006) Adam Scislowicz: 
+ *
+ *
+ * (Oct 23 2006) Adam Scislowicz:
  *
  * - Support for ARMv5 implemented
@@ -63 +63 @@
 #endif
 
-#include "_tlsf.h"
+#include "base/lib/memalloc/_tlsf.h"
 
 #if !defined(__GNUC__)
@@ -404 +404 @@
 /******************************************************************/
 void *rtl_realloc(void *ptr, size_t size) {
-/******************************************************************/   
+/******************************************************************/
     void *ret;
 #if TLSF_USE_LOCKS
@@ -420 +420 @@
 /******************************************************************/
 void *rtl_calloc(size_t nelem, size_t elem_size) {
-/******************************************************************/   
+/******************************************************************/
     void *ret;
 #if TLSF_USE_LOCKS

nxos/base/lib/memalloc/memalloc.c

@@ -12 +12 @@
 #include "base/util.h"
 
-#include "base/memalloc.h"
+#include "base/lib/memalloc/memalloc.h"
 
 /* This is really ugly and I should be taken out and shot for even doing
@@ -19 +19 @@
  * the calls to TLSF.
  */
-#include "base/_tlsf.h"
+#include "base/lib/memalloc/_tlsf.h"
 #define printf(fmt, ...) /* Nothing, we don't printf. */
-#include "base/_tlsf.c.inc"
+#include "base/lib/memalloc/_tlsf.c.inc"
 
 inline void nx_memalloc_init_full(void *mem_pool, U32 mem_pool_size) {

nxos/base/lib/memalloc/memalloc.h

@@ -16 +16 @@
 #include "base/types.h"
 
-/** @addtogroup kernel */
+/** @addtogroup lib */
 /*@{*/
 
-/** @defgroup memalloc Memory allocation
+/** @defgroup memalloc Memory allocator library
  *
- * The NxOS baseplate optionally provides the TLSF memory allocator for
- * use by application kernels. The TLSF allocator performs all
- * allocation functions in constant (O(1)) time, and is optimized to
- * minimize fragmentation, making it ideal for low resource embedded
+ * This optional library provides the TLSF memory allocator to
+ * application kernels. The TLSF allocator performs all allocation
+ * functions in constant (O(1)) time and is optimized to minimize
+ * memory fragmentation, making it ideal for low resource embedded
  * systems such as the NXT.
- *
- * No parts of the baseplate uses the allocator, so if you do not want
- * or need it, it will not be compiled into your application kernel.
  *
  * @note If you do want to use the allocator, you will first need to

nxos/systems/marvin/main.c

@@ -1 @@
-/* Copyright (C) 2007 the NxOS developers
+/* Copyright (c) 2007,2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -9 +9 @@
 #include "base/types.h"
 #include "base/display.h"
-#include "base/memalloc.h"
+#include "base/lib/memalloc/memalloc.h"
 #include "base/drivers/systick.h"
 #include "base/drivers/sound.h"

nxos/systems/marvin/scheduler.c

@@ -1 @@
-/* Copyright (C) 2007 the NxOS developers
+/* Copyright (c) 2007,2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -8 +8 @@
 
 #include "base/core.h"
-#include "base/memalloc.h"
 #include "base/assert.h"
 #include "base/interrupts.h"
@@ -14 +13 @@
 #include "base/drivers/systick.h"
 #include "base/drivers/avr.h"
+#include "base/lib/memalloc/memalloc.h"
 
 #include "marvin/_task.h"

nxos/systems/marvin/semaphore.c

@@ -1 @@
-/* Copyright (C) 2007 the NxOS developers
+/* Copyright (c) 2007,2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -9 +9 @@
 #include "base/types.h"
 #include "base/assert.h"
-#include "base/memalloc.h"
 #include "base/display.h"
+#include "base/lib/memalloc/memalloc.h"
 
 #include "marvin/list.h"