From 823abb63145c7a7db2b766cf7bb816cbdac1de66 Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Mon, 6 May 2013 23:17:58 -0700 Subject: aapt: move qsort_r_compat here as it is sole client This code is only used on the host for MacOS X compatibility. Apparently, glibc and Apple's libc disagree on the parameter ordering. Change-Id: I214edcf2870b6ac88316306ac5af43f1dadf9b2e Signed-off-by: Dima Zavin --- tools/aapt/Android.mk | 3 +- tools/aapt/StringPool.cpp | 2 +- tools/aapt/qsort_r_compat.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ tools/aapt/qsort_r_compat.h | 39 ++++++++++++++++++++ 4 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 tools/aapt/qsort_r_compat.c create mode 100644 tools/aapt/qsort_r_compat.h diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 7934757c67e6..83c1068b4a93 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -25,7 +25,8 @@ aapt_src_files := \ pseudolocalize.cpp \ SourcePos.cpp \ ZipEntry.cpp \ - ZipFile.cpp + ZipFile.cpp \ + qsort_r_compat.c LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 839eda5151b0..158b39196cb3 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include "qsort_r_compat.h" #if HAVE_PRINTF_ZD # define ZD "%zd" diff --git a/tools/aapt/qsort_r_compat.c b/tools/aapt/qsort_r_compat.c new file mode 100644 index 000000000000..2a8dbe85f4c9 --- /dev/null +++ b/tools/aapt/qsort_r_compat.c @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "qsort_r_compat.h" + +/* + * Note: This code is only used on the host, and is primarily here for + * Mac OS compatibility. Apparently, glibc and Apple's libc disagree on + * the parameter order for qsort_r. + */ + +#if HAVE_BSD_QSORT_R + +/* + * BSD qsort_r parameter order is as we have defined here. + */ + +void qsort_r_compat(void* base, size_t nel, size_t width, void* thunk, + int (*compar)(void*, const void* , const void*)) { + qsort_r(base, nel, width, thunk, compar); +} + +#elif HAVE_GNU_QSORT_R + +/* + * GNU qsort_r parameter order places the thunk parameter last. + */ + +struct compar_data { + void* thunk; + int (*compar)(void*, const void* , const void*); +}; + +static int compar_wrapper(const void* a, const void* b, void* data) { + struct compar_data* compar_data = (struct compar_data*)data; + return compar_data->compar(compar_data->thunk, a, b); +} + +void qsort_r_compat(void* base, size_t nel, size_t width, void* thunk, + int (*compar)(void*, const void* , const void*)) { + struct compar_data compar_data; + compar_data.thunk = thunk; + compar_data.compar = compar; + qsort_r(base, nel, width, compar_wrapper, &compar_data); +} + +#else + +/* + * Emulate qsort_r using thread local storage to access the thunk data. + */ + +#include + +static thread_store_t compar_data_key = THREAD_STORE_INITIALIZER; + +struct compar_data { + void* thunk; + int (*compar)(void*, const void* , const void*); +}; + +static int compar_wrapper(const void* a, const void* b) { + struct compar_data* compar_data = (struct compar_data*)thread_store_get(&compar_data_key); + return compar_data->compar(compar_data->thunk, a, b); +} + +void qsort_r_compat(void* base, size_t nel, size_t width, void* thunk, + int (*compar)(void*, const void* , const void*)) { + struct compar_data compar_data; + compar_data.thunk = thunk; + compar_data.compar = compar; + thread_store_set(&compar_data_key, &compar_data, NULL); + qsort(base, nel, width, compar_wrapper); +} + +#endif diff --git a/tools/aapt/qsort_r_compat.h b/tools/aapt/qsort_r_compat.h new file mode 100644 index 000000000000..e14f999f736a --- /dev/null +++ b/tools/aapt/qsort_r_compat.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Provides a portable version of qsort_r, called qsort_r_compat, which is a + * reentrant variant of qsort that passes a user data pointer to its comparator. + * This implementation follows the BSD parameter convention. + */ + +#ifndef ___QSORT_R_COMPAT_H +#define ___QSORT_R_COMPAT_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +void qsort_r_compat(void* base, size_t nel, size_t width, void* thunk, + int (*compar)(void*, const void* , const void* )); + +#ifdef __cplusplus +} +#endif + +#endif // ___QSORT_R_COMPAT_H -- cgit v1.2.3-59-g8ed1b