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.29 by root, Fri Apr 11 21:09:52 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.
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 *>, true> 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);
83 { 84 {
84 ++refcnt (found); 85 ++refcnt (found);
85 return found; 86 return found;
86 } 87 }
87 88
89 --next_gc;
88 s = makevec (s); 90 s = makevec (s);
89 ht.insert (s); 91 ht.insert (s);
90 return s; 92 return s;
91} 93}
92 94
93// periodically test refcounts == 0 for a few strings 95// periodically test refcounts == 0 for a few strings
94// this is the ONLY thing that erases stuff from ht. keep it that way. 96// this is the ONLY thing that erases stuff from ht. keep it that way.
95void 97void
96shstr::gc () 98shstr::gc ()
97{ 99{
100 if (expect_true (next_gc > 0))
101 return;
102
98 static const char *curpos; 103 static const char *curpos;
99 104
100 auto (i, curpos ? ht.find (curpos) : ht.begin ()); 105 auto (i, curpos ? ht.find (curpos) : ht.begin ());
101 106
102 if (i == ht.end ()) 107 if (i == ht.end ())
103 i = ht.begin (); 108 i = ht.begin ();
104 109
105 int n = ht.size () / 256 + 16; 110 int n = ht.size () / 256 + 16;
111 next_gc += n >> 1;
106 112
107 for (;;) 113 for (;;)
108 { 114 {
109 if (i == ht.end ()) 115 if (i == ht.end ())
110 { 116 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines