diff options
| -rw-r--r-- | src/common/socket.c | 53 | ||||
| -rw-r--r-- | src/common/socket.h | 1 | ||||
| -rw-r--r-- | src/config/core.h | 3 | ||||
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 |
5 files changed, 59 insertions, 2 deletions
diff --git a/src/common/socket.c b/src/common/socket.c index 15b20b16f..a039006f0 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -221,6 +221,13 @@ int naddr_ = 0; // # of ip addresses // Larger packets cause a buffer overflow and stack corruption. static size_t socket_max_client_packet = 24576; +#ifdef SHOW_SERVER_STATS +// Data I/O statistics +static size_t socket_data_i = 0, socket_data_ci = 0, socket_data_qi = 0; +static size_t socket_data_o = 0, socket_data_co = 0, socket_data_qo = 0; +static time_t socket_data_last_tick = 0; +#endif + // initial recv buffer size (this will also be the max. size) // biggest known packet: S 0153 <len>.w <emblem data>.?B -> 24x24 256 color .bmp (0153 + len.w + 1618/1654/1756 bytes) #define RFIFO_SIZE (2*1024) @@ -357,6 +364,14 @@ int recv_to_fifo(int fd) session[fd]->rdata_size += len; session[fd]->rdata_tick = last_tick; +#ifdef SHOW_SERVER_STATS + socket_data_i += len; + socket_data_qi += len; + if (!session[fd]->flag.server) + { + socket_data_ci += len; + } +#endif return 0; } @@ -376,6 +391,9 @@ int send_from_fifo(int fd) {//An exception has occured if( sErrno != S_EWOULDBLOCK ) { //ShowDebug("send_from_fifo: %s, ending connection #%d\n", error_msg(), fd); +#ifdef SHOW_SERVER_STATS + socket_data_qo -= session[fd]->wdata_size; +#endif session[fd]->wdata_size = 0; //Clear the send queue as we can't send anymore. [Skotlex] set_eof(fd); } @@ -390,6 +408,14 @@ int send_from_fifo(int fd) memmove(session[fd]->wdata, session[fd]->wdata + len, session[fd]->wdata_size - len); session[fd]->wdata_size -= len; +#ifdef SHOW_SERVER_STATS + socket_data_o += len; + socket_data_qo -= len; + if (!session[fd]->flag.server) + { + socket_data_co += len; + } +#endif } return 0; @@ -573,6 +599,10 @@ static void delete_session(int fd) { if( session_isValid(fd) ) { +#ifdef SHOW_SERVER_STATS + socket_data_qi -= session[fd]->rdata_size - session[fd]->rdata_pos; + socket_data_qo -= session[fd]->wdata_size; +#endif aFree(session[fd]->rdata); aFree(session[fd]->wdata); aFree(session[fd]->session_data); @@ -641,6 +671,9 @@ int RFIFOSKIP(int fd, size_t len) } s->rdata_pos = s->rdata_pos + len; +#ifdef SHOW_SERVER_STATS + socket_data_qi -= len; +#endif return 0; } @@ -694,6 +727,9 @@ int WFIFOSET(int fd, size_t len) } s->wdata_size += len; +#ifdef SHOW_SERVER_STATS + socket_data_qo += len; +#endif //If the interserver has 200% of its normal size full, flush the data. if( s->flag.server && s->wdata_size >= 2*FIFOSIZE_SERVERLINK ) flush_fifo(fd); @@ -820,6 +856,23 @@ int do_sockets(int next) RFIFOFLUSH(i); } +#ifdef SHOW_SERVER_STATS + if (last_tick != socket_data_last_tick) + { + char buf[1024]; + + sprintf(buf, "In: %.03f kB/s (%.03f kB/s, Q: %.03f kB) | Out: %.03f kB/s (%.03f kB/s, Q: %.03f kB) | RAM: %.03f MB", socket_data_i/1024., socket_data_ci/1024., socket_data_qi/1024., socket_data_o/1024., socket_data_co/1024., socket_data_qo/1024., iMalloc->usage()/1024.); +#ifdef _WIN32 + SetConsoleTitle(buf); +#else + ShowMessage("\033[s\033[1;1H\033[2K%s\033[u", buf); +#endif + socket_data_last_tick = last_tick; + socket_data_i = socket_data_ci = 0; + socket_data_o = socket_data_co = 0; + } +#endif + return 0; } diff --git a/src/common/socket.h b/src/common/socket.h index 82f8b84c3..0870c9d4e 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -6,6 +6,7 @@ #define _SOCKET_H_ #include "../common/cbasetypes.h" +#include "../config/core.h" #ifdef WIN32 #include "../common/winapi.h" diff --git a/src/config/core.h b/src/config/core.h index bec6cb507..b5ad1b794 100644 --- a/src/config/core.h +++ b/src/config/core.h @@ -61,6 +61,9 @@ /// By enabling it, the system will create an unique id for each new non stackable item created //#define NSI_UNIQUE_ID +/// Uncomment to enable real-time server stats (in and out data and ram usage). [Ai4rei] +//#define SHOW_SERVER_STATS + /** * No settings past this point **/ diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 8423467c6..2aaf89107 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -407,7 +407,7 @@ ACMD(mapmove) if (mapindex) m = iMap->mapindex2mapid(mapindex); - if (!mapindex) { // m < 0 means on different server! [Kevin] + if (!mapindex || m < 0) { // m < 0 means on different server or that map is disabled! [Kevin] clif->message(fd, msg_txt(1)); // Map not found. return false; } diff --git a/src/map/battle.c b/src/map/battle.c index d03afc431..aeed4c2b0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6461,7 +6461,7 @@ static const struct _battle_data { { "item_enabled_npc", &battle_config.item_enabled_npc, 1, 0, 1, }, { "gm_ignore_warpable_area", &battle_config.gm_ignore_warpable_area, 0, 2, 100, }, { "packet_obfuscation", &battle_config.packet_obfuscation, 1, 0, 3, }, - { "client_accept_chatdori", &battle_config.client_accept_chatdori, 0, 0, 1, }, + { "client_accept_chatdori", &battle_config.client_accept_chatdori, 0, 0, INT_MAX, }, }; #ifndef STATS_OPT_OUT /** |