projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add background processing of updated directories
[yaffs2.git]
/
yaffs_qsort.c
diff --git
a/yaffs_qsort.c
b/yaffs_qsort.c
index 296701d2e41fe606870134d059d49fb846cf77a8..187519fbdb55c824184d4be0a30fd53444562def 100644
(file)
--- a/
yaffs_qsort.c
+++ b/
yaffs_qsort.c
@@
-28,12
+28,12
@@
*/
#include "yportenv.h"
*/
#include "yportenv.h"
-/
/#include <linux/string.h>
+/
* #include <linux/string.h> */
/*
* Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
*/
/*
* Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
*/
-#define swapcode(TYPE, parmi, parmj, n)
{
\
+#define swapcode(TYPE, parmi, parmj, n)
do {
\
long i = (n) / sizeof (TYPE); \
register TYPE *pi = (TYPE *) (parmi); \
register TYPE *pj = (TYPE *) (parmj); \
long i = (n) / sizeof (TYPE); \
register TYPE *pi = (TYPE *) (parmi); \
register TYPE *pj = (TYPE *) (parmj); \
@@
-41,28
+41,29
@@
register TYPE t = *pi; \
*pi++ = *pj; \
*pj++ = t; \
register TYPE t = *pi; \
*pi++ = *pj; \
*pj++ = t; \
-
} while (--i > 0);
\
-}
+
} while (--i > 0);
\
+}
while (0)
#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
swapfunc(char *a, char *b, int n, int swaptype)
{
static __inline void
swapfunc(char *a, char *b, int n, int swaptype)
{
- if (swaptype <= 1)
- swapcode(long, a, b, n)
+ if (swaptype <= 1)
+ swapcode(long, a, b, n)
;
else
else
- swapcode(char, a, b, n)
+ swapcode(char, a, b, n)
;
}
}
-#define
swap(a, b)
\
+#define
yswap(a, b) do {
\
if (swaptype == 0) { \
long t = *(long *)(a); \
*(long *)(a) = *(long *)(b); \
*(long *)(b) = t; \
} else \
if (swaptype == 0) { \
long t = *(long *)(a); \
*(long *)(a) = *(long *)(b); \
*(long *)(b) = t; \
} else \
- swapfunc(a, b, es, swaptype)
+ swapfunc(a, b, es, swaptype); \
+} while (0)
#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)
@@
-70,13
+71,17
@@
static __inline char *
med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
{
return cmp(a, b) < 0 ?
med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
{
return cmp(a, b) < 0 ?
-
(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a
))
-
:(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c
));
+
(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a
))
+
: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c
));
}
}
-#define min(a,b) (((a) < (b)) ? (a) : (b))
+#ifndef min
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
void
void
-qsort(void *aa, size_t n, size_t es, int (*cmp)(const void *, const void *))
+yaffs_qsort(void *aa, size_t n, size_t es,
+ int (*cmp)(const void *, const void *))
{
char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
int d, r, swaptype, swap_cnt;
{
char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
int d, r, swaptype, swap_cnt;
@@
-88,7
+93,7
@@
loop: SWAPINIT(a, es);
for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
pl -= es)
for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
pl -= es)
- swap(pl, pl - es);
+
y
swap(pl, pl - es);
return;
}
pm = (char *)a + (n / 2) * es;
return;
}
pm = (char *)a + (n / 2) * es;
@@
-103,7
+108,7
@@
loop: SWAPINIT(a, es);
}
pm = med3(pl, pm, pn, cmp);
}
}
pm = med3(pl, pm, pn, cmp);
}
- swap(a, pm);
+
y
swap(a, pm);
pa = pb = (char *)a + es;
pc = pd = (char *)a + (n - 1) * es;
pa = pb = (char *)a + es;
pc = pd = (char *)a + (n - 1) * es;
@@
-111,7
+116,7
@@
loop: SWAPINIT(a, es);
while (pb <= pc && (r = cmp(pb, a)) <= 0) {
if (r == 0) {
swap_cnt = 1;
while (pb <= pc && (r = cmp(pb, a)) <= 0) {
if (r == 0) {
swap_cnt = 1;
- swap(pa, pb);
+
y
swap(pa, pb);
pa += es;
}
pb += es;
pa += es;
}
pb += es;
@@
-119,23
+124,23
@@
loop: SWAPINIT(a, es);
while (pb <= pc && (r = cmp(pc, a)) >= 0) {
if (r == 0) {
swap_cnt = 1;
while (pb <= pc && (r = cmp(pc, a)) >= 0) {
if (r == 0) {
swap_cnt = 1;
- swap(pc, pd);
+
y
swap(pc, pd);
pd -= es;
}
pc -= es;
}
if (pb > pc)
break;
pd -= es;
}
pc -= es;
}
if (pb > pc)
break;
- swap(pb, pc);
+
y
swap(pb, pc);
swap_cnt = 1;
pb += es;
pc -= es;
}
if (swap_cnt == 0) { /* Switch to insertion sort */
for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
swap_cnt = 1;
pb += es;
pc -= es;
}
if (swap_cnt == 0) { /* Switch to insertion sort */
for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
+ for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
pl -= es)
pl -= es)
- swap(pl, pl - es);
+
y
swap(pl, pl - es);
return;
}
return;
}
@@
-144,13
+149,15
@@
loop: SWAPINIT(a, es);
vecswap(a, pb - r, r);
r = min((long)(pd - pc), (long)(pn - pd - es));
vecswap(pb, pn - r, r);
vecswap(a, pb - r, r);
r = min((long)(pd - pc), (long)(pn - pd - es));
vecswap(pb, pn - r, r);
- if ((r = pb - pa) > es)
- qsort(a, r / es, es, cmp);
- if ((r = pd - pc) > es) {
+ r = pb - pa;
+ if (r > es)
+ yaffs_qsort(a, r / es, es, cmp);
+ r = pd - pc;
+ if (r > es) {
/* Iterate rather than recurse to save stack space */
a = pn - r;
n = r / es;
goto loop;
}
/* Iterate rather than recurse to save stack space */
a = pn - r;
n = r / es;
goto loop;
}
-/* qsort(pn - r, r / es, es, cmp);*/
+/*
yaffs_
qsort(pn - r, r / es, es, cmp);*/
}
}