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

add comms stats to conn status display (DEBUG only)

Browse source
This commit is contained in:
Eric House 2019-11-05 08:19:32 -08:00
parent a35f0f7339
commit c69ec52502
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
View file

@ -1,7 +1,7 @@
/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
/*
* Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
* rights reserved.
* Copyright 2009 - 2019 by Eric House (xwords@eehouse.org). All rights
* reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@ -20,7 +20,6 @@
package org.eehouse.android.xw4;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Canvas;
@ -156,7 +155,7 @@ public class ConnStatusHandler {
return s_downOnMe && s_rect.contains( xx, yy );
}
public static String getStatusText( Context context,
public static String getStatusText( Context context, XwJNI.GamePtr gamePtr,
CommsConnTypeSet connTypes,
CommsAddrRec addr )
{
@ -172,7 +171,7 @@ public class ConnStatusHandler {
connTypes.toString( context, true )));
for ( CommsConnType typ : connTypes.getTypes() ) {
sb.append( String.format( "\n\n*** %s ", typ.longName( context ) ) );
String did = addDebugInfo( context, addr, typ );
String did = addDebugInfo( context, gamePtr, addr, typ );
if ( null != did ) {
sb.append( did ).append( " " );
}
@ -634,8 +633,8 @@ public class ConnStatusHandler {
return result;
}
private static String addDebugInfo( Context context, CommsAddrRec addr,
CommsConnType typ )
private static String addDebugInfo( Context context, XwJNI.GamePtr gamePtr,
CommsAddrRec addr, CommsConnType typ )
{
String result = null;
if ( BuildConfig.DEBUG ) {
@ -646,7 +645,10 @@ public class ConnStatusHandler {
result = String.format( "DevID: %d; host: %s; latest FCM: %s",
DevID.getRelayDevIDInt(context),
XWPrefs.getDefaultRelayHost(context),
fcmMsg );
fcmMsg )
+ "\n"
+ XwJNI.comms_getStats( gamePtr );
break;
case COMMS_CONN_P2P:
result = WiDirService.formatNetStateInfo();

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
View file

@ -655,7 +655,7 @@ public class DelegateBase implements DlgClickNotify,
final GameSummary summary = GameUtils.getSummary( context, gamePtr.getRowid(), 1 );
if ( null != summary ) {
final String msg = ConnStatusHandler
.getStatusText( context, summary.conTypes, addr );
.getStatusText( context, gamePtr, summary.conTypes, addr );
post( new Runnable() {
@Override

2
xwords4/common/comms.c
View file

@ -2601,7 +2601,7 @@ comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream )
stream_catString( stream, buf );
XP_SNPRINTF( (XP_UCHAR*)buf, sizeof(buf),
(XP_UCHAR*)"Last message received: %d\n",
(XP_UCHAR*)"Last msg received: %d\n",
rec->lastMsgRcd );
stream_catString( stream, buf );
}