diff options
| -rw-r--r-- | demos/AVR-AT90CANx-GCC/chconf.h | 4 | ||||
| -rw-r--r-- | demos/AVR-ATmega128-GCC/chconf.h | 4 | ||||
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/chconf.h | 4 | ||||
| -rw-r--r-- | src/chpools.c | 121 | ||||
| -rw-r--r-- | src/include/ch.h | 2 | ||||
| -rw-r--r-- | src/include/mempools.h | 53 |
6 files changed, 181 insertions, 7 deletions
diff --git a/demos/AVR-AT90CANx-GCC/chconf.h b/demos/AVR-AT90CANx-GCC/chconf.h index 182ba1a9b..bd9c528d2 100644 --- a/demos/AVR-AT90CANx-GCC/chconf.h +++ b/demos/AVR-AT90CANx-GCC/chconf.h @@ -139,11 +139,11 @@ /** Configuration option: if specified then the memory pools allocator APIs
* are included in the kernel.*/
-#define CH_USE_MEMPOOLS
+//#define CH_USE_MEMPOOLS
/** Configuration option: if specified then the memory pools allocator
provides an implementation of the sbrk() function.*/
-#define CH_MEMPOOLS_PROVIDE_SBRK
+//#define CH_MEMPOOLS_PROVIDE_SBRK
/** Configuration option: Frequency of the system timer that drives the system
* ticks. This also defines the system time unit.*/
diff --git a/demos/AVR-ATmega128-GCC/chconf.h b/demos/AVR-ATmega128-GCC/chconf.h index 182ba1a9b..bd9c528d2 100644 --- a/demos/AVR-ATmega128-GCC/chconf.h +++ b/demos/AVR-ATmega128-GCC/chconf.h @@ -139,11 +139,11 @@ /** Configuration option: if specified then the memory pools allocator APIs
* are included in the kernel.*/
-#define CH_USE_MEMPOOLS
+//#define CH_USE_MEMPOOLS
/** Configuration option: if specified then the memory pools allocator
provides an implementation of the sbrk() function.*/
-#define CH_MEMPOOLS_PROVIDE_SBRK
+//#define CH_MEMPOOLS_PROVIDE_SBRK
/** Configuration option: Frequency of the system timer that drives the system
* ticks. This also defines the system time unit.*/
diff --git a/demos/MSP430-MSP430x1611-GCC/chconf.h b/demos/MSP430-MSP430x1611-GCC/chconf.h index 336c0d6b0..521aae128 100644 --- a/demos/MSP430-MSP430x1611-GCC/chconf.h +++ b/demos/MSP430-MSP430x1611-GCC/chconf.h @@ -140,11 +140,11 @@ /** Configuration option: if specified then the memory pools allocator APIs
* are included in the kernel.*/
-#define CH_USE_MEMPOOLS
+//#define CH_USE_MEMPOOLS
/** Configuration option: if specified then the memory pools allocator
provides an implementation of the sbrk() function.*/
-#define CH_MEMPOOLS_PROVIDE_SBRK
+//#define CH_MEMPOOLS_PROVIDE_SBRK
/** Configuration option: Frequency of the system timer that drives the system
* ticks. This also defines the system time unit.*/
diff --git a/src/chpools.c b/src/chpools.c new file mode 100644 index 000000000..5b714a73e --- /dev/null +++ b/src/chpools.c @@ -0,0 +1,121 @@ +/*
+ ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
+
+ This file is part of ChibiOS/RT.
+
+ ChibiOS/RT is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ ChibiOS/RT is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @addtogroup MemoryPools
+ * @{
+ */
+
+#include <ch.h>
+
+#ifdef CH_USE_MEMPOOLS
+
+#ifndef CH_MEMPOOLS_PROVIDE_SBRK
+#include <unistd.h>
+#else
+/*
+ * Optional internal sbrk() implementation, this code requires the linker to
+ * provide two symbols: __heap_base__ and __heap_end__ that are the boundaries
+ * of the free RAM space.
+ */
+extern char __heap_base__;
+extern char __heap_end__;
+static char *current = &__heap_base__;
+
+void *sbrk(ptrdiff_t increment) {
+ char *cp;
+
+ if (current + increment >= &__heap_end__)
+ return (void *)-1;
+ cp = current;
+ current += increment;
+ return cp;
+}
+#endif /* CH_MEMPOOLS_PROVIDE_SBRK */
+
+/**
+ * Initializes a memory pool.
+ * @param mp pointer to a \p MemoryPool structure
+ * @param size the size of the objects contained in this memory pool
+ */
+void chPoolInit(MemoryPool *mp, size_t size) {
+
+ chDbgAssert((mp != NULL) && (size >= sizeof(void *)),
+ "chpools.c, chPoolFree()");
+
+ mp->mp_next = NULL;
+ mp->mp_object_size = size;
+}
+
+/**
+ * Allocates an object from a memory pool.
+ * @param mp pointer to a \p MemoryPool structure
+ * @param allow_growth if \p TRUE then the object is allocated by using
+ * \p sbrk() in case the memory pool is empty
+ * @return the pointer to the allocated object or \p NULL if the memory is
+ * exhausted
+ */
+void *chPoolAlloc(MemoryPool *mp, bool_t allow_growth) {
+ void *p;
+
+ chDbgAssert(mp != NULL, "chpools.c, chPoolAlloc()");
+
+ chSysLock();
+
+ if (mp->mp_next == NULL) {
+ if (allow_growth) {
+ p = sbrk(mp->mp_object_size);
+
+ chSysUnlock();
+ if (p != (void *)-1)
+ return p;
+ }
+ return NULL;
+ }
+ p = mp->mp_next;
+ mp->mp_next = mp->mp_next->ph_next;
+
+ chSysUnlock();
+ return p;
+}
+
+/**
+ * Releases (or adds) an object to a memory pool.
+ * @param mp pointer to a \p MemoryPool structure
+ * @param objp the pointer to the object to be released or added
+ * @note the object is assumed to be of the right size for the specified
+ * buffer.
+ */
+void chPoolFree(MemoryPool *mp, void *objp) {
+ struct pool_header *php = objp;
+
+ chDbgAssert((mp != NULL) && (objp != NULL),
+ "chpools.c, chPoolFree()");
+
+ chSysLock();
+
+ php->ph_next = mp->mp_next;
+ mp->mp_next = php;
+
+ chSysUnlock();
+}
+
+#endif /* CH_USE_MEMPOOLS */
+
+/** @} */
diff --git a/src/include/ch.h b/src/include/ch.h index e88435db8..18b766b9a 100644 --- a/src/include/ch.h +++ b/src/include/ch.h @@ -42,7 +42,7 @@ #include "sleep.h"
#include "queues.h"
#include "serial.h"
-#include "pools.h"
+#include "mempools.h"
#include "debug.h"
/*
diff --git a/src/include/mempools.h b/src/include/mempools.h new file mode 100644 index 000000000..12edf97fe --- /dev/null +++ b/src/include/mempools.h @@ -0,0 +1,53 @@ +/*
+ ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
+
+ This file is part of ChibiOS/RT.
+
+ ChibiOS/RT is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ ChibiOS/RT is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @addtogroup MemoryPools
+ * @{
+ */
+
+#ifndef _MEMPOOLS_H_
+#define _MEMPOOLS_H_
+
+#ifdef CH_USE_MEMPOOLS
+
+struct pool_header {
+ struct pool_header *ph_next;
+};
+
+typedef struct {
+ struct pool_header *mp_next;
+ size_t mp_object_size;
+} MemoryPool;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ void chPoolInit(MemoryPool *mp, size_t size);
+ void *chPoolAlloc(MemoryPool *mp, bool_t grow);
+ void chPoolFree(MemoryPool *mp, void *objp);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CH_USE_MEMPOOLS */
+
+#endif /* _MEMPOOLS_H_ */
+
+/** @} */
|