ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/shstr.C
(Generate patch)

Comparing deliantra/server/common/shstr.C (file contents):
Revision 1.28 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.34 by root, Wed Dec 31 18:25:12 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation, either version 3 of the License, or 8 * the Free Software Foundation, either version 3 of the License, or
9 * (at your option) any later version. 9 * (at your option) any later version.
30 30
31#include "global.h" 31#include "global.h"
32 32
33size_t shstr_alloc; 33size_t shstr_alloc;
34 34
35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; 35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
36 36
37static HT ht; 37static HT ht;
38static int next_gc;
38 39
39static const char * 40static const char *
40makevec (const char *s) 41makevec (const char *s)
41{ 42{
42 int len = strlen (s); 43 int len = strlen (s);
43 44
44 shstr_alloc += sizeof (int) * 2 + len + 1; 45 shstr_alloc += sizeof (uint32_t) * 2 + len + 1;
45 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); 46 const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (uint32_t) * 2 + len + 1));
46 47
47 shstr::length (v) = len; 48 shstr::length (v) = len;
48 shstr::refcnt (v) = 1; 49 shstr::refcnt (v) = 1;
49 50
50 memcpy ((char *) v, s, len + 1); 51 memcpy ((char *) v, s, len + 1);
51 52
52 return v; 53 return v;
53} 54}
54 55
55static const char * 56shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
56makenull ()
57{
58 const char *s = makevec ("(null)");
59 shstr::length (s) = 0;
60 return s;
61}
62
63const char *shstr::null = makenull ();
64 57
65const char * 58const char *
66shstr::find (const char *s) 59shstr::find (const char *s)
67{ 60{
68 if (!s) 61 if (!s)
75 68
76const char * 69const char *
77shstr::intern (const char *s) 70shstr::intern (const char *s)
78{ 71{
79 if (!s) 72 if (!s)
80 return null; 73 return null ();
81 74
82 if (const char *found = find (s)) 75 if (const char *found = find (s))
83 { 76 {
84 ++refcnt (found); 77 ++refcnt (found);
85 return found; 78 return found;
86 } 79 }
87 80
81 --next_gc;
88 s = makevec (s); 82 s = makevec (s);
89 ht.insert (s); 83 ht.insert (s);
90 return s; 84 return s;
91} 85}
92 86
93// periodically test refcounts == 0 for a few strings 87// periodically test refcounts == 0 for a few strings
94// this is the ONLY thing that erases stuff from ht. keep it that way. 88// this is the ONLY thing that erases stuff from ht. keep it that way.
95void 89void
96shstr::gc () 90shstr::gc ()
97{ 91{
92 if (expect_true (next_gc > 0))
93 return;
94
98 static const char *curpos; 95 static const char *curpos;
99 96
100 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 97 auto (i, curpos ? ht.find (curpos) : ht.begin ());
101 98
102 if (i == ht.end ()) 99 if (i == ht.end ())
103 i = ht.begin (); 100 i = ht.begin ();
104 101
105 int n = ht.size () / 256 + 16; 102 int n = ht.size () / 256 + 16;
103 next_gc += n >> 1;
106 104
107 for (;;) 105 for (;;)
108 { 106 {
109 if (i == ht.end ()) 107 if (i == ht.end ())
110 { 108 {
119 const char *s = *o; 117 const char *s = *o;
120 118
121 ht.erase (o); 119 ht.erase (o);
122 120
123 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 121 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
124 shstr_alloc -= sizeof (int) * 2 + length (s) + 1; 122 shstr_alloc -= sizeof (uint32_t) * 2 + length (s) + 1;
125 g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); 123 g_slice_free1 (sizeof (uint32_t) * 2 + length (s) + 1, -2 + (int *) s);
126 } 124 }
127 else 125 else
128 ++i; 126 ++i;
129 } 127 }
130 128
131 curpos = *i; 129 curpos = *i;
132} 130}
133 131
134// declare these here to get correct initialisation order 132// declare these here to get correct initialisation order
135#define def(str) const shstr shstr_ ## str (# str); 133
134#define def(str) \
135 shstr_vec<sizeof (# str)> shstr_vec_ ## str = { sizeof (# str) - 1, 0xffffffff, # str }; \
136 const shstr_const shstr_ ## str (shstr_vec_ ## str.string);
136# include "shstrinc.h" 137# include "shstrinc.h"
137#undef def 138#undef def
138 139
139shstr skill_names[NUM_SKILLS]; 140shstr skill_names[NUM_SKILLS];
140 141

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines