generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am f197147a: am ca07064c: am 5f53a182: Revert "Add qsort_r() implementation to the C library."

Browse Source 
Merge commit 'f197147a787d7415e6e0a1bad15566836c55befb'

* commit 'f197147a787d7415e6e0a1bad15566836c55befb':
  Revert "Add qsort_r() implementation to the C library."
This commit is contained in:
Mathias Agopian 2009-12-04 04:31:23 -08:00 committed by Android Git Automerger
commit 278d960aae
4 changed files with 37 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/Android.mk
View File

@ -155,7 +155,6 @@ libc_common_src_files := \
stdlib/nrand48.c \ stdlib/nrand48.c \
stdlib/putenv.c \ stdlib/putenv.c \
stdlib/qsort.c \ stdlib/qsort.c \
stdlib/qsort_r.c \
stdlib/seed48.c \ stdlib/seed48.c \
stdlib/setenv.c \ stdlib/setenv.c \
stdlib/setjmperr.c \ stdlib/setjmperr.c \

1
libc/include/stdlib.h
View File

@ -101,7 +101,6 @@ extern void * bsearch(const void *key, const void *base0,
int (*compar)(const void *, const void *)); int (*compar)(const void *, const void *));
extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
extern void qsort_r(void *a, size_t n, size_t es, void *thunk, int (*)(void *, const void *, const void *));
extern long jrand48(unsigned short *); extern long jrand48(unsigned short *);
extern long mrand48(void); extern long mrand48(void);

103
libc/stdlib/qsort.c
View File

@ -1,3 +1,4 @@
/* $OpenBSD: qsort.c,v 1.10 2005/08/08 08:05:37 espie Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@ -10,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 4. Neither the name of the University nor the names of its contributors * 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -27,16 +28,11 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <sys/cdefs.h> #include <sys/types.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef I_AM_QSORT_R static __inline char *med3(char *, char *, char *, int (*)(const void *, const void *));
typedef int cmp_t(void *, const void *, const void *); static __inline void swapfunc(char *, char *, int, int);
#else
typedef int cmp_t(const void *, const void *);
#endif
static inline char *med3(char *, char *, char *, cmp_t *, void *);
static inline void swapfunc(char *, char *, int, int);
#define min(a, b) (a) < (b) ? a : b #define min(a, b) (a) < (b) ? a : b
@ -45,10 +41,10 @@ static inline void swapfunc(char *, char *, int, int);
*/ */
#define swapcode(TYPE, parmi, parmj, n) { \ #define swapcode(TYPE, parmi, parmj, n) { \
long i = (n) / sizeof (TYPE); \ long i = (n) / sizeof (TYPE); \
TYPE *pi = (TYPE *) (parmi); \ TYPE *pi = (TYPE *) (parmi); \
TYPE *pj = (TYPE *) (parmj); \ TYPE *pj = (TYPE *) (parmj); \
do { \ do { \
TYPE t = *pi; \ TYPE t = *pi; \
*pi++ = *pj; \ *pi++ = *pj; \
*pj++ = t; \ *pj++ = t; \
} while (--i > 0); \ } while (--i > 0); \
@ -57,12 +53,10 @@ static inline void swapfunc(char *, char *, int, int);
#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \ #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1; es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
static inline void static __inline void
swapfunc(a, b, n, swaptype) swapfunc(char *a, char *b, int n, int swaptype)
char *a, *b;
int n, swaptype;
{ {
if(swaptype <= 1) if (swaptype <= 1)
swapcode(long, a, b, n) swapcode(long, a, b, n)
else else
swapcode(char, a, b, n) swapcode(char, a, b, n)
@ -78,75 +72,57 @@ swapfunc(a, b, n, swaptype)
#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) #define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
#ifdef I_AM_QSORT_R static __inline char *
#define CMP(t, x, y) (cmp((t), (x), (y))) med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
#else
#define CMP(t, x, y) (cmp((x), (y)))
#endif
static inline char *
med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk
#ifndef I_AM_QSORT_R
__unused
#endif
)
{ {
return CMP(thunk, a, b) < 0 ? return cmp(a, b) < 0 ?
(CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a )) (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
:(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c )); :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
} }
#ifdef I_AM_QSORT_R
void void
qsort_r(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp) qsort(void *aa, size_t n, size_t es, int (*cmp)(const void *, const void *))
#else
#define thunk NULL
void
qsort(void *a, size_t n, size_t es, cmp_t *cmp)
#endif
{ {
char *pa, *pb, *pc, *pd, *pl, *pm, *pn; char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
size_t d, r; int d, r, swaptype, swap_cnt;
int cmp_result; char *a = aa;
int swaptype, swap_cnt;
loop: SWAPINIT(a, es); loop: SWAPINIT(a, es);
swap_cnt = 0; swap_cnt = 0;
if (n < 7) { if (n < 7) {
for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
for (pl = pm; for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
pl -= es) pl -= es)
swap(pl, pl - es); swap(pl, pl - es);
return; return;
} }
pm = (char *)a + (n / 2) * es; pm = (char *)a + (n / 2) * es;
if (n > 7) { if (n > 7) {
pl = a; pl = (char *)a;
pn = (char *)a + (n - 1) * es; pn = (char *)a + (n - 1) * es;
if (n > 40) { if (n > 40) {
d = (n / 8) * es; d = (n / 8) * es;
pl = med3(pl, pl + d, pl + 2 * d, cmp, thunk); pl = med3(pl, pl + d, pl + 2 * d, cmp);
pm = med3(pm - d, pm, pm + d, cmp, thunk); pm = med3(pm - d, pm, pm + d, cmp);
pn = med3(pn - 2 * d, pn - d, pn, cmp, thunk); pn = med3(pn - 2 * d, pn - d, pn, cmp);
} }
pm = med3(pl, pm, pn, cmp, thunk); pm = med3(pl, pm, pn, cmp);
} }
swap(a, pm); swap(a, pm);
pa = pb = (char *)a + es; pa = pb = (char *)a + es;
pc = pd = (char *)a + (n - 1) * es; pc = pd = (char *)a + (n - 1) * es;
for (;;) { for (;;) {
while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) { while (pb <= pc && (r = cmp(pb, a)) <= 0) {
if (cmp_result == 0) { if (r == 0) {
swap_cnt = 1; swap_cnt = 1;
swap(pa, pb); swap(pa, pb);
pa += es; pa += es;
} }
pb += es; pb += es;
} }
while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) { while (pb <= pc && (r = cmp(pc, a)) >= 0) {
if (cmp_result == 0) { if (r == 0) {
swap_cnt = 1; swap_cnt = 1;
swap(pc, pd); swap(pc, pd);
pd -= es; pd -= es;
@ -161,26 +137,21 @@ loop: SWAPINIT(a, es);
pc -= es; pc -= es;
} }
if (swap_cnt == 0) { /* Switch to insertion sort */ if (swap_cnt == 0) { /* Switch to insertion sort */
for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
for (pl = pm; for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
pl -= es) pl -= es)
swap(pl, pl - es); swap(pl, pl - es);
return; return;
} }
pn = (char *)a + n * es; pn = (char *)a + n * es;
r = min(pa - (char *)a, pb - pa); r = min(pa - (char *)a, pb - pa);
vecswap(a, pb - r, r); vecswap(a, pb - r, r);
r = min(pd - pc, pn - pd - (int)es); r = min(pd - pc, pn - pd - (int)es);
vecswap(pb, pn - r, r); vecswap(pb, pn - r, r);
if ((r = pb - pa) > es) if ((r = pb - pa) > (int)es)
#ifdef I_AM_QSORT_R
qsort_r(a, r / es, es, thunk, cmp);
#else
qsort(a, r / es, es, cmp); qsort(a, r / es, es, cmp);
#endif if ((r = pd - pc) > (int)es) {
if ((r = pd - pc) > es) {
/* Iterate rather than recurse to save stack space */ /* Iterate rather than recurse to save stack space */
a = pn - r; a = pn - r;
n = r / es; n = r / es;

8
libc/stdlib/qsort_r.c
View File

@ -1,8 +0,0 @@
/*
* This file is in the public domain. Originally written by Garrett
* A. Wollman.
*
* $FreeBSD: src/lib/libc/stdlib/qsort_r.c,v 1.1.36.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
#define I_AM_QSORT_R
#include "qsort.c"