From 8feed0b097f40faa56b89224d0bbed7400572528 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 4 Nov 2015 19:09:51 +0100
Subject: bench: add benchmark operation for testing

---
 OpenKeychain/src/main/res/menu/key_list.xml  | 6 ++++++
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 2 files changed, 7 insertions(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index d3a2bd0fd..edaf0c999 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -25,6 +25,12 @@
         android:visible="false"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_key_list_debug_bench"
+        android:title="Debug / Benchmark"
+        android:visible="false"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_key_list_debug_read"
         android:title="Debug / DB restore"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 123647bca..86f7895c8 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -396,6 +396,7 @@
     <string name="progress_cancelling">"cancelling…"</string>
     <string name="progress_saving">"saving…"</string>
     <string name="progress_importing">"importing…"</string>
+    <string name="progress_benchmarking">"benchmarking…"</string>
     <string name="progress_revoking_uploading">"Revoking and uploading key…"</string>
     <string name="progress_updating">"Updating keys…"</string>
     <string name="progress_exporting">"exporting…"</string>
-- 
cgit v1.2.3


From a4518c43c2fdff3852668242978a8b9739447d0b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 4 Nov 2015 20:24:06 +0100
Subject: bench: simple working benchmark

---
 OpenKeychain/src/main/res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 86f7895c8..486176fc2 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1363,6 +1363,11 @@
     <string name="msg_lv_fetch_error_format">"Format error!"</string>
     <string name="msg_lv_fetch_error_nothing">"Resource not found!"</string>
 
+    <string name="msg_bench">"Benchmarking some operations…"</string>
+    <string name="msg_bench_enc_time">"Encryption time: %ss"</string>
+    <string name="msg_bench_dec_time">"Decryption time: %ss"</string>
+    <string name="msg_bench_success">"Benchmarking complete!"</string>
+
     <string name="msg_data">"Processing input data"</string>
     <string name="msg_data_openpgp">"Attempting to process OpenPGP data"</string>
     <string name="msg_data_detached">"Encountered detached signature"</string>
-- 
cgit v1.2.3


From 0a266cdb4a15b01ec692eb5d3b69b3a361011245 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 4 Nov 2015 20:42:49 +0100
Subject: bench: run ops multiple times and for an average time

---
 OpenKeychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2f7c703ad..07303bf13 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1366,7 +1366,9 @@
 
     <string name="msg_bench">"Benchmarking some operations…"</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_avg">"Average decryption time: %ss"</string>
     <string name="msg_bench_success">"Benchmarking complete!"</string>
 
     <string name="msg_data">"Processing input data"</string>
-- 
cgit v1.2.3


From 33e8699be5fe7b1c756b3bdced7646772a6c6026 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 4 Nov 2015 21:27:24 +0100
Subject: bench: add simple s2k benchmark (iterations for 100ms)

---
 OpenKeychain/src/main/res/values/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 07303bf13..13b9923bc 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1366,9 +1366,11 @@
 
     <string name="msg_bench">"Benchmarking some operations…"</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_enc_time_avg">"Average time to encrypt 5M: %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_dec_time_avg">"Average time to decrypt 5M: %ss"</string>
+    <string name="msg_bench_s2k_100ms_its">"S2K Iteration Count for 100ms: %s"</string>
+    <string name="msg_bench_s2k_for_it">"Time for %1$s SHA1 S2K iterations: %2$sms"</string>
     <string name="msg_bench_success">"Benchmarking complete!"</string>
 
     <string name="msg_data">"Processing input data"</string>
-- 
cgit v1.2.3