#include "vg/vg_opt.h"
#include "network_common.h"
#include "gameserver_db.h"
+#include "vg/vg_m.h"
static void inthandler( int signum ) {
sig_stop = 1;
}
}
-#if 0
-static void on_inet_score_request( SteamNetworkingMessage_t *msg ){
- if( !inet_require_auth(msg) ) return;
-
- SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
- hSteamNetworkingSockets, msg->m_conn,
- &scoreboard_client_data, sizeof(netmsg_scoreboard),
- k_nSteamNetworkingSend_Reliable, NULL );
-}
-
-static void on_inet_set_nickname( SteamNetworkingMessage_t *msg ){
- if(!inet_require_auth(msg)) return;
-
- u64_steamid steamid = get_connection_authsteamid(msg);
- netmsg_set_nickname *setnick = msg->m_pData;
- if( msg->m_cbSize < sizeof(netmsg_set_nickname) ){
- vg_warn( "Invalid nickname request from client: %u, steamid: %lu\n",
- msg->m_conn, steamid );
- return;
- }
-
- highscore_set_user_nickname( steamid, setnick->nickname );
-}
-
-static void on_inet_set_score( SteamNetworkingMessage_t *msg ){
- if(!inet_require_auth(msg)) return;
-
- u64_steamid steamid = get_connection_authsteamid(msg);
-
- if( msg->m_cbSize < sizeof(netmsg_set_score) ){
- vg_warn( "Invalid set score post from client: %u, steamid: %lu\n",
- msg->m_conn, steamid );
- return;
- }
-
- netmsg_set_score *info = msg->m_pData;
-
- if( msg->m_cbSize < sizeof(netmsg_set_score) +
- sizeof(struct netmsg_score_record)*info->record_count ){
- vg_warn( "Malformed set score post from client: %u, steamid: %lu\n",
- msg->m_conn, steamid );
- return;
- }
-
- for( int i=0; i<info->record_count; i++ ){
- highscore_record temp;
- temp.trackid = info->records[i].trackid;
- temp.datetime = time(NULL);
- temp.playerid = steamid;
- temp.points = info->records[i].points;
- temp.time = info->records[i].time;
-
- highscores_push_record( &temp );
- }
-}
-#endif
-
static void poll_connections(void){
SteamNetworkingMessage_t *messages[32];
int len;
else{
if( tmp->inetmsg_id == k_inetmsg_auth )
gameserver_rx_auth( msg );
-#if 0
- else if( tmp->inetmsg_id == k_inetmsg_scores_request )
- on_inet_score_request( msg );
- else if( tmp->inetmsg_id == k_inetmsg_set_nickname )
- on_inet_set_nickname( msg );
- else if( tmp->inetmsg_id == k_inetmsg_set_score )
- on_inet_set_score( msg );
- else if( tmp->inetmsg_id == k_inetmsg_playerframe )
- on_inet_playerframe( msg );
-#endif
else {
vg_warn( "Unknown inetmsg_id recieved from client. (%u)\n",
tmp->inetmsg_id );
}
}
-
SteamAPI_SteamNetworkingMessage_t_Release( msg );
}
}
return s / 0.01;
}
-static void generate_boards(void){
- FILE *fp = fopen( "www/html/srhighscores.txt", "w" );
-
- if( !fp ){
- vg_error( "Can't write boards to www/html/srhighscores.txt\n" );
- return;
- }
-
- for( int i=0; i<vg_list_size(track_infos); i++ ){
- struct netmsg_board *board = &scoreboard_client_data.boards[i];
-
- highscores_board_generate( board->data, i, 10 );
- highscores_board_printf( fp, board->data, 10 );
- }
-
- fclose( fp );
-}
-
-int main( int argc, char *argv[] ){
- db_init();
+static void test_runner( db_request *req ){
+ vg_warn( "RUNNER\n" );
char table[DB_TABLE_UID_MAX];
if( db_get_highscore_table_name( "sr003-local-mp_mtzero",
"megapark-yellow", 302, table ) ){
vg_success( "Returned time: %u\n", v );
}
}
- db_free();
- return 0;
+}
+int main( int argc, char *argv[] ){
signal( SIGINT, inthandler );
signal( SIGQUIT, inthandler );
signal( SIGPIPE, SIG_IGN );
while( vg_argp( argc, argv ) ){
if( vg_long_opt( "noauth" ) )
gameserver.auth_mode = eServerModeNoAuthentication;
+
+ /* TODO: Options to override, ammend, remove etc */
}
- /* TODO: Options to override, ammend, remove etc */
-
vg_set_mem_quota( 80*1024*1024 );
vg_alloc_quota();
- highscores_init( 250000, 10000 );
-
- if( !highscores_read(NULL) )
- highscores_create_db();
+ db_init();
+ db_request *req = db_alloc_request(0);
+ if( req ){
+ req->handler = test_runner;
+ db_send_request(req);
+ }
- steamworks_ensure_txt( "2103940" );
+ monitor_start_server(); /* UNIX socket monitor */
+ /* steamworks init
+ * --------------------------------------------------------------- */
+ steamworks_ensure_txt( "2103940" );
if( gameserver.auth_mode == eServerModeAuthentication ){
if( !vg_load_steam_symetric_key( "application_key",
gameserver.app_symmetric_key )){
SteamAPI_ManualDispatch_Init();
HSteamPipe hsteampipe = SteamGameServer_GetHSteamPipe();
-
- //hSteamHTTP = SteamAPI_SteamGameServerHTTP();
hSteamNetworkingSockets =
SteamAPI_SteamGameServerNetworkingSockets_SteamAPI();
- /*
- * Server code
- */
-
steam_register_callback( k_iSteamNetAuthenticationStatus, on_auth_status );
steam_register_callback( k_iSteamNetConnectionStatusChangedCallBack,
on_connect_status );
/*
* Create a listener
*/
-
HSteamListenSocket listener;
SteamNetworkingIPAddr localAddr;
SteamAPI_SteamNetworkingIPAddr_Clear( &localAddr );
last_scoreboard_gen = 0,
last_monitor_heartbeat = 0;
- generate_boards();
- monitor_start_server();
-
while( !sig_stop ){
monitor_event_loop();
steamworks_event_loop( hsteampipe );
monitor_heartbeat();
}
- if( server_ticks > last_scoreboard_gen + seconds_to_server_ticks(60.0) ){
- last_scoreboard_gen = server_ticks;
- generate_boards();
- }
-
- if( server_ticks > last_record_save + seconds_to_server_ticks(10.0*60.0)){
- last_record_save = server_ticks;
- highscores_serialize_all();
- }
+ if( db_killed() )
+ break;
}
- highscores_serialize_all();
-
SteamAPI_ISteamNetworkingSockets_DestroyPollGroup( hSteamNetworkingSockets,
gameserver.client_group );
SteamAPI_ISteamNetworkingSockets_CloseListenSocket(
#define GAMESERVER_DB_H
#include "vg/vg_log.h"
+#include "vg/vg_mem_queue.h"
#include "network_common.h"
#include "dep/sqlite3/sqlite3.h"
#include "highscores.h"
+#include <pthread.h>
+#include <unistd.h>
#define DB_COURSE_UID_MAX 32
#define DB_TABLE_UID_MAX (ADDON_UID_MAX+DB_COURSE_UID_MAX+32)
#define DB_CRASH_ON_SQLITE_ERROR
#define DB_LOG_SQL_STATEMENTS
+#define DB_REQUEST_BUFFER_SIZE (1024*2)
+
+typedef struct db_request db_request;
+struct db_request {
+ void (*handler)( db_request *req );
+ u32 size,_;
+ u8 data[];
+};
struct {
sqlite3 *db;
+ pthread_t thread;
+ pthread_mutex_t mux;
+
+ vg_queue queue;
+ int kill;
}
static database;
else return 0;
}
-/*
- * Create database connection and users table
- */
-static int db_init(void){
+static void _db_thread_end(void){
+ pthread_mutex_lock( &database.mux );
+ database.kill = 1;
+ pthread_mutex_unlock( &database.mux );
+ sqlite3_close( database.db );
+ pthread_mutex_destroy( &database.mux );
+}
+
+static void *db_loop(void *_){
int rc = sqlite3_open( "highscores.db", &database.db );
if( rc ){
vg_error( "database failure: %s\n", sqlite3_errmsg(database.db) );
- sqlite3_close( database.db );
- return 0;
+ _db_thread_end();
+ return NULL;
}
sqlite3_stmt *stmt = db_stmt(
if( fc == SQLITE_DONE ){
vg_success( "Created users table\n" );
db_updateuser( 76561198072130043, "harry", 2 );
- return 1;
}
else{
log_sqlite3( fc );
- return 0;
+ _db_thread_end();
+ return NULL;
}
}
- else return 0;
+ else {
+ _db_thread_end();
+ return NULL;
+ }
+
+ /*
+ * Request processing loop
+ */
+ while(1){
+ pthread_mutex_lock( &database.mux );
+
+ if( database.kill ){
+ pthread_mutex_unlock( &database.mux );
+ _db_thread_end();
+ break;
+ }
+
+ u32 processed = 0;
+
+ for( u32 i=0; i<16; i ++ ){
+ db_request *req = NULL;
+ if( database.queue.tail ){
+ req = (db_request *)database.queue.tail->data;
+ pthread_mutex_unlock( &database.mux );
+ }
+ else{
+ pthread_mutex_unlock( &database.mux );
+ break;
+ }
+
+ req->handler( req );
+ processed ++;
+
+ pthread_mutex_lock( &database.mux );
+ vg_queue_pop( &database.queue );
+ }
+
+ if( processed )
+ vg_low( "Processed %u database requests.\n", processed );
+
+ usleep(50000);
+ }
+
+ vg_low( "Database thread terminates.\n" );
+ return NULL;
+}
+
+/*
+ * Create database connection and users table
+ */
+static int db_init(void){
+ database.queue.buffer =
+ (u8 *)vg_linear_alloc( vg_mem.rtmemory, DB_REQUEST_BUFFER_SIZE ),
+ database.queue.size = DB_REQUEST_BUFFER_SIZE;
+
+ if( pthread_mutex_init( &database.mux, NULL ) )
+ return 0;
+
+ if( pthread_create( &database.thread, NULL, db_loop, NULL ) )
+ return 0;
+
+ return 1;
+}
+
+static int db_killed(void){
+ pthread_mutex_lock( &database.mux );
+ int result = database.kill;
+ pthread_mutex_unlock( &database.mux );
+ return result;
}
static void db_free(void){
- sqlite3_close( database.db );
+ pthread_mutex_lock( &database.mux );
+ database.kill = 1;
+ pthread_mutex_unlock( &database.mux );
+}
+
+static db_request *db_alloc_request( u32 size ){
+ u32 total = sizeof(db_request) + vg_align8(size);
+
+ pthread_mutex_lock( &database.mux );
+ vg_queue_frame *frame = vg_queue_alloc( &database.queue, size );
+
+ if( frame ){
+ db_request *req = (db_request *)frame->data;
+ req->size = size;
+ return req;
+ }
+ else {
+ pthread_mutex_unlock( &database.mux );
+ return NULL;
+ }
+}
+
+static void db_send_request( db_request *request ){
+ pthread_mutex_unlock( &database.mux );
}
#endif /* GAMESERVER_DB_H */
projects / carveJwlIkooP6JGAAIwe30JlM.git / commitdiff