Tr0n/server
1
0
Fork 0
forked from metin2/server
Code Issues Pull Requests Activity

Applied changes on the db executable. Removed old logging functions. Various global changes.

Browse Source
This commit is contained in:
Exynox
2024-01-07 22:05:51 +02:00
parent 2f829ae2dc
commit feac4c0598
46 changed files with 748 additions and 1299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libthecore/src/buffer.cpp
View File

@@ -71,7 +71,7 @@ bool safe_create(char** pdata, int number)
{
if (!((*pdata) = (char *) calloc (number, sizeof(char))))
{
sys_err("calloc failed [%d] %s", errno, strerror(errno));
SPDLOG_ERROR("calloc failed [{}] {}", errno, strerror(errno));
return false;
}
else
@@ -111,7 +111,7 @@ LPBUFFER buffer_new(int size)
// <20><><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> pool<6F><6C> <20><><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD>.
buffer_pool_free();
CREATE(buffer->mem_data, char, size);
sys_err ("buffer pool free success.");
SPDLOG_ERROR("buffer pool free success.");
}
}
assert(buffer != NULL);
@@ -206,10 +206,10 @@ void buffer_read_proceed(LPBUFFER buffer, int length)
return;
if (length < 0)
sys_err("buffer_proceed: length argument lower than zero (length: %d)", length);
SPDLOG_ERROR("buffer_proceed: length argument lower than zero (length: {})", length);
else if (length > buffer->length)
{
sys_err("buffer_proceed: length argument bigger than buffer (length: %d, buffer: %d)", length, buffer->length);
SPDLOG_ERROR("buffer_proceed: length argument bigger than buffer (length: {}, buffer: {})", length, buffer->length);
length = buffer->length;
}
@@ -219,7 +219,7 @@ void buffer_read_proceed(LPBUFFER buffer, int length)
// write_point <20><> pos <20><> <20>״<EFBFBD><D7B4><EFBFBD> <20>ΰ<EFBFBD> read_point <20><> <20><><EFBFBD><EFBFBD> <20><>Ų<EFBFBD><C5B2>.
if (buffer->read_point + length - buffer->mem_data > buffer->mem_size)
{
sys_err("buffer_read_proceed: buffer overflow! length %d read_point %d", length, buffer->read_point - buffer->mem_data);
SPDLOG_ERROR("buffer_read_proceed: buffer overflow! length {} read_point {}", length, buffer->read_point - buffer->mem_data);
abort();
}
@@ -254,7 +254,7 @@ void buffer_adjust_size(LPBUFFER& buffer, int add_size)
if (buffer->mem_size >= buffer->write_point_pos + add_size)
return;
sys_log(0, "buffer_adjust %d current %d/%d", add_size, buffer->length, buffer->mem_size);
SPDLOG_TRACE("buffer_adjust {} current {}/{}", add_size, buffer->length, buffer->mem_size);
buffer_realloc(buffer, buffer->mem_size + add_size);
}
@@ -276,7 +276,7 @@ void buffer_realloc(LPBUFFER& buffer, int length)
return;
temp = buffer_new (length);
sys_log(0, "reallocating buffer to %d, current %d", temp->mem_size, buffer->mem_size);
SPDLOG_TRACE("reallocating buffer to {}, current {}", temp->mem_size, buffer->mem_size);
memcpy(temp->mem_data, buffer->mem_data, buffer->mem_size);
read_point_pos = buffer->read_point - buffer->mem_data;