Missed one file in last checking; Gran allocator alignment decoupled from granule size

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5152 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 118 insertions, 38 deletions

diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/main.cxx b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
index a6a08cdbd..2b9adab11 100644
--- a/NxWidgets/UnitTests/CScrollbarHorizontal/main.cxx
+++ b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// NxWidgets/UnitTests/CScrollbarHorizontal/main.cxx
+// NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
 //
 //   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -73,7 +73,7 @@ static unsigned int g_mmprevious;
 
 // Suppress name-mangling
 
-extern "C" int MAIN_NAME(int argc, char *argv[]);
+extern "C" int cscrollbarhorizontal_main(int argc, char *argv[]);
 
 /////////////////////////////////////////////////////////////////////////////
 // Private Functions
@@ -135,7 +135,7 @@ static void initMemoryUsage(void)
 // Name: user_start/nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
-int MAIN_NAME(int argc, char *argv[])
+int cscrollbarhorizontal_main(int argc, char *argv[])
 {
   // Initialize memory monitor logic
 
@@ -143,50 +143,50 @@ int MAIN_NAME(int argc, char *argv[])
 
   // Create an instance of the checkbox test
 
-  message(MAIN_STRING "Create CScrollbarHorizontalTest instance\n");
+  message("cscrollbarhorizontal_main: Create CScrollbarHorizontalTest instance\n");
   CScrollbarHorizontalTest *test = new CScrollbarHorizontalTest();
   updateMemoryUsage(g_mmprevious, "After creating CScrollbarHorizontalTest");
 
   // Connect the NX server
 
-  message(MAIN_STRING "Connect the CScrollbarHorizontalTest instance to the NX server\n");
+  message("cscrollbarhorizontal_main: Connect the CScrollbarHorizontalTest instance to the NX server\n");
   if (!test->connect())
     {
-      message(MAIN_STRING "Failed to connect the CScrollbarHorizontalTest instance to the NX server\n");
+      message("cscrollbarhorizontal_main: Failed to connect the CScrollbarHorizontalTest instance to the NX server\n");
       delete test;
       return 1;
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After connecting to the server");
+  updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After connecting to the server");
 
   // Create a window to draw into
 
-  message(MAIN_STRING "Create a Window\n");
+  message("cscrollbarhorizontal_main: Create a Window\n");
   if (!test->createWindow())
     {
-      message(MAIN_STRING "Failed to create a window\n");
+      message("cscrollbarhorizontal_main: Failed to create a window\n");
       delete test;
       return 1;
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a window");
+  updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After creating a window");
 
   // Create a scrollbar
 
-  message(MAIN_STRING "Create a Scrollbar\n");
+  message("cscrollbarhorizontal_main: Create a Scrollbar\n");
   CScrollbarHorizontal *scrollbar = test->createScrollbar();
   if (!scrollbar)
     {
-      message(MAIN_STRING "Failed to create a scrollbar\n");
+      message("cscrollbarhorizontal_main: Failed to create a scrollbar\n");
       delete test;
       return 1;
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a scrollbar");
+  updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After creating a scrollbar");
 
   // Set the scrollbar minimum and maximum values
 
   scrollbar->setMinimumValue(0);
   scrollbar->setMaximumValue(MAX_SCROLLBAR);
   scrollbar->setValue(0);
-  message(MAIN_STRING "Scrollbar range %d->%d Initial value %d\n",
+  message("cscrollbarhorizontal_main: Scrollbar range %d->%d Initial value %d\n",
           scrollbar->getMinimumValue(), scrollbar->getMaximumValue(),
           scrollbar->getValue());
 
@@ -201,10 +201,10 @@ int MAIN_NAME(int argc, char *argv[])
     {
       scrollbar->setValue(i);
       test->showScrollbar(scrollbar);
-      message(MAIN_STRING "%d. New value %d\n", i, scrollbar->getValue());
+      message("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue());
       usleep(1000); // The simulation needs this to let the X11 event loop run
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After moving the scrollbar up");
+  updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar up");
 
   // And move the scrollbar down
 
@@ -212,15 +212,15 @@ int MAIN_NAME(int argc, char *argv[])
     {
       scrollbar->setValue(i);
       test->showScrollbar(scrollbar);
-      message(MAIN_STRING "%d. New value %d\n", i, scrollbar->getValue());
+      message("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue());
       usleep(1000); // The simulation needs this to let the X11 event loop run
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After moving the scrollbar down");
+  updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar down");
   sleep(1);
 
   // Clean up and exit
 
-  message(MAIN_STRING "Clean-up and exit\n");
+  message("cscrollbarhorizontal_main: Clean-up and exit\n");
   delete scrollbar;
   updateMemoryUsage(g_mmprevious, "After deleting the scrollbar");
   delete test;
diff --git a/nuttx/include/nuttx/gran.h b/nuttx/include/nuttx/gran.h
index f3a6d0fe9..5390618a3 100644
--- a/nuttx/include/nuttx/gran.h
+++ b/nuttx/include/nuttx/gran.h
@@ -90,9 +90,32 @@ extern "C" {
  *
  * Description:
  *   Set up one granule allocator instance.  Allocations will be aligned to
- *   the granule size; allocations will be in units of the granule size.
- *   Larger granules will give better performance and less overhead but more
- *   losses of memory due to alignment and quantization waste.
+ *   the alignment size (log2align; allocations will be in units of the
+ *   granule size (log2gran). Larger granules will give better performance
+ *   and less overhead but more losses of memory due to alignment
+ *   quantization waste.  Additional memory waste can occur form alignment;
+ *   log2align should be set to 0 unless you are using the granule allocator
+ *   to manage DMA memory and your hardware has specific memory alignment
+ *   requirements.
+ *
+ *   Geneneral Usage Summary.  This is an example using the GCC section
+ *   attribute to position a DMA heap in memory (logic in the linker script
+ *   would assign the section .dmaheap to the DMA memory.
+ *
+ *     FAR uint32_t g_dmaheap[DMAHEAP_SIZE] __attribute__((section(.dmaheap)));
+ *
+ *   The heap is created by calling gran_initialize.  Here the granual size
+ *   is set to 64 bytes and the alignment to 16 bytes:
+ *
+ *     GRAN_HANDLE handle = gran_initialize(g_dmaheap, DMAHEAP_SIZE, 6, 4);
+ *
+ *   Then the GRAN_HANDLE can be used to allocate memory (There is no
+ *   GRAN_HANDLE if CONFIG_GRAN_SINGLE=y):
+ *
+ *     FAR uint8_t *dma_memory = (FAR uint8_t *)gran_alloc(handle, 47);
+ *
+ *   The actual memory allocates will be 64 byte (wasting 17 bytes) and
+ *   will be aligned at least to (1 << log2align).
  *
  *   NOTE: The current implementation also restricts the maximum allocation
  *   size to 32 granules.  That restriction could be eliminated with some
@@ -102,7 +125,13 @@ extern "C" {
  *   heapstart - Start of the granule allocation heap
  *   heapsize  - Size of heap in bytes
  *   log2gran  - Log base 2 of the size of one granule.  0->1 byte,
- *               1->2 bytes, 2->4 bytes, 3-> 8bytes, etc.
+ *               1->2 bytes, 2->4 bytes, 3-> 8 bytes, etc.
+ *   log2align - Log base 2 of required alignment.  0->1 byte,
+ *               1->2 bytes, 2->4 bytes, 3-> 8 bytes, etc.  Note that
+ *               log2gran must be greater than or equal to log2align
+ *               so that all contiguous granules in memory will meet
+ *               the minimum alignment requirement. A value of zero
+ *               would mean that no alignment is required.
  *
  * Returned Value:
  *   On success, a non-NULL handle is returned that may be used with other
@@ -112,10 +141,10 @@ extern "C" {
 
 #ifdef CONFIG_GRAN_SINGLE
 EXTERN int gran_initialize(FAR void *heapstart, size_t heapsize,
-                           uint8_t log2gran);
+                           uint8_t log2gran, uint8_t log2align);
 #else
 EXTERN GRAN_HANDLE gran_initialize(FAR void *heapstart, size_t heapsize,
-                                   uint8_t log2gran);
+                                   uint8_t log2gran, uint8_t log2align);
 #endif
 
 /****************************************************************************
diff --git a/nuttx/mm/mm_graninit.c b/nuttx/mm/mm_graninit.c
index cde2370d0..16cebdcf3 100644
--- a/nuttx/mm/mm_graninit.c
+++ b/nuttx/mm/mm_graninit.c
@@ -78,7 +78,13 @@ FAR struct gran_s *g_graninfo;
  *   heapstart - Start of the granule allocation heap
  *   heapsize  - Size of heap in bytes
  *   log2gran  - Log base 2 of the size of one granule.  0->1 byte,
- *               1->2 bytes, 2->4 bytes, 3-> 8bytes, etc.
+ *               1->2 bytes, 2->4 bytes, 3-> 8 bytes, etc.
+ *   log2align - Log base 2 of required alignment.  0->1 byte,
+ *               1->2 bytes, 2->4 bytes, 3-> 8 bytes, etc.  Note that
+ *               log2gran must be greater than or equal to log2align
+ *               so that all contiguous granules in memory will meet
+ *               the minimum alignment requirement. A value of zero
+ *               would mean that no alignment is required.
  *
  * Returned Value:
  *   On success, a non-NULL info structure is returned that may be used with
@@ -86,9 +92,9 @@ FAR struct gran_s *g_graninfo;
  *
  ****************************************************************************/
 
-static inline FAR struct gran_s *gran_common_initialize(FAR void *heapstart,
-                                                        size_t heapsize,
-                                                        uint8_t log2gran)
+static inline FAR struct gran_s *
+gran_common_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran,
+                       uint8_t log2align)
 {
   FAR struct gran_s *priv;
   uintptr_t          heapend;
@@ -97,13 +103,24 @@ static inline FAR struct gran_s *gran_common_initialize(FAR void *heapstart,
   unsigned int       alignedsize;
   unsigned int       ngranules;
 
-  DEBUGASSERT(heapstart && heapsize > 0 && log2gran > 0 && log2gran < 32);
+  /* Check parameters if debug is on.  Note the the size of a granual is
+   * limited to 2**31 bytes and that the size of the granule must be greater
+   * than the alignment size.
+   */
+
+  DEBUGASSERT(heapstart && heapsize > 0 &&
+              log2gran > 0 && log2gran < 32 &&
+              log2gran > log2align);
+
+  /* Get the aligned start of the heap */
 
+  mask         = (1 << log2align) - 1;
+  alignedstart = ((uintptr_t)heapstart + mask) & ~mask;
+  
   /* Determine the number of granules */
 
   mask         = (1 << log2gran) - 1;
   heapend      = (uintptr_t)heapstart + heapsize;
-  alignedstart = ((uintptr_t)heapstart + mask) & ~mask;
   alignedsize  = (heapend - alignedstart) & ~mask;
   ngranules    = alignedsize >> log2gran;
 
@@ -139,9 +156,32 @@ static inline FAR struct gran_s *gran_common_initialize(FAR void *heapstart,
  *
  * Description:
  *   Set up one granule allocator instance.  Allocations will be aligned to
- *   the granule size; allocations will be in units of the granule size.
- *   Larger granules will give better performance and less overhead but more
- *   losses of memory due to alignment and quantization waste.
+ *   the alignment size (log2align; allocations will be in units of the
+ *   granule size (log2gran). Larger granules will give better performance
+ *   and less overhead but more losses of memory due to alignment
+ *   quantization waste.  Additional memory waste can occur form alignment;
+ *   log2align should be set to 0 unless you are using the granule allocator
+ *   to manage DMA memory and your hardware has specific memory alignment
+ *   requirements.
+ *
+ *   Geneneral Usage Summary.  This is an example using the GCC section
+ *   attribute to position a DMA heap in memory (logic in the linker script
+ *   would assign the section .dmaheap to the DMA memory.
+ *
+ *     FAR uint32_t g_dmaheap[DMAHEAP_SIZE] __attribute__((section(.dmaheap)));
+ *
+ *   The heap is created by calling gran_initialize().  Here the granual size
+ *   is set to 64 bytes (2**6) and the alignment to 16 bytes (2**4):
+ *
+ *     GRAN_HANDLE handle = gran_initialize(g_dmaheap, DMAHEAP_SIZE, 6, 4);
+ *
+ *   Then the GRAN_HANDLE can be used to allocate memory (There is no
+ *   GRAN_HANDLE if CONFIG_GRAN_SINGLE=y):
+ *
+ *     FAR uint8_t *dma_memory = (FAR uint8_t *)gran_alloc(handle, 47);
+ *
+ *   The actual memory allocates will be 64 byte (wasting 17 bytes) and
+ *   will be aligned at least to (1 << log2align).
  *
  *   NOTE: The current implementation also restricts the maximum allocation
  *   size to 32 granules.  That restriction could be eliminated with some
@@ -151,7 +191,13 @@ static inline FAR struct gran_s *gran_common_initialize(FAR void *heapstart,
  *   heapstart - Start of the granule allocation heap
  *   heapsize  - Size of heap in bytes
  *   log2gran  - Log base 2 of the size of one granule.  0->1 byte,
- *               1->2 bytes, 2->4 bytes, 3-> 8bytes, etc.
+ *               1->2 bytes, 2->4 bytes, 3-> 8 bytes, etc.
+ *   log2align - Log base 2 of required alignment.  0->1 byte,
+ *               1->2 bytes, 2->4 bytes, 3-> 8 bytes, etc.  Note that
+ *               log2gran must be greater than or equal to log2align
+ *               so that all contiguous granules in memory will meet
+ *               the minimum alignment requirement. A value of zero
+ *               would mean that no alignment is required.
  *
  * Returned Value:
  *   On success, a non-NULL handle is returned that may be used with other
@@ -160,9 +206,12 @@ static inline FAR struct gran_s *gran_common_initialize(FAR void *heapstart,
  ****************************************************************************/
 
 #ifdef CONFIG_GRAN_SINGLE
+int gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran,
+                    uint8_t log2align)
 int gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran)
 {
-  g_graninfo = gran_common_initialize(heapstart, heapsize, log2gran);
+  g_graninfo = gran_common_initialize(heapstart, heapsize, log2gran,
+                                      log2align);
   if (!g_graninfo)
     {
       return -ENOMEM;
@@ -171,9 +220,11 @@ int gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran)
   return OK;
 }
 #else
-GRAN_HANDLE gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran)
+GRAN_HANDLE gran_initialize(FAR void *heapstart, size_t heapsize,
+                            uint8_t log2gran, uint8_t log2align)
 {
-  return (GRAN_HANDLE)gran_common_initialize(heapstart, heapsize, log2gran);
+  return (GRAN_HANDLE)gran_common_initialize(heapstart, heapsize,
+                                             log2gran, log2align);
 }
 #endif