guild_cache

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@619 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 110 insertions, 4 deletions

diff --git a/Changelog.txt b/Changelog.txt
index 1d6a786b5..f5410e600 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,9 @@
 Date	Added
 
 12/19
+	* Introduced StringBuf into utils for use in building larger queries [MouseJstr]
+	* tested GUILD_CACHE (reducing guild related sql traffic to 30%) in 
+	  prep for unleasing it on the sql using public [MouseJstr]
 	* Fixed some SQL queries crashing char server [davidsiaw]
 
 12/18
diff --git a/src/char_sql/Makefile b/src/char_sql/Makefile
index c2e8afe35..faf2bbb64 100644
--- a/src/char_sql/Makefile
+++ b/src/char_sql/Makefile
@@ -1,12 +1,13 @@
 all: char-server_sql
 sql: char-server_sql
 
-COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h
+COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o ../common/utils.o
+COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/utils.h
 
 char-server_sql: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o strlib.o itemdb.o $(COMMON_OBJ)
 	$(CC) -o ../../$@ $^ $(LIB_S)
 
+
 char.o: char.c char.h strlib.h itemdb.h ../common/showmsg.h
 inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h ../common/mmo.h char.h ../common/socket.h ../common/showmsg.h
 int_party.o: int_party.c int_party.h inter.h ../common/mmo.h char.h ../common/socket.h ../common/timer.h ../common/db.h ../common/showmsg.h
@@ -15,6 +16,7 @@ int_storage.o: int_storage.c int_storage.h char.h itemdb.h ../common/showmsg.h
 int_pet.o: int_pet.c int_pet.h inter.h char.h ../common/mmo.h ../common/socket.h ../common/db.h ../common/showmsg.h
 strlib.o: strlib.c strlib.h ../common/showmsg.h
 itemdb.o: itemdb.c itemdb.h ../common/db.h ../common/mmo.h ../common/showmsg.h
+$(COMMON_OBJ): $(COMMON_H)
 
 clean:
 	rm -f *.o ../../char-server_sql
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index f87e1f791..73271b197 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -958,7 +958,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, int online){
 
 	for(i=0;i<20;i++) {
 		p->friend_id[i] = 0;
-		sprintf(p->friend_name[i], "");
+		p->friend_name[i][0] = '\0';
 	}
 
 	tmp_p += sprintf(tmp_p, "SELECT `id`, `account_id`");
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index e8e6a6360..def93d9f3 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -3,6 +3,10 @@
 // SQL conversion by hack
 //
 
+#ifdef TWILIGHT
+#define GUILDCACHE
+#endif
+
 #include "char.h"
 #include "strlib.h"
 #include "int_storage.h"
diff --git a/src/common/utils.c b/src/common/utils.c
index 941f2b0bd..ccc81c1c5 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1,6 +1,8 @@
 #include <string.h>
 #include "utils.h"
 #include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
 
 void dump(unsigned char *buffer, int num)
 {
@@ -106,3 +108,80 @@ void str_lower(char *name)
 
 #endif
 
+// Allocate a StringBuf  [MouseJstr]
+struct StringBuf * StringBuf_Malloc() 
+{
+	struct StringBuf * ret = (struct StringBuf *) malloc(sizeof(struct StringBuf));
+	StringBuf_Init(ret);
+	return ret;
+}
+
+// Initialize a previously allocated StringBuf [MouseJstr]
+void StringBuf_Init(struct StringBuf * sbuf)  {
+	sbuf->max_ = 1024;
+	sbuf->ptr_ = sbuf->buf_ = (char *) malloc(sbuf->max_ + 1);
+}
+
+// printf into a StringBuf, moving the pointer [MouseJstr]
+int StringBuf_Printf(struct StringBuf *sbuf,const char *fmt,...) 
+{
+	va_list ap;
+        int n, size, off;
+
+	while (1) {
+		/* Try to print in the allocated space. */
+		va_start(ap, fmt);
+		size = sbuf->max_ - (sbuf->ptr_ - sbuf->buf_);
+		n = vsnprintf (sbuf->ptr_, size, fmt, ap);
+		va_end(ap);
+		/* If that worked, return the length. */
+		if (n > -1 && n < size) {
+			sbuf->ptr_ += n;
+			return sbuf->ptr_ - sbuf->buf_;
+		}
+		/* Else try again with more space. */
+		sbuf->max_ *= 2; // twice the old size
+		off = sbuf->ptr_ - sbuf->buf_;
+		sbuf->buf_ = (char *) realloc(sbuf->buf_, sbuf->max_ + 1);
+		sbuf->ptr_ = sbuf->buf_ + off;
+	}
+}
+
+// Append buf2 onto the end of buf1 [MouseJstr]
+int StringBuf_Append(struct StringBuf *buf1,const struct StringBuf *buf2) 
+{
+	int buf1_avail = buf1->max_ - (buf1->ptr_ - buf1->buf_);
+	int size2 = buf2->ptr_ - buf2->buf_;
+
+	if (size2 >= buf1_avail)  {
+		int off = buf1->ptr_ - buf1->buf_;
+		buf1->max_ += size2;
+		buf1->buf_ = (char *) realloc(buf1->buf_, buf1->max_ + 1);
+		buf1->ptr_ = buf1->buf_ + off;
+	}
+
+	memcpy(buf1->ptr_, buf2->buf_, size2);
+	buf1->ptr_ += size2;
+	return buf1->ptr_ - buf1->buf_;
+}
+
+// Destroy a StringBuf [MouseJstr]
+void StringBuf_Destroy(struct StringBuf *sbuf) 
+{
+	free(sbuf->buf_);
+	sbuf->ptr_ = sbuf->buf_ = 0;
+}
+
+// Free a StringBuf returned by StringBuf_Malloc [MouseJstr]
+void StringBuf_Free(struct StringBuf *sbuf) 
+{
+	StringBuf_Destroy(sbuf);
+	free(sbuf);
+}
+
+// Return the built string from the StringBuf [MouseJstr]
+char * StringBuf_Value(struct StringBuf *sbuf) 
+{
+	*sbuf->ptr_ = '\0';
+	return sbuf->buf_;
+}
diff --git a/src/common/utils.h b/src/common/utils.h
index c8efd525b..d234e9351 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -1,3 +1,6 @@
+#ifndef COMMON_UTILS_H
+#define COMMON_UTILS_H
+
 
 #ifndef NULL
 #define NULL (void *)0
@@ -31,3 +34,18 @@
   if (!((result) = (type *) realloc ((result), sizeof(type) * (number))))\
       { printf("SYSERR: realloc failure"); abort(); } } while(0)
 
+struct StringBuf {
+	char *buf_;
+	char *ptr_;
+	unsigned int max_;
+};
+
+extern struct StringBuf * StringBuf_Malloc();
+extern void StringBuf_Init(struct StringBuf *);
+extern int StringBuf_Printf(struct StringBuf *,const char *,...);
+extern int StringBuf_Append(struct StringBuf *,const struct StringBuf *);
+extern char * StringBuf_Value(struct StringBuf *);
+extern void StringBuf_Destroy(struct StringBuf *);
+extern void StringBuf_Free(struct StringBuf *);
+
+#endif
diff --git a/src/map/Makefile b/src/map/Makefile
index 4786887ae..4204cfaff 100644
--- a/src/map/Makefile
+++ b/src/map/Makefile
@@ -10,7 +10,7 @@ txtobj:
 sqlobj:
 	mkdir sqlobj
 
-COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grfio.o ../common/db.o ../common/lock.o ../common/nullpo.o ../common/malloc.o ../common/showmsg.o
+COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grfio.o ../common/db.o ../common/lock.o ../common/nullpo.o ../common/malloc.o ../common/showmsg.o ../common/utils.o
 LIBS = -lz -lm
 
 map-server: txtobj/map.o txtobj/chrif.o txtobj/clif.o txtobj/pc.o txtobj/npc.o txtobj/chat.o txtobj/path.o txtobj/itemdb.o txtobj/mob.o txtobj/script.o txtobj/storage.o txtobj/skill.o txtobj/atcommand.o txtobj/charcommand.o txtobj/battle.o txtobj/intif.o txtobj/trade.o txtobj/party.o txtobj/vending.o txtobj/guild.o txtobj/pet.o $(COMMON_OBJ)