cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bench: run ops multiple times and for an average time

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-11-04 20:42:49 +01:00
parent 3ca8af060b
commit 0a266cdb4a
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BenchmarkOperation.java
View File

@@ -32,8 +32,6 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult.Operat
import org.sufficientlysecure.keychain.operations.results.SignEncryptResult; import org.sufficientlysecure.keychain.operations.results.SignEncryptResult;
import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel;
import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation;
import org.sufficientlysecure.keychain.pgp.PgpSignEncryptInputParcel;
import org.sufficientlysecure.keychain.pgp.PgpSignEncryptOperation;
import org.sufficientlysecure.keychain.pgp.Progressable; import org.sufficientlysecure.keychain.pgp.Progressable;
import org.sufficientlysecure.keychain.pgp.SignEncryptParcel; import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper;
@@ -63,33 +61,46 @@ public class BenchmarkOperation extends BaseOperation<BenchmarkInputParcel> {
Passphrase passphrase = new Passphrase("a"); Passphrase passphrase = new Passphrase("a");
int numRepeats = 5;
long totalTime = 0;
// encrypt // encrypt
SignEncryptResult encryptResult; SignEncryptResult encryptResult;
{ int i = 0;
do {
SignEncryptOperation op = SignEncryptOperation op =
new SignEncryptOperation(mContext, mProviderHelper, new SignEncryptOperation(mContext, mProviderHelper,
new ProgressScaler(mProgressable, 0, 50, 100), mCancelled); new ProgressScaler(mProgressable, i*(50/numRepeats), (i+1)*(50/numRepeats), 100), mCancelled);
SignEncryptParcel input = new SignEncryptParcel(); SignEncryptParcel input = new SignEncryptParcel();
input.setSymmetricPassphrase(passphrase); input.setSymmetricPassphrase(passphrase);
input.setBytes(buf); input.setBytes(buf);
encryptResult = op.execute(input, new CryptoInputParcel()); encryptResult = op.execute(input, new CryptoInputParcel());
} log.add(encryptResult, 1);
log.add(encryptResult, 1); log.add(LogType.MSG_BENCH_ENC_TIME, 2,
log.add(LogType.MSG_BENCH_ENC_TIME, 1, String.format("%.2f", encryptResult.getResults().get(0).mOperationTime / 1000.0));
String.format("%.2f", encryptResult.getResults().get(0).mOperationTime / 1000.0)); totalTime += encryptResult.getResults().get(0).mOperationTime;
} while (++i < numRepeats);
log.add(LogType.MSG_BENCH_ENC_TIME_AVG, 1, String.format("%.2f", totalTime / numRepeats /1000.0));
totalTime = 0;
// decrypt // decrypt
DecryptVerifyResult decryptResult; i = 0;
{ do {
DecryptVerifyResult decryptResult;
PgpDecryptVerifyOperation op = PgpDecryptVerifyOperation op =
new PgpDecryptVerifyOperation(mContext, mProviderHelper, new PgpDecryptVerifyOperation(mContext, mProviderHelper,
new ProgressScaler(mProgressable, 50, 100, 100)); new ProgressScaler(mProgressable, 50 +i*(50/numRepeats), 50 +(i+1)*(50/numRepeats), 100));
PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(encryptResult.getResultBytes()); PgpDecryptVerifyInputParcel input = new PgpDecryptVerifyInputParcel(encryptResult.getResultBytes());
input.setAllowSymmetricDecryption(true); input.setAllowSymmetricDecryption(true);
decryptResult = op.execute(input, new CryptoInputParcel(passphrase)); decryptResult = op.execute(input, new CryptoInputParcel(passphrase));
} log.add(decryptResult, 1);
log.add(decryptResult, 1); log.add(LogType.MSG_BENCH_DEC_TIME, 2, String.format("%.2f", decryptResult.mOperationTime / 1000.0));
log.add(LogType.MSG_BENCH_DEC_TIME, 1, String.format("%.2f", decryptResult.mOperationTime / 1000.0)); totalTime += decryptResult.mOperationTime;
} while (++i < numRepeats);
log.add(LogType.MSG_BENCH_DEC_TIME_AVG, 1, String.format("%.2f", totalTime / numRepeats / 1000.0));
log.add(LogType.MSG_BENCH_SUCCESS, 0); log.add(LogType.MSG_BENCH_SUCCESS, 0);
return new BenchmarkResult(BenchmarkResult.RESULT_OK, log); return new BenchmarkResult(BenchmarkResult.RESULT_OK, log);

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
View File

@@ -876,8 +876,10 @@ public abstract class OperationResult implements Parcelable {
MSG_LV_FETCH_ERROR_NOTHING (LogLevel.ERROR, R.string.msg_lv_fetch_error_nothing), MSG_LV_FETCH_ERROR_NOTHING (LogLevel.ERROR, R.string.msg_lv_fetch_error_nothing),
MSG_BENCH (LogLevel.START, R.string.msg_bench), MSG_BENCH (LogLevel.START, R.string.msg_bench),
MSG_BENCH_ENC_TIME (LogLevel.INFO, R.string.msg_bench_enc_time), MSG_BENCH_ENC_TIME (LogLevel.DEBUG, R.string.msg_bench_enc_time),
MSG_BENCH_DEC_TIME (LogLevel.INFO, R.string.msg_bench_dec_time), MSG_BENCH_ENC_TIME_AVG (LogLevel.INFO, R.string.msg_bench_enc_time_avg),
MSG_BENCH_DEC_TIME (LogLevel.DEBUG, R.string.msg_bench_dec_time),
MSG_BENCH_DEC_TIME_AVG (LogLevel.INFO, R.string.msg_bench_enc_time_avg),
MSG_BENCH_SUCCESS (LogLevel.OK, R.string.msg_bench_success), MSG_BENCH_SUCCESS (LogLevel.OK, R.string.msg_bench_success),
; ;

2
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1366,7 +1366,9 @@
<string name="msg_bench">"Benchmarking some operations…"</string> <string name="msg_bench">"Benchmarking some operations…"</string>
<string name="msg_bench_enc_time">"Encryption time: %ss"</string> <string name="msg_bench_enc_time">"Encryption time: %ss"</string>
<string name="msg_bench_enc_time_avg">"Average encryption time: %ss"</string>
<string name="msg_bench_dec_time">"Decryption time: %ss"</string> <string name="msg_bench_dec_time">"Decryption time: %ss"</string>
<string name="msg_bench_dec_time_avg">"Average decryption time: %ss"</string>
<string name="msg_bench_success">"Benchmarking complete!"</string> <string name="msg_bench_success">"Benchmarking complete!"</string>
<string name="msg_data">"Processing input data"</string> <string name="msg_data">"Processing input data"</string>