diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-08-03 19:01:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-16 15:02:27 +0200 |
| commit | 346ba4bedaaa5fa6a7b76687b749959814685846 (patch) | |
| tree | 1a97b3abc7a7ddf1830cd9c1e359461c0d1a7cfe /tools | |
| parent | tdf#119284 bg for automatic not set while editing (diff) | |
| download | core-346ba4bedaaa5fa6a7b76687b749959814685846.tar.gz core-346ba4bedaaa5fa6a7b76687b749959814685846.zip | |
remove mempool
we've been using the normal memory allocator instead of the sal slab
allocator ever since
commit bc6a5d8e79e7d0e7d75ac107aa8e6aa275e434e9
Date: Wed Nov 15 16:52:44 2017 +0530
Disable custom allocator
Change-Id: I3383962cedb85d56fbec695398901f6ff7057651
Reviewed-on: https://gerrit.libreoffice.org/58577
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Library_tl.mk | 1 | ||||
| -rw-r--r-- | tools/source/memtools/mempool.cxx | 52 |
2 files changed, 0 insertions, 53 deletions
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index c524a38084aa..acd007cc4761 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/inet/inetmime \ tools/source/inet/inetmsg \ tools/source/inet/inetstrm \ - tools/source/memtools/mempool \ tools/source/memtools/multisel \ tools/source/misc/cpuid \ tools/source/misc/extendapplicationenvironment \ diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx deleted file mode 100644 index f38ab6925079..000000000000 --- a/tools/source/memtools/mempool.cxx +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <tools/mempool.hxx> -#include <sal/log.hxx> -#include <rtl/alloc.h> - -#include <stdio.h> - -FixedMemPool::FixedMemPool(char const * pTypeName, sal_uInt16 nTypeSize) - : m_pTypeName (pTypeName) -{ - char name[RTL_CACHE_NAME_LENGTH + 1]; - snprintf (name, sizeof(name), "FixedMemPool_%d", static_cast<int>(nTypeSize)); - m_pImpl = reinterpret_cast<FixedMemPool_Impl*>(rtl_cache_create (name, nTypeSize, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0)); - SAL_INFO("tools.memtools","FixedMemPool::ctor(\"" << m_pTypeName << "\"): " << m_pImpl); -} - -FixedMemPool::~FixedMemPool() -{ - SAL_INFO("tools.memtools","FixedMemPool::dtor(\"" << m_pTypeName << "\"): " << m_pImpl); - rtl_cache_destroy (reinterpret_cast<rtl_cache_type*>(m_pImpl)); - m_pImpl = nullptr; -} - -void* FixedMemPool::Alloc() -{ - return rtl_cache_alloc (reinterpret_cast<rtl_cache_type*>(m_pImpl)); -} - -void FixedMemPool::Free( void* pFree ) -{ - rtl_cache_free (reinterpret_cast<rtl_cache_type*>(m_pImpl), pFree); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |