#ifndef CYCRIPT_POOLING_HPP
#define CYCRIPT_POOLING_HPP
-#include <apr_pools.h>
-#include <apr_strings.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#include <algorithm>
+
+#include <stdint.h>
#include "Exception.hpp"
#include "Local.hpp"
#include "Standard.hpp"
-#include <cstdlib>
-
-_finline void *operator new(size_t size, apr_pool_t *pool) {
- return apr_palloc(pool, size);
-}
-
-_finline void *operator new [](size_t size, apr_pool_t *pool) {
- return apr_palloc(pool, size);
-}
+class CYPool;
+_finline void *operator new(size_t size, CYPool &pool);
+_finline void *operator new [](size_t size, CYPool &pool);
class CYPool {
private:
- apr_pool_t *pool_;
+ uint8_t *data_;
+ size_t size_;
+
+ struct Cleaner {
+ Cleaner *next_;
+ void (*code_)(void *);
+ void *data_;
+
+ Cleaner(Cleaner *next, void (*code)(void *), void *data) :
+ next_(next),
+ code_(code),
+ data_(data)
+ {
+ }
+ } *cleaner_;
+
+ static _finline size_t align(size_t size) {
+ // XXX: alignment is more complex than this
+ return (size + 7) & ~0x3;
+ }
+
+ template <typename Type_>
+ static void delete_(void *data) {
+ reinterpret_cast<Type_ *>(data)->~Type_();
+ }
+
+ CYPool(const CYPool &);
public:
- CYPool() {
- _aprcall(apr_pool_create(&pool_, NULL));
+ CYPool() :
+ data_(NULL),
+ size_(0),
+ cleaner_(NULL)
+ {
}
~CYPool() {
- apr_pool_destroy(pool_);
+ for (Cleaner *cleaner(cleaner_); cleaner != NULL; ) {
+ Cleaner *next(cleaner->next_);
+ (*cleaner->code_)(cleaner->data_);
+ cleaner = next;
+ }
+ }
+
+ template <typename Type_>
+ Type_ *malloc(size_t size) {
+ size = align(size);
+
+ if (size > size_) {
+ // XXX: is this an optimal malloc size?
+ size_ = std::max<size_t>(size, size + align(sizeof(Cleaner)));
+ data_ = reinterpret_cast<uint8_t *>(::malloc(size_));
+ atexit(free, data_);
+ _assert(size <= size_);
+ }
+
+ void *data(data_);
+ data_ += size;
+ size_ -= size;
+ return reinterpret_cast<Type_ *>(data);
+ }
+
+ char *strdup(const char *data) {
+ if (data == NULL)
+ return NULL;
+ return reinterpret_cast<char *>(memdup(data, strlen(data) + 1));
+ }
+
+ void *memdup(const void *data, size_t size) {
+ void *copy(malloc<void>(size));
+ memcpy(copy, data, size);
+ return copy;
+ }
+
+ char *strndup(const char *data, size_t size) const {
+ return strmemdup(data, strnlen(data, size));
}
- void Clear() {
- apr_pool_clear(pool_);
+ char *strmemdup(const char *data, size_t size) const {
+ char *copy(new char[size + 1]);
+ memcpy(copy, data, size);
+ copy[size] = '\0';
+ return copy;
}
- operator apr_pool_t *() const {
- return pool_;
+ // XXX: this could be made much more efficient
+ __attribute__((__sentinel__))
+ char *strcat(const char *data, ...) {
+ size_t size(strlen(data)); {
+ va_list args;
+ va_start(args, data);
+
+ while (const char *arg = va_arg(args, const char *))
+ size += strlen(arg);
+
+ va_end(args);
+ }
+
+ char *copy(malloc<char>(size + 1)); {
+ va_list args;
+ va_start(args, data);
+
+ size_t offset(strlen(data));
+ memcpy(copy, data, offset);
+
+ while (const char *arg = va_arg(args, const char *)) {
+ size_t size(strlen(arg));
+ memcpy(copy + offset, arg, size);
+ offset += size;
+ }
+
+ va_end(args);
+ }
+
+ copy[size] = '\0';
+ return copy;
+ }
+
+ // XXX: most people using this might should use sprintf
+ char *itoa(long value) {
+ return sprintf(16, "%ld", value);
}
- char *operator ()(const char *data) const {
- return apr_pstrdup(pool_, data);
+ __attribute__((__format__(__printf__, 3, 4)))
+ char *sprintf(size_t size, const char *format, ...) {
+ va_list args;
+ va_start(args, format);
+ char *copy(vsprintf(size, format, args));
+ va_end(args);
+ return copy;
}
- char *operator ()(const char *data, size_t size) const {
- return apr_pstrndup(pool_, data, size);
+ char *vsprintf(size_t size, const char *format, va_list args) {
+ va_list copy;
+ va_copy(copy, args);
+ char buffer[size];
+ int writ(vsnprintf(buffer, size, format, copy));
+ va_end(copy);
+ _assert(writ >= 0);
+
+ if (size_t(writ) >= size)
+ return vsprintf(writ + 1, format, args);
+ return strmemdup(buffer, writ);
+ }
+
+ void atexit(void (*code)(void *), void *data = NULL);
+
+ template <typename Type_>
+ Type_ &object() {
+ Type_ *value(new(*this) Type_());
+ atexit(&delete_<Type_>, value);
+ return *value;
}
};
+_finline void *operator new(size_t size, CYPool &pool) {
+ return pool.malloc<void>(size);
+}
+
+_finline void *operator new [](size_t size, CYPool &pool) {
+ return pool.malloc<void>(size);
+}
+
+_finline void CYPool::atexit(void (*code)(void *), void *data) {
+ cleaner_ = new(*this) Cleaner(cleaner_, code, data);
+}
+
struct CYData {
- apr_pool_t *pool_;
+ CYPool *pool_;
unsigned count_;
CYData() :
{
}
+ CYData(CYPool &pool) :
+ pool_(&pool),
+ count_(_not(unsigned))
+ {
+ }
+
virtual ~CYData() {
}
- static void *operator new(size_t size, apr_pool_t *pool) {
- void *data(apr_palloc(pool, size));
- reinterpret_cast<CYData *>(data)->pool_ = pool;
+ static void *operator new(size_t size, CYPool &pool) {
+ void *data(pool.malloc<void>(size));
+ reinterpret_cast<CYData *>(data)->pool_ = &pool;
return data;
}
static void *operator new(size_t size) {
- apr_pool_t *pool;
- _aprcall(apr_pool_create(&pool, NULL));
- return operator new(size, pool);
+ return operator new(size, *new CYPool());
}
static void operator delete(void *data) {
- apr_pool_destroy(reinterpret_cast<CYData *>(data)->pool_);
+ delete reinterpret_cast<CYData *>(data)->pool_;
}
};
template <typename Type_>
struct CYPoolAllocator {
- apr_pool_t *pool_;
+ CYPool *pool_;
typedef Type_ value_type;
typedef value_type *pointer;
}
pointer allocate(size_type size, const void *hint = 0) {
- return reinterpret_cast<pointer>(apr_palloc(pool_, size));
+ return pool_->malloc<value_type>(size);
}
void deallocate(pointer data, size_type size) {
public CYPool
{
private:
- CYLocal<apr_pool_t> local_;
+ CYLocal<CYPool> local_;
public:
CYLocalPool() :
CYPool(),
- local_(operator apr_pool_t *())
+ local_(this)
{
}
};
#define $pool \
- CYLocal<apr_pool_t>::Get()
+ (*CYLocal<CYPool>::Get())
#endif/*CYCRIPT_POOLING_HPP*/
projects / cycript.git / blobdiff