diff options
author | shennetsind <ind@henn.et> | 2013-07-05 19:19:40 -0300 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-07-05 19:19:40 -0300 |
commit | 0118a097c9626b3f8342dd29897392f3da4c1187 (patch) | |
tree | 3839e506a5ad38719e3772da0d03cf12240e3c4c /src/common | |
parent | a3711050a219e887b6637969bac66fb7d261d9cf (diff) | |
download | hercules-0118a097c9626b3f8342dd29897392f3da4c1187.tar.gz hercules-0118a097c9626b3f8342dd29897392f3da4c1187.tar.bz2 hercules-0118a097c9626b3f8342dd29897392f3da4c1187.tar.xz hercules-0118a097c9626b3f8342dd29897392f3da4c1187.zip |
HCache | Item Packages Update
http://hercules.ws/board/topic/1389-hcache-item-packages-update/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/core.c | 6 | ||||
-rw-r--r-- | src/common/utils.c | 99 | ||||
-rw-r--r-- | src/common/utils.h | 20 |
3 files changed, 120 insertions, 5 deletions
diff --git a/src/common/core.c b/src/common/core.c index c53d2243b..d2f662551 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -18,6 +18,7 @@ #include "../common/sql.h" #include "../config/core.h" #include "../common/HPM.h" + #include "../common/utils.h" #endif #include <stdio.h> @@ -281,6 +282,7 @@ void usercheck(void) { void core_defaults(void) { #ifndef MINICORE hpm_defaults(); + HCache_defaults(); #endif console_defaults(); strlib_defaults(); @@ -332,7 +334,9 @@ int main (int argc, char **argv) { iTimer->init(); console->init(); - + + HCache->init(); + #ifndef MINICORE HPM->init(); #endif diff --git a/src/common/utils.c b/src/common/utils.c index 296df7e70..3ea970a1b 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1,10 +1,12 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena Dev Teams #include "../common/cbasetypes.h" #include "../common/mmo.h" #include "../common/malloc.h" #include "../common/showmsg.h" +#include "../common/core.h" #include "socket.h" #include "utils.h" @@ -25,6 +27,9 @@ #include <sys/stat.h> #endif +#include <sys/stat.h> // cache purposes [Ind/Hercules] + +struct HCache_interface HCache_s; /// Dumps given buffer into file pointed to by a handle. void WriteDump(FILE* fp, const void* buffer, size_t length) @@ -281,3 +286,93 @@ unsigned int get_percentage(const unsigned int A, const unsigned int B) return (unsigned int)floor(result); } + +/* [Ind/Hercules] Caching */ +bool HCache_check(const char *file) { + struct stat bufa, bufb; + FILE *first, *second; + char s_path[255], dT[1]; + size_t rtime; + + if( !(first = fopen(file,"rb")) ) + return false; + + if( file[0] == '.' && file[1] == '/' ) + file += 2; + else if( file[0] == '.' ) + file++; + + snprintf(s_path, 255, "./cache/%s", file); + + if( !(second = fopen(s_path,"rb")) ) { + fclose(first); + return false; + } + + if( fread(dT,sizeof(dT),1,second) != 1 || fread(&rtime,sizeof(rtime),1,second) != 1 || dT[0] != 'k' || HCache->recompile_time > rtime ) { + fclose(first); + fclose(second); + return false; + } + + fstat(fileno(first), &bufa); + fstat(fileno(first), &bufa); + + fclose(first); + fclose(second); + + if( bufa.st_mtime > bufb.st_mtime ) + return false; + + return true; +} + +FILE *HCache_open(const char *file, const char *opt) { + FILE *first; + char s_path[255]; + + if( file[0] == '.' && file[1] == '/' ) + file += 2; + else if( file[0] == '.' ) + file++; + + snprintf(s_path, 255, "./cache/%s", file); + + if( !(first = fopen(s_path,opt)) ) { + return NULL; + } + + if( opt[0] != 'r' ) { + char dT[1] = "k";/* 1-byte key to ensure our method is the latest, we can modify to ensure the method matches */ + fwrite(dT,sizeof(dT),1,first); + fwrite(&HCache->recompile_time,sizeof(HCache->recompile_time),1,first); + } + fseek(first, 20, SEEK_SET);/* skip first 20, might wanna store something else later */ + + return first; +} +void HCache_init(void) { + FILE *server; + + if( (server = fopen(SERVER_NAME,"rb")) ) { + struct stat buf; + + fstat(fileno(server), &buf); + HCache->recompile_time = buf.st_mtime; + fclose(server); + + HCache->enabled = true; + } else + ShowWarning("Unable to open '%s', caching capabilities have been disabled!\n",SERVER_NAME); +} +void HCache_defaults(void) { + + HCache = &HCache_s; + + HCache->init = HCache_init; + + HCache->check = HCache_check; + HCache->open = HCache_open; + HCache->recompile_time = 0; + HCache->enabled = false; +} diff --git a/src/common/utils.h b/src/common/utils.h index 8e39f2655..7953d93e8 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena Dev Teams #ifndef _UTILS_H_ #define _UTILS_H_ @@ -29,4 +30,19 @@ extern uint16 GetWord(uint32 val, int idx); extern uint16 MakeWord(uint8 byte0, uint8 byte1); extern uint32 MakeDWord(uint16 word0, uint16 word1); +/* [Ind/Hercules] Caching */ +struct HCache_interface { + void (*init) (void); + /* */ + bool (*check) (const char *file); + FILE *(*open) (const char *file, const char *opt); + /* */ + size_t recompile_time; + bool enabled; +}; + +struct HCache_interface *HCache; + +void HCache_defaults(void); + #endif /* _UTILS_H_ */ |