aboutsummaryrefslogtreecommitdiffstats
path: root/src/defalloc.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-09-28 23:23:51 +0000
committerlloyd <[email protected]>2008-09-28 23:23:51 +0000
commita6f3801debb5239505ec2c9523a7fec5a9bbb070 (patch)
tree51adb7850c2fa18494743274b6767bd9abec957b /src/defalloc.cpp
parentfda3e1b51fbb539e3689e23148be08783afe0e21 (diff)
Move allocator code to secalloc/allocators module
Move paralle hash construction to par_hash module in hash directory
Diffstat (limited to 'src/defalloc.cpp')
-rw-r--r--src/defalloc.cpp98
1 files changed, 0 insertions, 98 deletions
diff --git a/src/defalloc.cpp b/src/defalloc.cpp
deleted file mode 100644
index 5fb8e1447..000000000
--- a/src/defalloc.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************
-* Basic Allocators Source File *
-* (C) 1999-2007 Jack Lloyd *
-*************************************************/
-
-#include <botan/defalloc.h>
-#include <botan/libstate.h>
-#include <botan/util.h>
-#include <cstdlib>
-#include <cstring>
-
-namespace Botan {
-
-namespace {
-
-/*************************************************
-* Perform Memory Allocation *
-*************************************************/
-void* do_malloc(u32bit n, bool do_lock)
- {
- void* ptr = std::malloc(n);
-
- if(!ptr)
- return 0;
-
- if(do_lock)
- lock_mem(ptr, n);
-
- std::memset(ptr, 0, n);
- return ptr;
- }
-
-/*************************************************
-* Perform Memory Deallocation *
-*************************************************/
-void do_free(void* ptr, u32bit n, bool do_lock)
- {
- if(!ptr)
- return;
-
- std::memset(ptr, 0, n);
- if(do_lock)
- unlock_mem(ptr, n);
-
- std::free(ptr);
- }
-
-}
-
-/*************************************************
-* Malloc_Allocator's Allocation *
-*************************************************/
-void* Malloc_Allocator::allocate(u32bit n)
- {
- return do_malloc(n, false);
- }
-
-/*************************************************
-* Malloc_Allocator's Deallocation *
-*************************************************/
-void Malloc_Allocator::deallocate(void* ptr, u32bit n)
- {
- do_free(ptr, n, false);
- }
-
-/*************************************************
-* Locking_Allocator's Allocation *
-*************************************************/
-void* Locking_Allocator::alloc_block(u32bit n)
- {
- return do_malloc(n, true);
- }
-
-/*************************************************
-* Locking_Allocator's Deallocation *
-*************************************************/
-void Locking_Allocator::dealloc_block(void* ptr, u32bit n)
- {
- do_free(ptr, n, true);
- }
-
-/*************************************************
-* Get an allocator *
-*************************************************/
-Allocator* Allocator::get(bool locking)
- {
- std::string type = "";
- if(!locking)
- type = "malloc";
-
- Allocator* alloc = global_state().get_allocator(type);
- if(alloc)
- return alloc;
-
- throw Exception("Couldn't find an allocator to use in get_allocator");
- }
-
-}