boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

reduced complexity - removed concurrency in sort

Browse Source
pull/402/head
Michael Peter Christen 4 years ago
parent cef5fde343
commit 787fec0658
4 changed files with 33 additions and 171 deletions
Show Stats Download Patch File Download Diff File

129
source/net/yacy/cora/sorting/Array.java
Unescape View File

@ -39,132 +39,68 @@ import java.util.concurrent.LinkedBlockingQueue;
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
public class Array { public class Array {
private final static int SORT_JOBS = Math.max(1, Runtime.getRuntime().availableProcessors() / 2);
private final static SortJob<?> POISON_JOB_WORKER = new SortJob(null, 0, 0, 0, 0, null);
private static BlockingQueue<SortJob<?>> sortJobs = null;
static {
if (SORT_JOBS > 1) {
for (int i = 0; i < SORT_JOBS; i++) {
new SortJobWorker().start();
}
sortJobs = new LinkedBlockingQueue();
}
}
public static void terminate() {
if (SORT_JOBS > 1 && sortJobs != null) {
for (int i = 0; i < SORT_JOBS; i++) {
try {
sortJobs.put(POISON_JOB_WORKER);
} catch (final InterruptedException e) {}
}
}
}
private static class SortJobWorker extends Thread {
public SortJobWorker() {
super("Array.SortJobWorker");
}
@Override
public void run() {
SortJob<?> job;
try {
while ((job = sortJobs.take()) != POISON_JOB_WORKER) {
sort(job, job.depth < 8);
job.latch.countDown();
}
} catch (final InterruptedException e) {
}
}
}
public static <A> void sort(final Sortable<A> x) { public static <A> void sort(final Sortable<A> x) {
UpDownLatch latch; sort(x, 0, x.size(), x.buffer(), 0);
final boolean threaded = false;//x.size() > 100000;
sort(new SortJob<A>(x, 0, x.size(), x.buffer(), 0, latch = new UpDownLatch(0)), threaded);
//for (int i = 0; i < 100; i++) {System.out.println("latch = " + latch.getCount());try {Thread.sleep(10);} catch (final InterruptedException e) {}}
if (threaded) try {latch.await();} catch (final InterruptedException e) {}
} }
private static class SortJob<A> {
final Sortable<A> x; final int o; final int l; final A f; final int depth; UpDownLatch latch;
public SortJob(final Sortable<A> x, final int o, final int l, final A f, final int depth, final UpDownLatch latch) {
this.x = x; this.o = o; this.l = l; this.f = f; this.depth = depth; this.latch = latch;
}
}
private static <A> void sort(final SortJob<A> job, final boolean threaded) { private static <A> void sort(final Sortable<A> x, final int o, final int l, final A f, final int depth) {
// in case of small arrays we do not need a quicksort // in case of small arrays we do not need a quicksort
if (job.l < 7) { if (l < 7) {
for (int i = job.o; i < job.l + job.o; i++) { for (int i = o; i < l + o; i++) {
for (int j = i; j > job.o && job.x.compare(job.x.get(j, false), job.x.get(j - 1, false)) < 0; j--) job.x.swap(j, j - 1, job.f); for (int j = i; j > o && x.compare(x.get(j, false), x.get(j - 1, false)) < 0; j--) x.swap(j, j - 1, f);
} }
return; return;
} }
// find the pivot element // find the pivot element
int m = job.o + (job.l >> 1); int m = o + (l >> 1);
if (job.l > 7) { if (l > 7) {
int k = job.o; int k = o;
int n = job.o + job.l - 1; int n = o + l - 1;
if (job.l > 40) { if (l > 40) {
final int s = job.l / 8; final int s = l / 8;
k = med3(job.x, k , k + s, k + 2 * s); k = med3(x, k , k + s, k + 2 * s);
m = med3(job.x, m - s , m , m + s ); m = med3(x, m - s , m , m + s );
n = med3(job.x, n - 2 * s, n - s, n ); n = med3(x, n - 2 * s, n - s, n );
} }
m = med3(job.x, k, m, n); m = med3(x, k, m, n);
} }
final A p = job.x.get(m, true); final A p = x.get(m, true);
// do a partitioning of the sequence // do a partitioning of the sequence
int a = job.o, b = a, c = job.o + job.l - 1, d = c; int a = o, b = a, c = o + l - 1, d = c;
A _v; A _v;
while (true) { while (true) {
while (c >= b && job.x.compare(p, (_v = job.x.get(b, false))) >= 0) { while (c >= b && x.compare(p, (_v = x.get(b, false))) >= 0) {
if (job.x.compare(_v, p) == 0) job.x.swap(a++, b, job.f); if (x.compare(_v, p) == 0) x.swap(a++, b, f);
b++; b++;
} }
while (c >= b && job.x.compare((_v = job.x.get(c, false)), p) >= 0) { while (c >= b && x.compare((_v = x.get(c, false)), p) >= 0) {
if (job.x.compare(_v, p) == 0) job.x.swap(c, d--, job.f); if (x.compare(_v, p) == 0) x.swap(c, d--, f);
c--; c--;
} }
if (b > c) break; if (b > c) break;
job.x.swap(b++, c--, job.f); x.swap(b++, c--, f);
} }
// swap all // swap all
int s; int s;
final int n = job.o + job.l; final int n = o + l;
s = Math.min(a - job.o, b - a ); s = Math.min(a - o, b - a );
swap(job.x, job.o, b - s, s, job.f); swap(x, o, b - s, s, f);
s = Math.min(d - c, n - d - 1); s = Math.min(d - c, n - d - 1);
swap(job.x, b, n - s, s, job.f); swap(x, b, n - s, s, f);
// recursively sort partitions // recursively sort partitions
if ((s = b - a) > 1) { final int s0 = b - a;
final SortJob<A> nextJob = new SortJob<A>(job.x, job.o, s, job.f, job.depth + 1, job.latch); if (s0 > 1) {
if (threaded) try { sort(x, o, s0, f, depth + 1);
sortJobs.put(nextJob);
job.latch.countUp();
} catch (final InterruptedException e) {
} else {
sort(nextJob, false);
}
}
if ((s = d - c) > 1) {
final SortJob<A> nextJob = new SortJob<A>(job.x, n - s, s, job.x.buffer(), job.depth + 1, job.latch);
if (threaded) try {
sortJobs.put(nextJob);
job.latch.countUp();
} catch (final InterruptedException e) {
} else {
sort(nextJob, false);
} }
final int s1 = d - c;
if (s1 > 1) {
sort(x, n - s1, s1, x.buffer(), depth + 1);
} }
} }
@ -256,7 +192,6 @@ public class Array {
final long t2 = System.currentTimeMillis(); final long t2 = System.currentTimeMillis();
System.out.println("uniq = " + (t2 - t1) + "ms"); System.out.println("uniq = " + (t2 - t1) + "ms");
System.out.println("result: " + test.size()); System.out.println("result: " + test.size());
terminate();
} }
} }

71
source/net/yacy/cora/sorting/UpDownLatch.java
Unescape View File

@ -1,71 +0,0 @@
/**
* UpDownLatch
* Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany
* First released 16.07.2011 at http://yacy.net
*
* $LastChangedDate: 2011-05-30 10:53:58 +0200 (Mo, 30 Mai 2011) $
* $LastChangedRevision: 7759 $
* $LastChangedBy: orbiter $
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program in the file lgpl21.txt
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.sorting;
import java.util.concurrent.locks.AbstractQueuedSynchronizer;
public class UpDownLatch extends AbstractQueuedSynchronizer {
private static final long serialVersionUID = 1L;
public UpDownLatch(final int count) {
setState(count);
}
public int getCount() {
return getState();
}
@Override
public int tryAcquireShared(final int acquires) {
return getState() == 0? 1 : -1;
}
@Override
public boolean tryReleaseShared(final int releases) {
// Decrement count; signal when transition to zero
for (;;) {
final int c = getState();
if (c == 0) return false;
final int nextc = c-1;
if (compareAndSetState(c, nextc)) return nextc == 0;
}
}
public void countUp() {
for (;;) {
final int c = getState();
if (compareAndSetState(c, c + 1)) return;
}
}
public void countDown() {
releaseShared(1);
}
public void await() throws InterruptedException {
acquireSharedInterruptibly(1);
}
}

1
source/net/yacy/kelondro/index/RowCollection.java
Unescape View File

@ -1097,7 +1097,6 @@ public class RowCollection implements Sortable<Row.Entry>, Iterable<Row.Entry>,
//test(100000); //test(100000);
//test(1000000); //test(1000000);
ConcurrentLog.shutdown(); ConcurrentLog.shutdown();
Array.terminate();
} catch (final SpaceExceededException e) { } catch (final SpaceExceededException e) {
e.printStackTrace(); e.printStackTrace();
} }

1
source/net/yacy/yacy.java
Unescape View File

@ -395,7 +395,6 @@ public final class yacy {
ConcurrentLog.severe("MAIN CONTROL LOOP", "PANIC: " + e.getMessage(),e); ConcurrentLog.severe("MAIN CONTROL LOOP", "PANIC: " + e.getMessage(),e);
} }
// shut down // shut down
Array.terminate();
ConcurrentLog.config("SHUTDOWN", "caught termination signal"); ConcurrentLog.config("SHUTDOWN", "caught termination signal");
httpServer.stop(); httpServer.stop();

Write Preview
Loading…
Cancel
Save