Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-28 07:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

move hostid assignment and tracking into db so it survives reboots and

Browse source 
recycling of crefs between when devices in a game connect.  This plus
movement of messages into the DB will re-enable games played without
the two devices ever being connected at the same time.
This commit is contained in:
Andy2 2010-09-23 05:33:27 -07:00
parent 1d0c207521
commit 85b4f3f075
5 changed files with 94 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xwords4/relay/cref.cpp
View file

@ -88,7 +88,6 @@ CookieRef::ReInit( const char* cookie, const char* connName, CookieID id,
m_cookieID = id;
m_totalSent = 0;
m_curState = XWS_INITED;
m_nextHostID = HOST_ID_SERVER;
m_nPlayersSought = nPlayers;
m_nPlayersHere = nAlreadyHere;
m_locking_thread = 0;
@ -383,7 +382,7 @@ CookieRef::removeSocket( int socket )
logf( XW_LOGINFO,
"Never got ack; removing %d players from DB",
iter->m_nPlayersH );
DBMgr::Get()->RmPlayers( ConnName(), iter->m_nPlayersH );
DBMgr::Get()->RmDevice( ConnName(), iter->m_hostID );
m_nPlayersHere -= iter->m_nPlayersH;
--m_nPendingAcks;
}
@ -482,7 +481,7 @@ CookieRef::pushConnectEvent( int socket, int nPlayersH, int nPlayersS,
CRefEvent evt;
evt.type = XWE_DEVCONNECT;
evt.u.con.socket = socket;
evt.u.con.srcID = nextHostID();
evt.u.con.srcID = HOST_ID_NONE;
evt.u.con.nPlayersH = nPlayersH;
evt.u.con.nPlayersS = nPlayersS;
evt.u.con.seed = seed;
@ -786,7 +785,7 @@ CookieRef::send_stored_messages( HostID dest, int socket )
} /* send_stored_messages */
bool
CookieRef::increasePlayerCounts( const CRefEvent* evt, bool reconn )
CookieRef::increasePlayerCounts( CRefEvent* evt, bool reconn )
{
int nPlayersH = evt->u.con.nPlayersH;
int socket = evt->u.con.socket;
@ -812,10 +811,10 @@ CookieRef::increasePlayerCounts( const CRefEvent* evt, bool reconn )
if ( !reconn ) {
m_nPlayersHere += nPlayersH;
assert( m_nPlayersHere <= m_nPlayersSought );
DBMgr::Get()->AddPlayers( ConnName(), nPlayersH );
evt->u.con.srcID = DBMgr::Get()->AddDevice( ConnName(), nPlayersH );
}
HostID hostid = evt->u.con.srcID;
/* first add the rec here, whether it'll get ack'd or not */
logf( XW_LOGINFO, "%s: remembering pair: hostid=%x, "
"socket=%d (size=%d)",
@ -846,7 +845,7 @@ CookieRef::modPending( const CRefEvent* evt, bool keep )
if ( keep ) {
iter->m_ackPending = false;
} else {
DBMgr::Get()->RmPlayers( ConnName(), iter->m_nPlayersH );
DBMgr::Get()->RmDevice( ConnName(), iter->m_hostID );
m_sockets.erase( iter );
}
break;

5
xwords4/relay/cref.h
View file

@ -202,7 +202,7 @@ class CookieRef {
void sendResponse( const CRefEvent* evt, bool initial );
void sendAnyStored( const CRefEvent* evt );
void initPlayerCounts( const CRefEvent* evt );
bool increasePlayerCounts( const CRefEvent* evt, bool reconn );
bool increasePlayerCounts( CRefEvent* evt, bool reconn );
void modPending( const CRefEvent* evt, bool keep );
void postCheckAllHere();
@ -234,8 +234,6 @@ class CookieRef {
void assignConnName( void );
void assignHostIds( void );
HostID nextHostID() { return m_nextHostID++; }
time_t GetStarttime( void ) { return m_starttime; }
int GetLangCode( void ) { return m_langCode; }
@ -272,7 +270,6 @@ class CookieRef {
XW_RELAY_STATE m_curState;
deque<CRefEvent> m_eventQueue;
HostID m_nextHostID;
int m_nPlayersSought;
int m_nPlayersHere;
int m_langCode;

122
xwords4/relay/dbmgr.cpp
View file

@ -28,8 +28,12 @@
#define DB_NAME "xwgames"
#define TABLE_NAME "games"
#define ARRAYSUM "(nPerDevice[1]+nPerDevice[2]+nPerDevice[3]+nPerDevice[4])"
static DBMgr* s_instance = NULL;
static int sumArray( const char* const str );
/* static */ DBMgr*
DBMgr::Get()
{
@ -80,39 +84,17 @@ void
DBMgr::AddNew( const char* cookie, const char* connName, CookieID cid,
int langCode, int nPlayersT, bool isPublic )
{
#if 1
if ( !cookie ) cookie = "";
if ( !connName ) connName = "";
const char* fmt = "INSERT INTO " TABLE_NAME
"(cid, room, connName, nTotal, nJoined, lang, ispublic, ctime) "
"VALUES( %d, '%s', '%s', %d, %d, %d, %s, 'now' )";
"(cid, room, connName, nTotal, nPerDevice, lang, ispublic, ctime) "
"VALUES( %d, '%s', '%s', %d, ARRAY[0,0,0,0], %d, %s, 'now' )";
char buf[256];
snprintf( buf, sizeof(buf), fmt, cid/*m_nextCID++*/, cookie, connName,
nPlayersT, 0, langCode, isPublic?"TRUE":"FALSE" );
nPlayersT, langCode, isPublic?"TRUE":"FALSE" );
logf( XW_LOGINFO, "passing %s", buf );
execSql( buf );
#else
const char* command = "INSERT INTO games (cookie, connName, ntotal, "
"nJoined, lang) VALUES( $1, $2, $3, $4, $5 )";
char nPlayersTBuf[4];
char langBuf[4];
snprintf( nPlayersHBuf, sizeof(nPlayersHBuf), "%d", nPlayersH );
snprintf( nPlayersTBuf, sizeof(nPlayersTBuf), "%d", nPlayersT );
snprintf( langBuf, sizeof(langBuf), "%d", langCode );
const char * const paramValues[] = { cookie, connName, nPlayersTBuf, nPlayersHBuf, langBuf };
PGresult* result = PQexecParams( m_pgconn, command,
sizeof(paramValues)/sizeof(paramValues[0]),
NULL, /*const Oid *paramTypes,*/
paramValues,
NULL, /*const int *paramLengths,*/
NULL, /*const int *paramFormats,*/
0 /*int resultFormat*/ );
logf( XW_LOGINFO, "PQexecParams=>%d", result );
#endif
}
CookieID
@ -121,7 +103,7 @@ DBMgr::FindGame( const char* connName, char* cookieBuf, int bufLen,
{
CookieID cid = 0;
const char* fmt = "SELECT cid, room, lang, nTotal, nJoined FROM " TABLE_NAME
const char* fmt = "SELECT cid, room, lang, nTotal, nPerDevice FROM " TABLE_NAME
" where connName = '%s' "
"LIMIT 1";
char query[256];
@ -151,13 +133,13 @@ DBMgr::FindOpen( const char* cookie, int lang, int nPlayersT, int nPlayersH,
{
CookieID cid = 0;
const char* fmt = "SELECT cid, connName, nJoined FROM " TABLE_NAME " "
"WHERE room = '%s' "
"AND lang = %d "
"AND nTotal = %d "
"AND %d <= nTotal-nJoined "
"AND %s = ispublic "
"LIMIT 1";
const char* fmt = "SELECT cid, connName, nPerDevice FROM " TABLE_NAME " "
" WHERE room = '%s'"
" AND lang = %d"
" AND nTotal = %d"
" AND %d <= nTotal-" ARRAYSUM
" AND %s = ispublic"
" LIMIT 1";
char query[256];
snprintf( query, sizeof(query), fmt,
cookie, lang, nPlayersT, nPlayersH, wantsPublic?"TRUE":"FALSE" );
@ -169,7 +151,7 @@ DBMgr::FindOpen( const char* cookie, int lang, int nPlayersT, int nPlayersH,
if ( 1 == PQntuples( result ) ) {
cid = atoi( PQgetvalue( result, 0, 0 ) );
snprintf( connNameBuf, bufLen, "%s", PQgetvalue( result, 0, 1 ) );
*nPlayersHP = atoi( PQgetvalue( result, 0, 2 ) );
*nPlayersHP = sumArray( PQgetvalue( result, 0, 2 ) );
/* cid may be 0, but should use game anyway */
}
PQclear( result );
@ -177,22 +159,43 @@ DBMgr::FindOpen( const char* cookie, int lang, int nPlayersT, int nPlayersH,
return cid;
} /* FindOpen */
void
DBMgr::AddPlayers( const char* connName, int nToAdd )
HostID
DBMgr::AddDevice( const char* connName, int nToAdd )
{
const char* fmt = "UPDATE " TABLE_NAME " SET nJoined = nJoined+%d "
HostID newID = HOST_ID_NONE;
int arr[4];
MutexLock ml( &m_dbMutex );
readArray_locked( connName, arr );
for ( newID = HOST_ID_SERVER; newID <= 4; ++newID ) {
if ( arr[newID-1] == 0 ) {
break;
}
}
assert( newID <= 4 );
const char* fmt = "UPDATE " TABLE_NAME " SET nPerDevice[%d] = %d "
"WHERE connName = '%s'";
char query[256];
snprintf( query, sizeof(query), fmt, nToAdd, connName );
snprintf( query, sizeof(query), fmt, newID, nToAdd, connName );
logf( XW_LOGINFO, "%s: query: %s", __func__, query );
execSql( query );
execSql_locked( query );
return newID;
}
void
DBMgr::RmPlayers( const char* connName, int nToAdd )
DBMgr::RmDevice( const char* connName, HostID hid )
{
AddPlayers( connName, 0 - nToAdd );
const char* fmt = "UPDATE " TABLE_NAME " SET nPerDevice[%d] = 0 "
"WHERE connName = '%s'";
char query[256];
snprintf( query, sizeof(query), fmt, hid, connName );
logf( XW_LOGINFO, "%s: query: %s", __func__, query );
execSql( query );
}
void
@ -231,7 +234,7 @@ DBMgr::PublicRooms( int lang, int nPlayers, int* nNames, string& names )
int ii;
int nTuples;
const char* fmt = "SELECT room, nTotal-nJoined FROM " TABLE_NAME
const char* fmt = "SELECT room, nTotal-" ARRAYSUM " FROM " TABLE_NAME
" WHERE ispublic = TRUE AND lang = %d AND ntotal =% d";
char query[256];
@ -255,6 +258,12 @@ void
DBMgr::execSql( const char* query )
{
MutexLock ml( &m_dbMutex );
execSql_locked( query );
}
void
DBMgr::execSql_locked( const char* query )
{
PGresult* result = PQexec( m_pgconn, query );
if ( PGRES_COMMAND_OK != PQresultStatus(result) ) {
logf( XW_LOGERROR, "PQexec=>%s", PQresStatus(PQresultStatus(result) ));
@ -263,6 +272,35 @@ DBMgr::execSql( const char* query )
PQclear( result );
}
void
DBMgr::readArray_locked( const char* const connName, int arr[] ) /* len 4 */
{
const char* fmt = "SELECT nPerDevice FROM " TABLE_NAME " WHERE connName='%s'";
char query[256];
snprintf( query, sizeof(query), fmt, connName );
logf( XW_LOGINFO, "%s: query: %s", __func__, query );
PGresult* result = PQexec( m_pgconn, query );
assert( 1 == PQntuples( result ) );
const char* arrStr = PQgetvalue( result, 0, 0 );
sscanf( arrStr, "{%d,%d,%d,%d}", &arr[0], &arr[1], &arr[2], &arr[3] );
PQclear( result );
}
static int
sumArray( const char* const arrStr )
{
int arr[4];
sscanf( arrStr, "{%d,%d,%d,%d}", &arr[0], &arr[1], &arr[2], &arr[3] );
int sum = 0;
int ii;
for ( ii = 0; ii < 4; ++ii ) {
sum += arr[ii];
}
return sum;
}
/*
Schema:
CREATE TABLE games (

8
xwords4/relay/dbmgr.h
View file

@ -24,6 +24,7 @@
#include <string>
#include "xwrelay.h"
#include "xwrelay_priv.h"
#include <libpq-fe.h>
using namespace std;
@ -45,8 +46,8 @@ class DBMgr {
int nPlayersH, bool wantsPublic,
char* connNameBuf, int bufLen, int* nPlayersHP );
void AddPlayers( const char* const connName, int nToAdd );
void RmPlayers( const char* const connName, int nToAdd );
HostID AddDevice( const char* const connName, int nToAdd );
void RmDevice( const char* const connName, HostID id );
void AddCID( const char* connName, CookieID cid );
void ClearCID( const char* connName );
@ -59,6 +60,9 @@ class DBMgr {
private:
DBMgr();
void execSql( const char* query ); /* no-results query */
void execSql_locked( const char* query );
void readArray_locked( const char* const connName, int arr[] );
PGconn* m_pgconn;
pthread_mutex_t m_dbMutex;
}; /* DBMgr */

2
xwords4/relay/xwrelay.sh
View file

@ -26,7 +26,7 @@ lang INTEGER,
isPublic BOOLEAN,
connName VARCHAR(64) UNIQUE PRIMARY KEY,
nTotal INTEGER,
nJoined INTEGER,
nPerDevice INTEGER[],
ctime TIMESTAMP,
mtime TIMESTAMP
);