From a6f3801debb5239505ec2c9523a7fec5a9bbb070 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Sun, 28 Sep 2008 23:23:51 +0000
Subject: Move allocator code to secalloc/allocators module

Move paralle hash construction to par_hash module in hash directory
---
 src/defalloc.cpp | 98 --------------------------------------------------------
 1 file changed, 98 deletions(-)
 delete mode 100644 src/defalloc.cpp

(limited to 'src/defalloc.cpp')

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");
-   }
-
-}
-- 
cgit v1.2.3