--- deliantra/server/include/shstr.h 2006/08/31 17:54:14 1.4
+++ deliantra/server/include/shstr.h 2007/11/08 19:43:25 1.20
@@ -1,101 +1,189 @@
+/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Deliantra 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 3 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, see .
+ *
+ * The authors can be reached via e-mail to
+ */
+
#ifndef SHSTR_H__
#define SHSTR_H__
-//// OLD STUFF
+#include
-/* The size of the shared strings hashtable. This must be smaller than
- * 32767, but 947 ought to be plenty enough.
- */
-#define TABLESIZE 4133
+#include "util.h"
-/* This specifies how many characters the hashing routine should look at.
- * You may actually save CPU by increasing this number if the typical string
- * is large.
- */
-#ifndef MAXSTRING
-#define MAXSTRING 20
-#endif
+extern size_t shstr_alloc;
-/* In the unlikely occurence that 16383 references to a string are too
- * few, you can modify the below type to something bigger.
- * (The top bit of "refcount" is used to signify that "u.array" points
- * at the array entry.)
- */
-#define REFCOUNT_TYPE int
+extern int buf_overflow (const char *buf1, const char *buf2, int bufsize);
-/* The offsetof macro is part of ANSI C, but many compilers lack it, for
- * example "gcc -ansi"
- */
-#if !defined (offsetof)
-#define offsetof(type, member) (int)&(((type *)0)->member)
-#endif
+struct shstr
+{
+ static const char *null;
-/* SS(string) will return the address of the shared_string struct which
- * contains "string".
- */
-#define SS(x) ((shared_string *) ((x) - offsetof(shared_string, string)))
+ const char *s;
-#define SS_STATISTICS
+ static int &refcnt (const char *s)
+ {
+ return *((int *)s - 1);
+ }
+
+ static int &length (const char *s)
+ {
+ return *((int *)s - 2);
+ }
+
+ int &refcnt () const
+ {
+ return refcnt (s);
+ }
+
+ int length () const
+ {
+ return length (s);
+ }
+
+ // returns wether this shared string begins with the given prefix,
+ // used mainly for searched when users give only the start of a name.
+ bool begins_with (const char *prefix) const
+ {
+ int plen = strlen (prefix);
+ return !strncasecmp (s, prefix, plen) && length () >= plen;
+ }
+
+ static const char *find (const char *s);
+ static const char *intern (const char *s);
+
+ static void gc (); // garbage collect a few strings
+
+ // this is used for informational messages and the like
+ const char *operator &() const { return s; }
+
+ const char &operator [](int i) const { return s[i]; }
+ operator const char *() const { return s == null ? 0 : s; }
+
+ shstr ()
+ : s (null)
+ {
+ }
+
+ shstr (const shstr &sh)
+ : s (sh.s)
+ {
+ ++refcnt ();
+ }
+
+ explicit shstr (const char *s)
+ : s (intern (s))
+ {
+ }
+
+ ~shstr ()
+ {
+ --refcnt ();
+ }
+
+ const shstr &operator =(const shstr &sh)
+ {
+ --refcnt ();
+ s = sh.s;
+ ++refcnt ();
+
+ return *this;
+ }
+
+ const shstr &operator =(const char *str)
+ {
+ --refcnt ();
+
+ // this optimises the important case of str == constant 0
+ if (is_constant (str))
+ s = str ? intern (str) : null;
+ else
+ s = intern (str);
+
+ return *this;
+ }
+
+ bool operator ==(const shstr &b)
+ {
+ return s == b.s;
+ }
+
+ bool operator !=(const shstr &b)
+ {
+ return !(*this == b);
+ }
+};
-#define SS_DUMP_TABLE 1
-#define SS_DUMP_TOTALS 2
+inline int strlen (const shstr &sh)
+{
+ return sh.length ();
+}
-#ifdef SS_STATISTICS
-static struct statistics {
- int calls;
- int hashed;
- int strcmps;
- int search;
- int linked;
-} add_stats, add_ref_stats, free_stats, find_stats, hash_stats;
-#define GATHER(n) (++n)
-#else /* !SS_STATISTICS */
-#define GATHER(n)
-#endif /* SS_STATISTICS */
-
-#define TOPBIT ((unsigned REFCOUNT_TYPE) 1 << (sizeof(REFCOUNT_TYPE) * CHAR_BIT - 1))
-
-#define PADDING ((2 * sizeof(long) - sizeof(REFCOUNT_TYPE)) % sizeof(long)) + 1
-
-typedef struct _shared_string {
- union {
- struct _shared_string **array;
- struct _shared_string *previous;
- } u;
- struct _shared_string *next;
- /* The top bit of "refcount" is used to signify that "u.array" points
- * at the array entry.
- */
- unsigned REFCOUNT_TYPE refcount;
- /* Padding will be unused memory, since we can't know how large
- * the padding when allocating memory. We assume here that
- * sizeof(long) is a good boundary.
- */
- char string[PADDING];
-} shared_string;
-
-extern void init_hash_table(void);
-extern const char *add_string(const char *str);
-extern const char *add_refcount(const char *str);
-extern int query_refcount(const char *str);
-extern const char *find_string(const char *str);
-extern void free_string(const char *str);
-extern void ss_dump_statistics(void);
-extern const char *ss_dump_table(int what);
-extern int buf_overflow(const char *buf1, const char *buf2, int bufsize);
+inline int strcmp (const shstr &a, const shstr &b)
+{
+ // TODO: use this to find all the occurences of people using strcmp
+ // all uses should be bogus, as we should be never interested in
+ // comparing shstr's alphabetically
+#if 0
+ extern void do_not_use_strcmp_to_compare_shstr_values ();
+ do_not_use_strcmp_to_compare_shstr_values ();
+#endif
+ return a != b;
+}
-//// NEW STUFF
+static std::ostream &operator <<(std::ostream &o, const shstr &sh)
+{
+ o.write (sh.s, sh.length ());
+ return o;
+}
-#if 0
-struct shstr
+// only good for mass comparisons to shstr objects
+struct shstr_cmp
{
const char *s;
- operator const char *() const { return s; };
- shstr &operator =(const char *str) { s = str; };
+
+ explicit shstr_cmp (const char *s)
+ : s (shstr::find (s))
+ {
+ }
+
+ shstr_cmp (const shstr_cmp &sh)
+ : s (sh.s)
+ {
+ }
+
+ shstr_cmp &operator =(const shstr_cmp sh) { s = sh.s; return *this; }
+ operator const char *() const { return s; }
};
-#else
-typedef const char *shstr;
-#endif
+
+inline bool operator ==(const shstr_cmp &a, const shstr &b)
+{
+ return a.s == b.s;
+}
+
+inline bool operator ==(const shstr &a, const shstr_cmp &b)
+{
+ return b == a;
+}
+
+#define def(str) extern const shstr shstr_ ## str;
+# include "shstrinc.h"
+#undef def
#endif