Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

only load and pass in dict as byte[] when path isn't available

Browse source 
(i.e. when it's a builtin), and use mmap in that case.  Works!  Still
need to try a speed test.
This commit is contained in:
Andy2 2011-08-08 20:27:42 -07:00
parent 35f059e14c
commit 8adb925cca
2 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
xwords4/android/XWords4/jni/anddict.c
View file

@ -39,6 +39,7 @@ typedef struct _AndDictionaryCtxt {
DictionaryCtxt super; DictionaryCtxt super;
JNIUtilCtxt* jniutil; JNIUtilCtxt* jniutil;
JNIEnv *env; JNIEnv *env;
off_t bytesSize;
jbyte* bytes; jbyte* bytes;
jbyteArray byteArray; jbyteArray byteArray;
} AndDictionaryCtxt; } AndDictionaryCtxt;
@ -361,7 +362,7 @@ parseDict( AndDictionaryCtxt* ctxt, XP_U8 const* ptr, XP_U32 dictLength )
break; /* exit phony while loop */ break; /* exit phony while loop */
} }
} } /* parseDict */
static void static void
and_dictionary_destroy( DictionaryCtxt* dict ) and_dictionary_destroy( DictionaryCtxt* dict )
@ -396,8 +397,13 @@ and_dictionary_destroy( DictionaryCtxt* dict )
XP_FREEP( ctxt->super.mpool, &ctxt->super.name ); XP_FREEP( ctxt->super.mpool, &ctxt->super.name );
XP_FREEP( ctxt->super.mpool, &ctxt->super.langName ); XP_FREEP( ctxt->super.mpool, &ctxt->super.langName );
(*env)->ReleaseByteArrayElements( env, ctxt->byteArray, ctxt->bytes, 0 ); if ( NULL == ctxt->byteArray ) { /* mmap case */
(*env)->DeleteGlobalRef( env, ctxt->byteArray ); int err = munmap( ctxt->bytes, ctxt->bytesSize );
XP_ASSERT( 0 == err );
} else {
(*env)->ReleaseByteArrayElements( env, ctxt->byteArray, ctxt->bytes, 0 );
(*env)->DeleteGlobalRef( env, ctxt->byteArray );
}
XP_FREE( ctxt->super.mpool, ctxt ); XP_FREE( ctxt->super.mpool, ctxt );
} }
@ -440,18 +446,18 @@ makeDicts( MPFORMAL JNIEnv *env, JNIUtilCtxt* jniutil,
DictionaryCtxt* dict = NULL; DictionaryCtxt* dict = NULL;
if ( ii < len ) { if ( ii < len ) {
jobject jdict = (*env)->GetObjectArrayElement( env, jdicts, ii ); jobject jdict = (*env)->GetObjectArrayElement( env, jdicts, ii );
if ( NULL != jdict ) { jstring jpath = jpaths == NULL ?
jstring jname = (*env)->GetObjectArrayElement( env, jnames, ii );
jstring jpath = jpaths == NULL ?
NULL : (*env)->GetObjectArrayElement( env, jpaths, ii ); NULL : (*env)->GetObjectArrayElement( env, jpaths, ii );
if ( NULL != jdict || NULL != jpath ) {
jstring jname = (*env)->GetObjectArrayElement( env, jnames, ii );
dict = makeDict( MPPARM(mpool) env, jniutil, jname, jdict, dict = makeDict( MPPARM(mpool) env, jniutil, jname, jdict,
jpath, jlang ); jpath, jlang );
XP_ASSERT( !!dict ); XP_ASSERT( !!dict );
(*env)->DeleteLocalRef( env, jdict ); (*env)->DeleteLocalRef( env, jdict );
(*env)->DeleteLocalRef( env, jname ); (*env)->DeleteLocalRef( env, jname );
if ( NULL != jpath) { }
(*env)->DeleteLocalRef( env, jpath ); if ( NULL != jpath) {
} (*env)->DeleteLocalRef( env, jpath );
} }
} }
if ( 0 == ii ) { if ( 0 == ii ) {
@ -470,32 +476,31 @@ makeDict( MPFORMAL JNIEnv *env, JNIUtilCtxt* jniutil, jstring jname,
AndDictionaryCtxt* anddict = (AndDictionaryCtxt*) AndDictionaryCtxt* anddict = (AndDictionaryCtxt*)
and_dictionary_make_empty( MPPARM(mpool) env, jniutil ); and_dictionary_make_empty( MPPARM(mpool) env, jniutil );
jsize len = (*env)->GetArrayLength( env, jbytes ); jsize len = 0;
anddict->byteArray = (*env)->NewGlobalRef( env, jbytes );
anddict->bytes = (*env)->GetByteArrayElements( env, anddict->byteArray,
NULL );
if ( NULL != jpath ) { if ( NULL == jpath ) {
len = (*env)->GetArrayLength( env, jbytes );
anddict->byteArray = (*env)->NewGlobalRef( env, jbytes );
anddict->bytes =
(*env)->GetByteArrayElements( env, anddict->byteArray, NULL );
} else {
anddict->byteArray = NULL;
const char* path = (*env)->GetStringUTFChars( env, jpath, NULL ); const char* path = (*env)->GetStringUTFChars( env, jpath, NULL );
struct stat statbuf; struct stat statbuf;
if ( 0 == stat( path, &statbuf ) ) { if ( 0 == stat( path, &statbuf ) ) {
int fd = open( path, O_RDONLY ); int fd = open( path, O_RDONLY );
if ( fd >= 0 ) { if ( fd >= 0 ) {
void* ptr = mmap( NULL, statbuf.st_size, anddict->bytes = mmap( NULL, statbuf.st_size,
PROT_READ, MAP_PRIVATE, PROT_READ, MAP_PRIVATE,
fd, 0 ); fd, 0 );
close( fd ); close( fd );
if ( MAP_FAILED != ptr ) {
XP_ASSERT( 0 == memcmp( ptr, anddict->bytes, anddict->bytesSize = statbuf.st_size;
statbuf.st_size ) ); len = statbuf.st_size;
(void)munmap( ptr, statbuf.st_size ); XP_ASSERT( MAP_FAILED != anddict->bytes );
XP_LOGF( "%s: all %lld bytes of %s checked out!!!!",
__func__, statbuf.st_size, path );
}
} }
} }
(*env)->ReleaseStringUTFChars( env, jpath, path ); (*env)->ReleaseStringUTFChars( env, jpath, path );
} }

12
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -737,12 +737,14 @@ public class GameUtils {
String path = null; String path = null;
String name = names[ii]; String name = names[ii];
if ( null != name ) { if ( null != name ) {
bytes = seen.get( name );
if ( null == bytes ) {
bytes = openDict( context, name );
seen.put( name, bytes );
}
path = getDictPath( context, name ); path = getDictPath( context, name );
if ( null == path ) {
bytes = seen.get( name );
if ( null == bytes ) {
bytes = openDict( context, name );
seen.put( name, bytes );
}
}
} }
dictBytes[ii] = bytes; dictBytes[ii] = bytes;
dictPaths[ii] = path; dictPaths[ii] = path;