From 08c49d8a121a637bd45c386af1d9d172264e53b0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 19 Aug 2013 10:40:47 +0000 Subject: Use reentrant qsort() in particle codes Particle system code used global variable to sort hair by orig index, which is not safe for threading at all. Replaced this with usage of reentrant version of qsort, which is now implemented in BLI. It was moved from recast navigation code to BLI, so more areas could use it (if needed). -- svn merge -r59086:59087 ^/branches/soc-2013-depsgraph_mt --- source/blender/blenlib/BLI_sort.h | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 source/blender/blenlib/BLI_sort.h (limited to 'source/blender/blenlib/BLI_sort.h') diff --git a/source/blender/blenlib/BLI_sort.h b/source/blender/blenlib/BLI_sort.h new file mode 100644 index 00000000000..9e533aac758 --- /dev/null +++ b/source/blender/blenlib/BLI_sort.h @@ -0,0 +1,41 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2013 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): Benoit Bolsee, + * Sergey Sharybin. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __BLI_SORT_H__ +#define __BLI_SORT_H__ + +/** \file BLI_sort.h + * \ingroup bli + */ + +/* Quick sort reentrant */ +typedef int (*BLI_sort_cmp_t)(void *ctx, const void *a, const void *b); + +void BLI_qsort_r(void *a, size_t n, size_t es, void *thunk, BLI_sort_cmp_t cmp); + +#endif /* __BLI_SORT_H__ */ -- cgit v1.2.3