rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

profile time spent within each thread

Browse Source 
From Mike Mohr
This commit is contained in:
Brian Pellin
2012-07-28 15:19:34 -05:00
parent f35eee9afb
commit 0dd0fc6407
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
jni/final_key/kpd_jni.c
View File

@@ -371,6 +371,9 @@ typedef struct _master_key {
void *generate_key_material(void *arg) {
#if defined(KPD_PROFILE)
struct timespec start, end;
#endif
uint32_t i, flip = 0;
uint8_t *key1, *key2;
master_key *mk = (master_key *)arg;
@@ -384,6 +387,10 @@ void *generate_key_material(void *arg) {
key2 = mk->key2 + 16;
}
#if defined(KPD_PROFILE)
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &start);
#endif
aes_encrypt_key256(mk->c_seed, e_ctx);
for (i = 0; i < mk->rounds; i++) {
if ( flip ) {
@@ -395,6 +402,14 @@ void *generate_key_material(void *arg) {
}
}
#if defined(KPD_PROFILE)
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &end);
if( key1 == mk->key1 )
__android_log_print(ANDROID_LOG_INFO, "kpd_jni.c/nTransformMasterKey", "Thread 1 master key transformation took ~%d seconds", (end.tv_sec-start.tv_sec));
else
__android_log_print(ANDROID_LOG_INFO, "kpd_jni.c/nTransformMasterKey", "Thread 2 master key transformation took ~%d seconds", (end.tv_sec-start.tv_sec));
#endif
if( key1 == mk->key1 )
pthread_mutex_unlock(&mk->lock);
@@ -402,9 +417,6 @@ void *generate_key_material(void *arg) {
}
JNIEXPORT jbyteArray JNICALL Java_com_keepassdroid_crypto_finalkey_NativeFinalKey_nTransformMasterKey(JNIEnv *env, jobject this, jbyteArray seed, jbyteArray key, jint rounds) {
#if defined(KPD_PROFILE)
struct timespec start, end;
#endif
master_key mk;
uint32_t flip;
pthread_t t1, t2;
@@ -413,10 +425,6 @@ JNIEXPORT jbyteArray JNICALL Java_com_keepassdroid_crypto_finalkey_NativeFinalKe
jbyteArray result;
sha256_ctx h_ctx[1] __attribute__ ((aligned (16)));
#if defined(KPD_PROFILE)
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &start);
#endif
// step 1: housekeeping - sanity checks and fetch data from the JVM
if( (*env)->GetArrayLength(env, seed) != MASTER_KEY_SIZE ) {
(*env)->ThrowNew(env, bad_arg, "TransformMasterKey: the seed is not the correct size");
@@ -485,11 +493,6 @@ JNIEXPORT jbyteArray JNICALL Java_com_keepassdroid_crypto_finalkey_NativeFinalKe
else
(*env)->SetByteArrayRegion(env, result, 0, MASTER_KEY_SIZE, (jbyte *)mk.key1);
#if defined(KPD_PROFILE)
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &end);
__android_log_print(ANDROID_LOG_INFO, "kpd_jni.c/nTransformMasterKey", "Master key transformation took ~%d seconds", (end.tv_sec-start.tv_sec));
#endif
return result;
}
#undef MASTER_KEY_SIZE