diff --git a/cmake/BuildMisc.cmake b/cmake/BuildMisc.cmake
index bf35f3a900fb52708aecea61c48641bb01e4c9bc..580eca541e8e10db01a967cc277586ab3e064eeb 100644
--- a/cmake/BuildMisc.cmake
+++ b/cmake/BuildMisc.cmake
@@ -4,7 +4,6 @@ macro(libmisc_build)
set(misc_src
${PROJECT_SOURCE_DIR}/third_party/crc32.c
${PROJECT_SOURCE_DIR}/third_party/proctitle.c
- ${PROJECT_SOURCE_DIR}/third_party/qsort_arg.c
${PROJECT_SOURCE_DIR}/third_party/PMurHash.c
${PROJECT_SOURCE_DIR}/third_party/base64.c
)
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index ccd9db5470c37f849f15363c642eeec676172d73..848c095093958b8c884a71bafc20435af2d54979 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -39,6 +39,18 @@ if((NOT HAVE_STD_C11 AND NOT HAVE_STD_GNU99) OR
"Please consider upgrade to gcc 4.5+ or clang 3.2+.")
endif()
+#
+# Check for an omp support
+#
+set(CMAKE_REQUIRED_FLAGS "-fopenmp")
+check_cxx_source_compiles("int main(void) { return 0; }" HAVE_OPENMP)
+set(CMAKE_REQUIRED_FLAGS "")
+if (HAVE_OPENMP)
+ message (STATUS "OpenMP support found")
+else ()
+ message (WARNING "OpenMP support not found")
+endif ()
+
#
# Perform build type specific configuration.
#
@@ -114,6 +126,10 @@ macro(enable_tnt_compile_flags)
)
endif()
+ if (HAVE_OPENMP)
+ add_compile_flags("C;CXX" "-fopenmp")
+ endif()
+
add_definitions("-D__STDC_FORMAT_MACROS=1")
add_definitions("-D__STDC_LIMIT_MACROS=1")
add_definitions("-D__STDC_CONSTANT_MACROS=1")
diff --git a/include/qsort_arg_mt.h b/include/qsort_arg_mt.h
new file mode 100644
index 0000000000000000000000000000000000000000..a2a5fde8e0b8c1592b01ead8f786a4c2a5a5efec
--- /dev/null
+++ b/include/qsort_arg_mt.h
@@ -0,0 +1,19 @@
+#ifndef QSORT_ARG_H
+#define QSORT_ARG_H
+
+#include <sys/types.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* defined(__cplusplus) */
+
+/**
+ * Multithread version of qsort_arg
+ */
+void qsort_arg_mt(void *a, size_t n, size_t es, int (*cmp)(const void *a, const void *b, void *arg), void *arg);
+
+#if defined(__cplusplus)
+}
+#endif /* defined(__cplusplus) */
+
+#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62b051b803d1689b5d8e75e16dc96e202bc0fc22..16822b41a8d88d13410d3abb6b88d9a6049dabcc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,6 +73,7 @@ set (common_sources
crc32.c
rope.c
ipc.cc
+ qsort_arg_mt.cc
lua/fiber.cc
lua/admin.cc
lua/info.cc
diff --git a/src/box/tree_index.h b/src/box/tree_index.h
index 1a0f55c2b4eae7f77265b7b4abb2cd30e68d42c9..8f785a1ed821f3fb5b0d116f4d76147761bec7c8 100644
--- a/src/box/tree_index.h
+++ b/src/box/tree_index.h
@@ -31,12 +31,13 @@
#include "index.h"
+#include <qsort_arg_mt.h>
#include <third_party/sptree.h>
/**
* Instantiate sptree definitions
*/
-SPTREE_DEF(index, realloc);
+SPTREE_DEF(index, realloc, qsort_arg_mt);
class TreeIndex: public Index {
public:
diff --git a/src/qsort_arg_mt.cc b/src/qsort_arg_mt.cc
new file mode 100644
index 0000000000000000000000000000000000000000..59915e80893107823ebe35bdaeb378352f9d467b
--- /dev/null
+++ b/src/qsort_arg_mt.cc
@@ -0,0 +1,213 @@
+/*
+ * Imported from PostgreSQL sources by Teodor Sigaev <teodor@sigaev.ru>, <sigaev@corp.mail.ru>
+ */
+
+/*
+ * qsort_arg.c: qsort with a passthrough "void *" argument
+ *
+ * Modifications from vanilla NetBSD source:
+ * Add do ... while() macro fix
+ * Remove __inline, _DIAGASSERTs, __P
+ * Remove ill-considered "swap_cnt" switch to insertion sort,
+ * in favor of a simple check for presorted input.
+ *
+ * CAUTION: if you change this file, see also qsort.c
+ *
+ * $PostgreSQL: pgsql/src/port/qsort_arg.c,v 1.4 2007/03/18 05:36:50 neilc Exp $
+ */
+
+/* $NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $ */
+
+/*-
+ * Copyright (c) 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <qsort_arg.h>
+#include <stdint.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* defined(__cplusplus) */
+
+#define min(a, b) (a) < (b) ? a : b
+
+static char *med3(char *a, char *b, char *c,
+ int (*cmp)(const void *a, const void *b, void *arg), void *arg);
+static void swapfunc(char *, char *, size_t, int);
+
+/*
+ * Qsort routine based on J. L. Bentley and M. D. McIlroy,
+ * "Engineering a sort function",
+ * Software--Practice and Experience 23 (1993) 1249-1265.
+ * We have modified their original by adding a check for already-sorted input,
+ * which seems to be a win per discussions on pgsql-hackers around 2006-03-21.
+ */
+#define swapcode(TYPE, parmi, parmj, n) \
+do { \
+ size_t i = (n) / sizeof (TYPE); \
+ TYPE *pi = (TYPE *)(void *)(parmi); \
+ TYPE *pj = (TYPE *)(void *)(parmj); \
+ do { \
+ TYPE t = *pi; \
+ *pi++ = *pj; \
+ *pj++ = t; \
+ } while (--i > 0); \
+} while (0)
+
+#define SWAPINIT(a, es) swaptype = ((char *)(a) - (char *)0) % sizeof(long) || \
+ (es) % sizeof(long) ? 2 : (es) == sizeof(long)? 0 : 1;
+
+static void
+swapfunc(char *a, char *b, size_t n, int swaptype)
+{
+ if (swaptype <= 1)
+ swapcode(long, a, b, n);
+ else
+ swapcode(char, a, b, n);
+}
+
+#define swap(a, b) \
+ if (swaptype == 0) { \
+ long t = *(long *)(void *)(a); \
+ *(long *)(void *)(a) = *(long *)(void *)(b); \
+ *(long *)(void *)(b) = t; \
+ } else \
+ swapfunc(a, b, es, swaptype)
+
+#define vecswap(a, b, n) if ((n) > 0) swapfunc((a), (b), (size_t)(n), swaptype)
+
+static char *
+med3(char *a, char *b, char *c, int (*cmp)(const void *a, const void *b, void *arg), void *arg)
+{
+ return cmp(a, b, arg) < 0 ?
+ (cmp(b, c, arg) < 0 ? b : (cmp(a, c, arg) < 0 ? c : a))
+ : (cmp(b, c, arg) > 0 ? b : (cmp(a, c, arg) < 0 ? a : c));
+}
+
+static void
+qsort_arg_mt_internal(void *a, size_t n, size_t es,
+ int (*cmp)(const void *a, const void *b, void *arg), void *arg)
+{
+ char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
+ intptr_t d, r, swaptype, presorted;
+
+ loop:SWAPINIT(a, es);
+ if (n < 7)
+ {
+ for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
+ for (pl = pm; pl > (char *) a && cmp(pl - es, pl, arg) > 0;
+ pl -= es)
+ swap(pl, pl - es);
+ return;
+ }
+ presorted = 1;
+ for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
+ {
+ if (cmp(pm - es, pm, arg) > 0)
+ {
+ presorted = 0;
+ break;
+ }
+ }
+ if (presorted)
+ return;
+ pm = (char *) a + (n / 2) * es;
+ if (n > 7)
+ {
+ pl = (char *) a;
+ pn = (char *) a + (n - 1) * es;
+ if (n > 40)
+ {
+ d = (n / 8) * es;
+ pl = med3(pl, pl + d, pl + 2 * d, cmp, arg);
+ pm = med3(pm - d, pm, pm + d, cmp, arg);
+ pn = med3(pn - 2 * d, pn - d, pn, cmp, arg);
+ }
+ pm = med3(pl, pm, pn, cmp, arg);
+ }
+ swap((char*)a, pm);
+ pa = pb = (char *) a + es;
+ pc = pd = (char *) a + (n - 1) * es;
+ for (;;)
+ {
+ while (pb <= pc && (r = cmp(pb, a, arg)) <= 0)
+ {
+ if (r == 0)
+ {
+ swap(pa, pb);
+ pa += es;
+ }
+ pb += es;
+ }
+ while (pb <= pc && (r = cmp(pc, a, arg)) >= 0)
+ {
+ if (r == 0)
+ {
+ swap(pc, pd);
+ pd -= es;
+ }
+ pc -= es;
+ }
+ if (pb > pc)
+ break;
+ swap(pb, pc);
+ pb += es;
+ pc -= es;
+ }
+ pn = (char *) a + n * es;
+ r = min(pa - (char *) a, pb - pa);
+ vecswap((char*)a, pb - r, r);
+ r = min(pd - pc, pn - pd - es);
+ vecswap(pb, pn - r, r);
+ if ((r = pb - pa) > es) {
+#pragma omp task
+ qsort_arg_mt_internal(a, r / es, es, cmp, arg);
+ }
+ if ((r = pd - pc) > es)
+ {
+ /* Iterate rather than recurse to save stack space */
+ a = pn - r;
+ n = r / es;
+ goto loop;
+ }
+}
+
+void
+qsort_arg_mt(void *a, size_t n, size_t es,
+ int (*cmp)(const void *a, const void *b, void *arg), void *arg)
+{
+#pragma omp parallel
+ {
+#pragma omp single
+ qsort_arg_mt_internal(a, n, es, cmp, arg);
+ }
+}
+
+#if defined(__cplusplus)
+}
+#endif /* defined(__cplusplus) */
diff --git a/third_party/sptree.h b/third_party/sptree.h
index 9e23b8891973cbc8c8d3bb380d1e3cb7e4be04b4..a22e2a41d0dbfd2cbdecb0b27a3fd09c9ed2fb6e 100644
--- a/third_party/sptree.h
+++ b/third_party/sptree.h
@@ -32,8 +32,6 @@
#include <stdlib.h>
#include <math.h>
-#include <third_party/qsort_arg.h>
-
#if defined(__cplusplus)
extern "C" {
#endif /* defined(__cplusplus) */
@@ -99,7 +97,7 @@ typedef struct sptree_node_pointers {
* void* sptree_NAME_iterator_reverse_next(sptree_NAME_iterator *i)
*/
-#define SPTREE_DEF(name, realloc) \
+#define SPTREE_DEF(name, realloc, qsort_arg) \
typedef int (*sptree_##name##_compare)(const void *, const void *, void *); \
\
typedef struct sptree_##name { \