yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 20:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Split the server side memory management into an own file

Browse source
This commit is contained in:
Yamagi Burmeister 2010-08-31 08:58:46 +00:00
parent e72bd4af00
commit 6c81165985
3 changed files with 100 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -212,7 +212,8 @@ COMMON_OBJS = \
build/common/msg_io.o \
build/common/msg_read.o \
build/common/net_chan.o \
build/common/pmove.o
build/common/pmove.o \
build/common/szone.o
# ----------
@ -293,7 +294,8 @@ DEDICATED_SERVER_COMMON_OBJS = \
build/dedicated_server_common/msg_io.o \
build/dedicated_server_common/msg_read.o \
build/dedicated_server_common/net_chan.o \
build/dedicated_server_common/pmove.o
build/dedicated_server_common/pmove.o \
build/dedicated_server_common/szone.o
# ----------
@ -552,7 +554,10 @@ build/common/net_chan.o : src/common/net_chan.c
build/common/pmove.o : src/common/pmove.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/common/szone.o : src/common/szone.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
# ----------
build/unzip/ioapi.o : src/unzip/ioapi.c
@ -710,7 +715,10 @@ build/dedicated_server_common/net_chan.o : src/common/net_chan.c
build/dedicated_server_common/pmove.o : src/common/pmove.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
build/dedicated_server_common/szone.o : src/common/szone.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
# ----------
# Dedicated server POSIX build

58
src/common/common.c
View file

@ -81,65 +81,7 @@ Handles byte ordering and avoids alignment errors
//===========================================================================
void SZ_Init (sizebuf_t *buf, byte *data, int length)
{
memset (buf, 0, sizeof(*buf));
buf->data = data;
buf->maxsize = length;
}
void SZ_Clear (sizebuf_t *buf)
{
buf->cursize = 0;
buf->overflowed = false;
}
void *SZ_GetSpace (sizebuf_t *buf, int length)
{
void *data;
if (buf->cursize + length > buf->maxsize)
{
if (!buf->allowoverflow)
Com_Error (ERR_FATAL, "SZ_GetSpace: overflow without allowoverflow set");
if (length > buf->maxsize)
Com_Error (ERR_FATAL, "SZ_GetSpace: %i is > full buffer size", length);
SZ_Clear (buf);
buf->overflowed = true;
Com_Printf ("SZ_GetSpace: overflow\n");
}
data = buf->data + buf->cursize;
buf->cursize += length;
return data;
}
void SZ_Write (sizebuf_t *buf, void *data, int length)
{
memcpy (SZ_GetSpace(buf,length),data,length);
}
void SZ_Print (sizebuf_t *buf, char *data)
{
int len;
len = (int)strlen(data)+1;
if (buf->cursize)
{
if (buf->data[buf->cursize-1])
memcpy ((byte *)SZ_GetSpace(buf, len),data,len); /* no trailing 0 */
else
memcpy ((byte *)SZ_GetSpace(buf, len-1)-1,data,len); /* write over trailing 0 */
}
else
memcpy ((byte *)SZ_GetSpace(buf, len),data,len);
}
//============================================================================

88
src/common/szone.c Normal file
View file

@ -0,0 +1,88 @@
/*
* Copyright (C) 1997-2001 Id Software, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 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
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
* =======================================================================
*
* Server zone, server side of memory management
*
* =======================================================================
*/
#include "qcommon.h"
void SZ_Init (sizebuf_t *buf, byte *data, int length)
{
memset (buf, 0, sizeof(*buf));
buf->data = data;
buf->maxsize = length;
}
void SZ_Clear (sizebuf_t *buf)
{
buf->cursize = 0;
buf->overflowed = false;
}
void *SZ_GetSpace (sizebuf_t *buf, int length)
{
void *data;
if (buf->cursize + length > buf->maxsize)
{
if (!buf->allowoverflow)
Com_Error (ERR_FATAL, "SZ_GetSpace: overflow without allowoverflow set");
if (length > buf->maxsize)
Com_Error (ERR_FATAL, "SZ_GetSpace: %i is > full buffer size", length);
SZ_Clear (buf);
buf->overflowed = true;
Com_Printf ("SZ_GetSpace: overflow\n");
}
data = buf->data + buf->cursize;
buf->cursize += length;
return data;
}
void SZ_Write (sizebuf_t *buf, void *data, int length)
{
memcpy (SZ_GetSpace(buf,length),data,length);
}
void SZ_Print (sizebuf_t *buf, char *data)
{
int len;
len = (int)strlen(data)+1;
if (buf->cursize)
{
if (buf->data[buf->cursize-1])
memcpy ((byte *)SZ_GetSpace(buf, len),data,len); /* no trailing 0 */
else
memcpy ((byte *)SZ_GetSpace(buf, len-1)-1,data,len); /* write over trailing 0 */
}
else
memcpy ((byte *)SZ_GetSpace(buf, len),data,len);
}