summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2022-08-17 12:59:51 +0200
committerAndras Timar <andras.timar@collabora.com>2022-08-28 14:00:18 +0200
commit612fc2f6e7065473833b4aac8ea76ec2bffdfd62 (patch)
tree8d1f45d41872d3ab94779db8a507538c660d69a5 /external
parent9662729a1ea4ca7fe8bbbcb5193a6eeb97ff8ac6 (diff)
tdf#150452: Revert "tdf#130795 use concurrent hashmap in SharedStringPool"
This commit reverts 3749d9af3745c0eaff7239e379578e4e2af89e9d which removes the dependency on the external library cuckoo Without using cuckoo the same file in tdf#130795 takes real 0m4,892s user 0m5,298s sys 0m0,449s With it, it takes real 0m4,914s user 0m5,276s sys 0m0,444s pretty much the same time Change-Id: I4cc9000ac5bf26de22bb9835283ae8d5b3230196 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138435 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138446
Diffstat (limited to 'external')
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/cuckoo/Makefile7
-rw-r--r--external/cuckoo/Module_cuckoo.mk16
-rw-r--r--external/cuckoo/README3
-rw-r--r--external/cuckoo/UnpackedTarball_cuckoo.mk22
-rw-r--r--external/cuckoo/cuckoo-coverity.patch22
6 files changed, 0 insertions, 71 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 4e1a04ccc317..f5c55cf716b4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -106,7 +106,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \
$(call gb_Helper_optional,ZMF,libzmf) \
- $(call gb_Helper_optional,CUCKOO,cuckoo) \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/cuckoo/Makefile b/external/cuckoo/Makefile
deleted file mode 100644
index e4968cf85fb6..000000000000
--- a/external/cuckoo/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/cuckoo/Module_cuckoo.mk b/external/cuckoo/Module_cuckoo.mk
deleted file mode 100644
index d2fda7b1e286..000000000000
--- a/external/cuckoo/Module_cuckoo.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,cuckoo))
-
-$(eval $(call gb_Module_add_targets,cuckoo,\
- UnpackedTarball_cuckoo \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/cuckoo/README b/external/cuckoo/README
deleted file mode 100644
index 6b8c98342173..000000000000
--- a/external/cuckoo/README
+++ /dev/null
@@ -1,3 +0,0 @@
-A high-performance, concurrent hash table
-
-[https://github.com/efficient/libcuckoo] \ No newline at end of file
diff --git a/external/cuckoo/UnpackedTarball_cuckoo.mk b/external/cuckoo/UnpackedTarball_cuckoo.mk
deleted file mode 100644
index e0426181b3a7..000000000000
--- a/external/cuckoo/UnpackedTarball_cuckoo.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,cuckoo))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,cuckoo,$(CUCKOO_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cuckoo,0))
-
-$(eval $(call gb_UnpackedTarball_update_autoconf_configs,cuckoo))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cuckoo,\
- external/cuckoo/cuckoo-coverity.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/cuckoo/cuckoo-coverity.patch b/external/cuckoo/cuckoo-coverity.patch
deleted file mode 100644
index 273d3bf1f0e3..000000000000
--- a/external/cuckoo/cuckoo-coverity.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libcuckoo/cuckoohash_map.hh 2021-09-11 11:29:05.656553870 +0100
-+++ libcuckoo/cuckoohash_map.hh 2021-09-11 11:31:48.265203248 +0100
-@@ -866,7 +866,8 @@
-
- class TwoBuckets {
- public:
-- TwoBuckets() {}
-+ TwoBuckets()
-+ : i1(0), i2(0) {}
- TwoBuckets(size_type i1_, size_type i2_, locked_table_mode)
- : i1(i1_), i2(i2_) {}
- TwoBuckets(locks_t &locks, size_type i1_, size_type i2_, normal_mode)
-@@ -1552,7 +1553,8 @@
- " MAX_BFS_PATH_LEN - 1");
- static_assert(-1 >= std::numeric_limits<decltype(depth)>::min(),
- "The depth type must be able to hold a value of -1");
-- b_slot() {}
-+ b_slot()
-+ : bucket(0), pathcode(0), depth(0) {}
- b_slot(const size_type b, const uint16_t p, const decltype(depth) d)
- : bucket(b), pathcode(p), depth(d) {
- assert(d < MAX_BFS_PATH_LEN);