rewrote memory system entirely (hunk, cache, and zone are gone, memory pools replaced...

[xonotic/darkplaces.git] / net_main.c

diff --git a/net_main.c b/net_main.c
index 3fa471ceefaa8b8e797797f8a3290e42b5019735..df40cad6b5dbd21c74218c5673b6a4e8dba0cbcc 100644 (file)
--- a/net_main.c
+++ b/net_main.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

 
 See the GNU General Public License for more details.
 
 
 See the GNU General Public License for more details.
 


@@ -25,7 +25,6 @@ qsocket_t     *net_activeSockets = NULL;
 qsocket_t      *net_freeSockets = NULL;
 int                    net_numsockets = 0;
 
 qsocket_t      *net_freeSockets = NULL;
 int                    net_numsockets = 0;
 

-qboolean       serialAvailable = false;

 qboolean       ipxAvailable = false;
 qboolean       tcpipAvailable = false;
 
 qboolean       ipxAvailable = false;
 qboolean       tcpipAvailable = false;
 


@@ -35,11 +34,6 @@ int                  DEFAULTnet_hostport = 26000;
 char           my_ipx_address[NET_NAMELEN];
 char           my_tcpip_address[NET_NAMELEN];
 
 char           my_ipx_address[NET_NAMELEN];
 char           my_tcpip_address[NET_NAMELEN];
 

-void (*GetComPortConfig) (int portNumber, int *port, int *irq, int *baud, qboolean *useModem);
-void (*SetComPortConfig) (int portNumber, int port, int irq, int baud, qboolean useModem);
-void (*GetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);
-void (*SetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);
-

 static qboolean        listening = false;
 
 qboolean       slistInProgress = false;
 static qboolean        listening = false;
 
 qboolean       slistInProgress = false;


@@ -62,18 +56,10 @@ int messagesReceived = 0;
 int unreliableMessagesSent = 0;
 int unreliableMessagesReceived = 0;
 
 int unreliableMessagesSent = 0;
 int unreliableMessagesReceived = 0;
 

-cvar_t net_messagetimeout = {"net_messagetimeout","300"};
-cvar_t hostname = {"hostname", "UNNAMED"};
+cvar_t net_messagetimeout = {0, "net_messagetimeout","300"};
+cvar_t hostname = {CVAR_SAVE, "hostname", "UNNAMED"};

 
 qboolean       configRestored = false;
 
 qboolean       configRestored = false;

-cvar_t config_com_port = {"_config_com_port", "0x3f8", true};
-cvar_t config_com_irq = {"_config_com_irq", "4", true};
-cvar_t config_com_baud = {"_config_com_baud", "57600", true};
-cvar_t config_com_modem = {"_config_com_modem", "1", true};
-cvar_t config_modem_dialtype = {"_config_modem_dialtype", "T", true};
-cvar_t config_modem_clear = {"_config_modem_clear", "ATZ", true};
-cvar_t config_modem_init = {"_config_modem_init", "", true};
-cvar_t config_modem_hangup = {"_config_modem_hangup", "AT H", true};

 
 // these two macros are to make the code more readable
 #define sfunc  net_drivers[sock->driver]
 
 // these two macros are to make the code more readable
 #define sfunc  net_drivers[sock->driver]


@@ -86,7 +72,7 @@ double                        net_time;
 
 double SetNetTime(void)
 {
 
 double SetNetTime(void)
 {

-       net_time = Sys_FloatTime();
+       net_time = Sys_DoubleTime();

        return net_time;
 }
 
        return net_time;
 }
 


@@ -298,7 +284,7 @@ void NET_Slist_f (void)
        }
 
        slistInProgress = true;
        }
 
        slistInProgress = true;

-       slistStartTime = Sys_FloatTime();
+       slistStartTime = Sys_DoubleTime();

 
        SchedulePollProcedure(&slistSendProcedure, 0.0);
        SchedulePollProcedure(&slistPollProcedure, 0.1);
 
        SchedulePollProcedure(&slistSendProcedure, 0.0);
        SchedulePollProcedure(&slistPollProcedure, 0.1);


@@ -318,7 +304,7 @@ static void Slist_Send(void)
                dfunc.SearchForHosts (true);
        }
 
                dfunc.SearchForHosts (true);
        }
 

-       if ((Sys_FloatTime() - slistStartTime) < 0.5)
+       if ((Sys_DoubleTime() - slistStartTime) < 0.5)

                SchedulePollProcedure(&slistSendProcedure, 0.75);
 }
 
                SchedulePollProcedure(&slistSendProcedure, 0.75);
 }
 


@@ -337,7 +323,7 @@ static void Slist_Poll(void)
        if (! slistSilent)
                PrintSlist();
 
        if (! slistSilent)
                PrintSlist();
 

-       if ((Sys_FloatTime() - slistStartTime) < 1.5)
+       if ((Sys_DoubleTime() - slistStartTime) < 1.5)

        {
                SchedulePollProcedure(&slistPollProcedure, 0.1);
                return;
        {
                SchedulePollProcedure(&slistPollProcedure, 0.1);
                return;


@@ -655,7 +641,7 @@ int NET_SendToAll(sizebuf_t *data, int blocktime)
                }
        }
 
                }
        }
 

-       start = Sys_FloatTime();
+       start = Sys_DoubleTime();

        while (count)
        {
                count = 0;
        while (count)
        {
                count = 0;


@@ -690,7 +676,7 @@ int NET_SendToAll(sizebuf_t *data, int blocktime)
                                continue;
                        }
                }
                                continue;
                        }
                }

-               if ((Sys_FloatTime() - start) > blocktime)
+               if ((Sys_DoubleTime() - start) > blocktime)

                        break;
        }
        return count;
                        break;
        }
        return count;


@@ -705,6 +691,8 @@ NET_Init
 ====================
 */
 
 ====================
 */
 

+static mempool_t *net_mempool;
+

 void NET_Init (void)
 {
        int                     i;
 void NET_Init (void)
 {
        int                     i;


@@ -734,27 +722,21 @@ void NET_Init (void)
 
        SetNetTime();
 
 
        SetNetTime();
 

+       net_mempool = Mem_AllocPool("qsocket");
+       s = Mem_Alloc(net_mempool, net_numsockets * sizeof(qsocket_t));

        for (i = 0; i < net_numsockets; i++)
        {
        for (i = 0; i < net_numsockets; i++)
        {

-               s = (qsocket_t *)Hunk_AllocName(sizeof(qsocket_t), "qsocket");

                s->next = net_freeSockets;
                net_freeSockets = s;
                s->disconnected = true;
                s->next = net_freeSockets;
                net_freeSockets = s;
                s->disconnected = true;

+               s++;

        }
 
        // allocate space for network message buffer
        }
 
        // allocate space for network message buffer

-       SZ_Alloc (&net_message, NET_MAXMESSAGE);
+       SZ_Alloc (&net_message, NET_MAXMESSAGE, "net_message");

 
        Cvar_RegisterVariable (&net_messagetimeout);
        Cvar_RegisterVariable (&hostname);
 
        Cvar_RegisterVariable (&net_messagetimeout);
        Cvar_RegisterVariable (&hostname);

-       Cvar_RegisterVariable (&config_com_port);
-       Cvar_RegisterVariable (&config_com_irq);
-       Cvar_RegisterVariable (&config_com_baud);
-       Cvar_RegisterVariable (&config_com_modem);
-       Cvar_RegisterVariable (&config_modem_dialtype);
-       Cvar_RegisterVariable (&config_modem_clear);
-       Cvar_RegisterVariable (&config_modem_init);
-       Cvar_RegisterVariable (&config_modem_hangup);

 
        Cmd_AddCommand ("slist", NET_Slist_f);
        Cmd_AddCommand ("listen", NET_Listen_f);
 
        Cmd_AddCommand ("slist", NET_Slist_f);
        Cmd_AddCommand ("listen", NET_Listen_f);


@@ -805,6 +787,8 @@ void                NET_Shutdown (void)
                        net_drivers[net_driverlevel].initialized = false;
                }
        }
                        net_drivers[net_driverlevel].initialized = false;
                }
        }

+
+       Mem_FreePool(&net_mempool);

 }
 
 
 }
 
 


@@ -813,21 +797,9 @@ static PollProcedure *pollProcedureList = NULL;
 void NET_Poll(void)
 {
        PollProcedure *pp;
 void NET_Poll(void)
 {
        PollProcedure *pp;

-       qboolean        useModem;

 
        if (!configRestored)
 
        if (!configRestored)

-       {
-               if (serialAvailable)
-               {
-                       if (config_com_modem.value == 1.0)
-                               useModem = true;
-                       else
-                               useModem = false;
-                       SetComPortConfig (0, (int)config_com_port.value, (int)config_com_irq.value, (int)config_com_baud.value, useModem);
-                       SetModemConfig (0, config_modem_dialtype.string, config_modem_clear.string, config_modem_init.string, config_modem_hangup.string);
-               }

                configRestored = true;
                configRestored = true;

-       }

 
        SetNetTime();
 
 
        SetNetTime();
 


@@ -845,7 +817,7 @@ void SchedulePollProcedure(PollProcedure *proc, double timeOffset)
 {
        PollProcedure *pp, *prev;
 
 {
        PollProcedure *pp, *prev;
 

-       proc->nextTime = Sys_FloatTime() + timeOffset;
+       proc->nextTime = Sys_DoubleTime() + timeOffset;

        for (pp = pollProcedureList, prev = NULL; pp; pp = pp->next)
        {
                if (pp->nextTime >= proc->nextTime)
        for (pp = pollProcedureList, prev = NULL; pp; pp = pp->next)
        {
                if (pp->nextTime >= proc->nextTime)