MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[cvs] weird performance test fixed

Browse Source
This commit is contained in:
Roman Shevchenko
2015-09-25 20:17:33 +03:00
parent 62c7e71054
commit b441dbb192
2 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/InputStreamWrapper.java
+13 -9
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,53 +15,57 @@
*/
package com.intellij.cvsSupport2.javacvsImpl.io;
import com.intellij.openapi.application.ApplicationManager;
import org.netbeans.lib.cvsclient.ICvsCommandStopper;
import java.io.IOException;
import java.io.InputStream;
import com.intellij.openapi.application.ApplicationManager;
/**
* author: lesya
*/
public class InputStreamWrapper extends InputStream {
private final ReadThread myReadThread;
private final ReadWriteStatistics myStatistics;
public InputStreamWrapper(InputStream original,
ICvsCommandStopper cvsCommandStopper,
ReadWriteStatistics statistics) {
public InputStreamWrapper(InputStream original, ICvsCommandStopper cvsCommandStopper, ReadWriteStatistics statistics) {
myReadThread = new ReadThread(original, cvsCommandStopper);
myReadThread.prepareForWait();
ApplicationManager.getApplication().executeOnPooledThread(myReadThread);
startThread(myReadThread);
myReadThread.waitForStart();
myStatistics = statistics;
}
protected void startThread(Runnable runnable) {
ApplicationManager.getApplication().executeOnPooledThread(runnable);
}
@Override
public int read() throws IOException {
myStatistics.read(1);
return myReadThread.read();
}
public int read(byte b[], int off, int len) throws IOException {
@Override
public int read(byte[] b, int off, int len) throws IOException {
int result = myReadThread.read(b, off, len);
myStatistics.read(result);
return result;
}
@Override
public long skip(long n) throws IOException {
long result = myReadThread.skip(n);
myStatistics.read(result);
return result;
}
@Override
public int available() throws IOException {
return myReadThread.available();
}
@Override
public void close() throws IOException {
myReadThread.close();
}
plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java
+10 -24
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,27 +18,29 @@ package com.intellij.cvsSupport2.javacvsImpl.io;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.util.concurrency.Semaphore;
import org.jetbrains.annotations.NonNls;
import org.netbeans.lib.cvsclient.ICvsCommandStopper;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
/**
* author: lesya
*/
public class ReadThread implements Runnable {
public final static Collection<ReadThread> READ_THREADS = new ArrayList<ReadThread>();
public final static Collection<ReadThread> READ_THREADS = Collections.synchronizedCollection(new ArrayList<ReadThread>());
private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.javacvsImpl.io.ReadThread");
private static final int INITIAL_BUFFER_SIZE = 128 * 1024;
private static final int TIMEOUT = 3000;
private static final int END_OF_STREAM = -1;
private boolean myAtEndOfStream = false;
private final ICvsCommandStopper myCvsCommandStopper;
private static final int INITIAL_BUFFER_SIZE = 128 * 1024;
private final byte[] myBuffer = new byte[INITIAL_BUFFER_SIZE];
private final byte[] myReadBuffer = new byte[INITIAL_BUFFER_SIZE];
private int myFirstIndex = 0;
@@ -46,10 +48,7 @@ public class ReadThread implements Runnable {
private IOException myException;
private final InputStream myInputStream;
private final Semaphore myStarted = new Semaphore();
public static final int TIMEOUT = 3000;
public static final int END_OF_STREAM = -1;
private boolean myIsClosed = false;
@NonNls private static final String NAME = "CvsReadThread";
public ReadThread(InputStream inputStream, ICvsCommandStopper cvsCommandStopper) {
myInputStream = inputStream;
@@ -66,19 +65,9 @@ public class ReadThread implements Runnable {
}
public String toString() {
@NonNls StringBuffer buffer = new StringBuffer();
buffer.append(super.toString());
buffer.append(", atEnd: ");
buffer.append(myAtEndOfStream);
buffer.append(", firstIndex: ");
buffer.append(myFirstIndex);
buffer.append(", lastIndex: ");
buffer.append(myLastIndex);
buffer.append(", exception: ");
buffer.append(myException);
buffer.append(", closed: ");
buffer.append(myIsClosed);
return buffer.toString();
return super.toString() +
", atEnd: " + myAtEndOfStream + ", firstIndex: " + myFirstIndex + ", lastIndex: " + myLastIndex +
", exception: " + myException + ", closed: " + myIsClosed;
}
public void run() {
@@ -236,7 +225,4 @@ public class ReadThread implements Runnable {
myFirstIndex += result;
return result;
}
}