move database requests to seperate thread
[carveJwlIkooP6JGAAIwe30JlM.git] / gameserver.c
index 3b58b2360fda202c502d40a4c142849d200fdd8a..3cbf87791fc0167a1c5d91c7a0f44c6fbb35040d 100644 (file)
@@ -15,6 +15,7 @@ volatile sig_atomic_t sig_stop;
 #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;
@@ -394,63 +395,6 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){
    }
 }
 
-#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;
@@ -480,23 +424,12 @@ static void poll_connections(void){
          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 );
       }
    }
@@ -506,26 +439,8 @@ static u64 seconds_to_server_ticks( double s ){
    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 ) ){
@@ -535,9 +450,9 @@ int main( int argc, char *argv[] ){
          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 );
@@ -546,20 +461,25 @@ int main( int argc, char *argv[] ){
    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 )){
@@ -581,15 +501,9 @@ int main( int argc, char *argv[] ){
 
    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 );
@@ -600,7 +514,6 @@ int main( int argc, char *argv[] ){
    /*
     * Create a listener
     */
-
    HSteamListenSocket listener;
    SteamNetworkingIPAddr localAddr;
    SteamAPI_SteamNetworkingIPAddr_Clear( &localAddr );
@@ -616,9 +529,6 @@ int main( int argc, char *argv[] ){
        last_scoreboard_gen = 0,
        last_monitor_heartbeat = 0;
 
-   generate_boards();
-   monitor_start_server();
-
    while( !sig_stop ){
       monitor_event_loop();
       steamworks_event_loop( hsteampipe );
@@ -633,19 +543,10 @@ int main( int argc, char *argv[] ){
          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(