-Index: libtorrent-0.12.6_r1209/rak/allocators.h
-===================================================================
---- libtorrent-0.12.6_r1209.orig/rak/allocators.h 2010-11-10 12:40:28.000000000 +0100
-+++ libtorrent-0.12.6_r1209/rak/allocators.h 2011-04-13 16:33:28.179339669 +0200
-@@ -74,17 +74,13 @@
- size_type max_size () const throw() { return std::numeric_limits<size_t>::max() / sizeof(T); }
-
- pointer allocate(size_type num, const_void_pointer hint = 0) { return alloc_size(num*sizeof(T)); }
-+ void deallocate (pointer p, size_type num) { dealloc_size(p, num*sizeof(T)); }
-
-- static pointer alloc_size(size_type size) {
-- pointer ptr = NULL;
-- int __UNUSED result = posix_memalign((void**)&ptr, LT_SMP_CACHE_BYTES, size);
--
-- return ptr;
-- }
-+ static pointer alloc_size(size_type size);
-+ static void dealloc_size(pointer p, size_type size);
-
- void construct (pointer p, const T& value) { new((void*)p)T(value); }
- void destroy (pointer p) { p->~T(); }
-- void deallocate (pointer p, size_type num) { free((void*)p); }
- };
-
-
-@@ -98,6 +94,36 @@
- return false;
- }
-
-+template <class T>
-+inline typename cacheline_allocator<T>::pointer cacheline_allocator<T>::alloc_size(size_type size) {
-+ pointer ptr;
-+
-+#if HAVE_POSIX_MEMALIGN
-+ if (posix_memalign((void**)&ptr, LT_SMP_CACHE_BYTES, size))
-+ return NULL;
-+#else
-+ char* org = (char*)malloc(size + sizeof(void*) + LT_SMP_CACHE_BYTES - 1);
-+ if (org == NULL)
-+ return NULL;
-+
-+ ptr = (pointer)((uintptr_t)(org + LT_SMP_CACHE_BYTES - 1) & ~(LT_SMP_CACHE_BYTES - 1));
-+
-+ // store originally allocated pointer for later free() at the end of the allocated data
-+ *(void**)((char*)ptr + size) = org;
-+#endif
-+
-+ return ptr;
-+}
-+
-+template <class T>
-+inline void cacheline_allocator<T>::dealloc_size(pointer p, size_type size) {
-+#if HAVE_POSIX_MEMALIGN
-+ free(p);
-+#else
-+ free(*(void**)((char*)p + size));
-+#endif
-+}
-+
- }
-
- //
projects / openwrt / svn-archive / archive.git / commitdiff