Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

run post in thread since it takes time

Browse source
This commit is contained in:
Eric House 2017-10-20 06:26:46 -07:00
parent 3045697d31
commit 816df4336c
2 changed files with 67 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/linux/gtkboard.c
View file

@ -1175,6 +1175,15 @@ handle_memstats( GtkWidget* XP_UNUSED(widget), GtkGameGlobals* globals )
stream_destroy( stream );
} /* handle_memstats */
static void
handle_movescheck( GtkWidget* XP_UNUSED(widget), GtkGameGlobals* globals )
{
LaunchParams* params = globals->cGlobals.params;
if ( checkForMsgs( params, &globals->cGlobals.game ) ) {
board_draw( globals->cGlobals.game.board );
}
}
#endif
#ifdef XWFEATURE_ACTIVERECT
@ -1281,6 +1290,8 @@ makeMenus( GtkGameGlobals* globals )
#ifdef MEM_DEBUG
(void)createAddItem( fileMenu, "Mem stats",
(GCallback)handle_memstats, globals );
(void)createAddItem( fileMenu, "Check for moves",
(GCallback)handle_movescheck, globals );
#endif
#ifdef XWFEATURE_ACTIVERECT

83
xwords4/linux/relaycon.c
View file

@ -529,11 +529,46 @@ hostNameToIP( const XP_UCHAR* name )
return ip;
}
typedef struct _PostArgs {
RelayConStorage* storage;
ReadState rs;
const XP_U8* msgbuf;
XP_U16 len;
} PostArgs;
static ssize_t
post( RelayConStorage* storage, const XP_U8* msgbuf, XP_U16 len )
static gboolean
onGotData(gpointer user_data)
{
const char* data = g_base64_encode( msgbuf, len );
PostArgs* pa = (PostArgs*)user_data;
/* Now pull any data from the reply */
// got "{"status": "ok", "dataLen": 14, "data": "AYQDiDAyMUEzQ0MyADw=", "err": "none"}"
json_object* reply = json_tokener_parse( pa->rs.ptr );
json_object* replyData;
if ( json_object_object_get_ex( reply, "data", &replyData ) && !!replyData ) {
int len = json_object_array_length(replyData);
for ( int ii = 0; ii < len; ++ii ) {
json_object* datum = json_object_array_get_idx( replyData, ii );
const char* str = json_object_get_string( datum );
gsize out_len;
guchar* buf = g_base64_decode( (const gchar*)str, &out_len );
process( pa->storage, buf, out_len );
g_free( buf );
}
(void)json_object_put( replyData );
}
(void)json_object_put( reply );
g_free( pa->rs.ptr );
g_free( pa );
return FALSE;
}
static void*
postThread( void* arg )
{
PostArgs* pa = (PostArgs*)arg;
const char* data = g_base64_encode( pa->msgbuf, pa->len );
struct json_object* jobj = json_object_new_object();
struct json_object* jstr = json_object_new_string(data);
// g_free( data );
@ -541,10 +576,8 @@ post( RelayConStorage* storage, const XP_U8* msgbuf, XP_U16 len )
const char* asStr = json_object_to_json_string( jobj );
XP_LOGF( "%s: added str: %s", __func__, asStr );
ReadState rs = {
.ptr = g_malloc0(1),
.curSize = 1L
};
pa->rs.ptr = g_malloc0(1);
pa->rs.curSize = 1L;
CURLcode res = curl_global_init(CURL_GLOBAL_DEFAULT);
XP_ASSERT(res == CURLE_OK);
@ -563,7 +596,7 @@ post( RelayConStorage* storage, const XP_U8* msgbuf, XP_U16 len )
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)strlen(buf));
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback );
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &rs );
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &pa->rs );
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
res = curl_easy_perform(curl);
@ -577,28 +610,24 @@ post( RelayConStorage* storage, const XP_U8* msgbuf, XP_U16 len )
curl_global_cleanup();
(void)json_object_put( jobj );
XP_LOGF( "%s(): got \"%s\"", __func__, rs.ptr );
XP_LOGF( "%s(): got \"%s\"", __func__, pa->rs.ptr );
/* Now pull any data from the reply */
// got "{"status": "ok", "dataLen": 14, "data": "AYQDiDAyMUEzQ0MyADw=", "err": "none"}"
json_object* reply = json_tokener_parse( rs.ptr );
json_object* replyData;
if ( json_object_object_get_ex( reply, "data", &replyData ) && !!replyData ) {
int len = json_object_array_length(replyData);
for ( int ii = 0; ii < len; ++ii ) {
json_object* datum = json_object_array_get_idx( replyData, ii );
const char* str = json_object_get_string( datum );
gsize out_len;
guchar* buf = g_base64_decode( (const gchar*)str, &out_len );
process( storage, buf, out_len );
g_free( buf );
}
(void)json_object_put( replyData );
}
(void)json_object_put( reply );
(void)g_idle_add(onGotData, pa);
g_free( rs.ptr );
return NULL;
}
static ssize_t
post( RelayConStorage* storage, const XP_U8* msgbuf, XP_U16 len )
{
PostArgs* pa = (PostArgs*)g_malloc0(sizeof(*pa));
pa->storage = storage;
pa->msgbuf = msgbuf;
pa->len = len;
pthread_t thread;
(void)pthread_create( &thread, NULL, postThread, (void*)pa );
pthread_detach( thread );
return len;
}