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

implement util_makeStreamFromAddr() and (android-only)

Browse source 
game_receiveMessage(), the latter combining
comms_checkIncomingStream() and server_receiveMessage() which are
always used together and require a stream be passed between which
currently can't happen across jni.
This commit is contained in:
eehouse 2010-01-31 21:17:21 +00:00
parent 69cbff63f6
commit b0e88eff83
5 changed files with 66 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/jni/andglobals.h
View file

@ -4,6 +4,7 @@
#include "vtabmgr.h"
#include "dictnry.h"
#include "game.h"
typedef struct _AndGlobals {
VTableMgr* vtMgr;
@ -11,6 +12,7 @@ typedef struct _AndGlobals {
DrawCtx* dctx;
XW_UtilCtxt* util;
TransportProcs* xportProcs;
struct JNIState* state;
} AndGlobals;
#endif

8
xwords4/android/XWords4/jni/andutils.c
View file

@ -388,3 +388,11 @@ intToJenumField( JNIEnv* env, jobject jobj, int val, const char* field,
LOG_RETURN_VOID();
} /* intToJenumField */
XWStreamCtxt*
and_empty_stream( MPFORMAL AndGlobals* globals )
{
XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) globals->vtMgr,
globals, 0, NULL );
return stream;
}

11
xwords4/android/XWords4/jni/andutils.h
View file

@ -10,10 +10,17 @@
#include "mempool.h"
#include "dictnry.h"
#include "andglobals.h"
XP_U32 and_ntohl(XP_U32 l);
XP_U16 and_ntohs(XP_U16 l);
XP_U16 and_ntohs(XP_U16 s);
XP_U32 and_htonl(XP_U32 l);
XP_U16 and_htons(XP_U16 l);
XP_U16 and_htons(XP_U16 s);
/* callback for streams */
void and_send_on_close( XWStreamCtxt* stream, void* closure );
XWStreamCtxt* and_empty_stream( MPFORMAL AndGlobals* globals );
int getInt( JNIEnv* env, jobject obj, const char* name );
void setInt( JNIEnv* env, jobject obj, const char* name, int value );

9
xwords4/android/XWords4/jni/utilwrapper.c
View file

@ -1,4 +1,4 @@
/* -*-mode: C; compile-command: "cd XWords4; ../scripts/ndkbuild.sh"; -*- */
/* -*-mode: C; compile-command: "../../scripts/ndkbuild.sh"; -*- */
/*
* Copyright 2001-2009 by Eric House (xwords@eehouse.org). All rights
* reserved.
@ -50,6 +50,13 @@ and_util_getVTManager( XW_UtilCtxt* uc )
static XWStreamCtxt*
and_util_makeStreamFromAddr( XW_UtilCtxt* uc, XP_PlayerAddr channelNo )
{
AndUtil* util = (AndUtil*)uc;
AndGlobals* globals = (AndGlobals*)uc->closure;
XWStreamCtxt* stream = and_empty_stream( MPPARM(util->util.mpool)
globals );
stream_setAddress( stream, channelNo );
stream_setOnCloseProc( stream, and_send_on_close );
return stream;
}
#endif

61
xwords4/android/XWords4/jni/xwjni.c
View file

@ -129,12 +129,16 @@ loadCommonPrefs( JNIEnv* env, CommonPrefs* cp, jobject j_cp )
}
static XWStreamCtxt*
and_empty_stream( MPFORMAL AndGlobals* globals, void* closure )
streamFromJStream( MPFORMAL JNIEnv* env, VTableMgr* vtMgr, jbyteArray jstream )
{
XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) globals->vtMgr,
closure, 0, NULL );
XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) vtMgr,
NULL, 0, NULL );
int len = (*env)->GetArrayLength( env, jstream );
jbyte* jelems = (*env)->GetByteArrayElements( env, jstream, NULL );
stream_putBytes( stream, jelems, len );
(*env)->ReleaseByteArrayElements( env, jstream, jelems, 0 );
return stream;
}
} /* streamFromJStream */
/****************************************************
* These three methods are stateless: no gamePtr
@ -181,12 +185,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_gi_1from_1stream
#endif
VTableMgr* vtMgr = make_vtablemgr( MPPARM_NOCOMMA(mpool) );
jbyte* jelems = (*env)->GetByteArrayElements( env, jstream, NULL );
XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) vtMgr,
NULL, 0, NULL );
int len = (*env)->GetArrayLength( env, jstream );
stream_putBytes( stream, jelems, len );
(*env)->ReleaseByteArrayElements( env, jstream, jelems, 0 );
XWStreamCtxt* stream = streamFromJStream( MPPARM(mpool) env, vtMgr, jstream );
CurGameInfo gi;
XP_MEMSET( &gi, 0, sizeof(gi) );
@ -251,6 +250,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_initJNI
#endif
JNIState* state = (JNIState*)XP_CALLOC( mpool, sizeof(*state) );
AndGlobals* globals = &state->globals;
globals->state = (struct JNIState*)state;
MPASSIGN( state->mpool, mpool );
globals->vtMgr = make_vtablemgr(MPPARM_NOCOMMA(mpool));
@ -333,12 +333,8 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1makeFromStream
globals->dctx = makeDraw( MPPARM(mpool) &state->env, jdraw );
globals->xportProcs = makeXportProcs( MPPARM(mpool) &state->env, jprocs );
jbyte* jelems = (*env)->GetByteArrayElements( env, jstream, NULL );
XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) globals->vtMgr,
NULL, 0, NULL );
int len = (*env)->GetArrayLength( env, jstream );
stream_putBytes( stream, jelems, len );
(*env)->ReleaseByteArrayElements( env, jstream, jelems, 0 );
XWStreamCtxt* stream = streamFromJStream( MPPARM(mpool) env,
globals->vtMgr, jstream );
CommonPrefs cp;
loadCommonPrefs( env, &cp, jcp );
@ -664,7 +660,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1formatDictCounts
{
jstring result;
XWJNI_START();
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals, state );
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals );
server_formatDictCounts( state->game.server, stream, nCols );
result = streamToJString( MPPARM(mpool) env, stream );
stream_destroy( stream );
@ -690,7 +686,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_model_1writeGameHistory
{
jstring result;
XWJNI_START();
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals, state );
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals );
model_writeGameHistory( state->game.model, stream, state->game.server,
gameOver );
result = streamToJString( MPPARM(mpool) env, stream );
@ -706,7 +702,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1writeFinalScores
{
jstring result;
XWJNI_START();
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals, state );
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals );
server_writeFinalScores( state->game.server, stream );
result = streamToJString( MPPARM(mpool) env, stream );
(*env)->DeleteLocalRef( env, result );
@ -715,10 +711,11 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1writeFinalScores
return result;
}
static void
void
and_send_on_close( XWStreamCtxt* stream, void* closure )
{
JNIState* state = (JNIState*)closure;
AndGlobals* globals = (AndGlobals*)closure;
JNIState* state = (JNIState*)globals->state;
XP_ASSERT( !!state->game.comms );
comms_send( state->game.comms, stream );
@ -730,7 +727,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1initClientConnection
{
LOG_FUNC();
XWJNI_START();
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals, state );
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals );
stream_setOnCloseProc( stream, and_send_on_close );
server_initClientConnection( state->game.server, stream );
XWJNI_END();
@ -775,3 +772,23 @@ Java_org_eehouse_android_xw4_jni_XwJNI_comms_1setAddr
}
XWJNI_END();
}
JNIEXPORT jboolean JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_game_1receiveMessage
( JNIEnv* env, jclass C, jint gamePtr, jbyteArray jstream )
{
jboolean result;
XWJNI_START();
XP_ASSERT( state->game.comms );
XP_ASSERT( state->game.server );
XWStreamCtxt* stream = streamFromJStream( MPPARM(mpool) env, globals->vtMgr,
jstream );
result = comms_checkIncomingStream( state->game.comms, stream, NULL )
&& server_receiveMessage( state->game.server, stream );
stream_destroy( stream );
XWJNI_END();
return result;
}