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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.32 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.39 by root, Fri Feb 2 22:07:51 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <cassert> 25#include <cassert>
25 26
26#include <global.h> 27#include <global.h>
27#include <funcpoint.h> 28#include <funcpoint.h>
28#include <loader.h> 29#include <loader.h>
29 30
30#define USE_UNORDERED_MAP 0
31
32#if USE_UNORDERED_MAP
33# include <tr1/functional> 31#include <tr1/functional>
34# include <tr1/unordered_map> 32#include <tr1/unordered_map>
35#endif
36 33
37int arch_cmp = 0; /* How many strcmp's */
38int arch_search = 0; /* How many searches */
39int arch_init; /* True if doing arch initialization */ 34int arch_init; /* True if doing arch initialization */
40 35
41/* The naming of these functions is really poor - they are all 36/* The naming of these functions is really poor - they are all
42 * pretty much named '.._arch_...', but they may more may not 37 * pretty much named '.._arch_...', but they may more may not
43 * return archetypes. Some make the arch_to_object call, and thus 38 * return archetypes. Some make the arch_to_object call, and thus
44 * return an object. Perhaps those should be called 'archob' functions 39 * return an object. Perhaps those should be called 'archob' functions
45 * to denote they return an object derived from the archetype. 40 * to denote they return an object derived from the archetype.
46 * MSW 2003-04-29 41 * MSW 2003-04-29
47 */ 42 */
48 43
49#if USE_UNORDERED_MAP
50// the hashtable 44// the hashtable
51typedef std::tr1::unordered_map 45typedef std::tr1::unordered_map
52 < 46 <
53 std::size_t, 47 const char *,
54 arch_ptr, 48 arch_ptr,
55 std::tr1::hash<size_t>, 49 str_hash,
56 std::equal_to<size_t>, 50 str_equal,
57 slice_allocator< std::pair<const std::size_t, archetype *> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
58 true,
59 > HT; 52 > HT;
60 53
61static HT ht; 54static HT ht (5000);
62#else
63static arch_ptr arch_table[ARCHTABLE];
64#endif
65 55
66/** 56/**
67 * GROS - This function retrieves an archetype given the name that appears 57 * GROS - This function retrieves an archetype given the name that appears
68 * during the game (for example, "writing pen" instead of "stylus"). 58 * during the game (for example, "writing pen" instead of "stylus").
69 * It does not use the hashtable system, but browse the whole archlist each time. 59 * It does not use the hashtable system, but browse the whole archlist each time.
… …
75 * - the archetype found or null if nothing was found. 65 * - the archetype found or null if nothing was found.
76 */ 66 */
77archetype * 67archetype *
78find_archetype_by_object_name (const char *name) 68find_archetype_by_object_name (const char *name)
79{ 69{
80 archetype *at; 70 shstr_cmp name_cmp (name);
81 71
82 if (name == NULL)
83 return (archetype *) NULL;
84
85 for (at = first_archetype; at != NULL; at = at->next) 72 for (archetype *at = first_archetype; at; at = at->next)
86 { 73 if (at->clone.name == name_cmp)
87 if (!strcmp (at->clone.name, name))
88 return at; 74 return at;
89 } 75
90 return NULL; 76 return 0;
91} 77}
92 78
93/** 79/**
94 * This function retrieves an archetype by type and name that appears during 80 * This function retrieves an archetype by type and name that appears during
95 * the game. It is basically the same as find_archetype_by_object_name() 81 * the game. It is basically the same as find_archetype_by_object_name()
96 * except that it considers only items of the given type. 82 * except that it considers only items of the given type.
97 */ 83 */
98archetype * 84archetype *
99find_archetype_by_object_type_name (int type, const char *name) 85find_archetype_by_object_type_name (int type, const char *name)
100{ 86{
101 archetype *at; 87 shstr_cmp name_cmp (name);
102 88
103 if (name == NULL)
104 return NULL;
105
106 for (at = first_archetype; at != NULL; at = at->next) 89 for (archetype *at = first_archetype; at; at = at->next)
107 { 90 if (at->clone.name == name_cmp && at->clone.type == type)
108 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
109 return at; 91 return at;
110 }
111 92
112 return NULL; 93 return 0;
113} 94}
114 95
115/* This is a lot like the above function. Instead, we are trying to match 96/* This is a lot like the above function. Instead, we are trying to match
116 * the arch->skill values. type is the type of object to match 97 * the arch->skill values. type is the type of object to match
117 * against (eg, to only match against skills or only skill objects for example). 98 * against (eg, to only match against skills or only skill objects for example).
118 * If type is -1, ew don't match on type. 99 * If type is -1, ew don't match on type.
119 */ 100 */
120object * 101object *
121get_archetype_by_skill_name (const char *skill, int type) 102get_archetype_by_skill_name (const char *skill, int type)
122{ 103{
123 archetype * 104 shstr_cmp skill_cmp (skill);
124 at;
125 105
126 if (skill == NULL)
127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next) 106 for (archetype *at = first_archetype; at; at = at->next)
130 { 107 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.type))
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at); 108 return arch_to_object (at);
133 } 109
134 return NULL; 110 return 0;
135} 111}
136 112
137/* similiar to above - this returns the first archetype 113/* similiar to above - this returns the first archetype
138 * that matches both the type and subtype. type and subtype 114 * that matches both the type and subtype. type and subtype
139 * can be -1 to say ignore, but in this case, the match it does 115 * can be -1 to say ignore, but in this case, the match it does
… …
142 * (eg, skills) 118 * (eg, skills)
143 */ 119 */
144archetype * 120archetype *
145get_archetype_by_type_subtype (int type, int subtype) 121get_archetype_by_type_subtype (int type, int subtype)
146{ 122{
147 archetype *
148 at;
149
150 for (at = first_archetype; at != NULL; at = at->next) 123 for (archetype *at = first_archetype; at; at = at->next)
151 {
152 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype)) 124 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype))
153 return at; 125 return at;
154 } 126
155 return NULL; 127 return 0;
156} 128}
157 129
158/** 130/**
159 * GROS - this returns a new object given the name that appears during the game 131 * GROS - this returns a new object given the name that appears during the game
160 * (for example, "writing pen" instead of "stylus"). 132 * (for example, "writing pen" instead of "stylus").
… …
168 * but it otherwise had a big memory leak. 140 * but it otherwise had a big memory leak.
169 */ 141 */
170object * 142object *
171get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
172{ 144{
173 archetype *at;
174 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
175 int i; 146 int i;
176 147
177 assign (tmpname, name); 148 assign (tmpname, name);
178 149
179 for (i = strlen (tmpname); i > 0; i--) 150 for (i = strlen (tmpname); i > 0; i--)
180 { 151 {
181 tmpname[i] = 0; 152 tmpname[i] = 0;
153
182 at = find_archetype_by_object_name (tmpname); 154 if (archetype *at = find_archetype_by_object_name (tmpname))
183
184 if (at != NULL)
185 return arch_to_object (at); 155 return arch_to_object (at);
186 } 156 }
187 157
188 return create_singularity (name); 158 return create_singularity (name);
189} 159}
… …
325 295
326/* init_blocksview();*/ 296/* init_blocksview();*/
327} 297}
328 298
329/* 299/*
330 * Stores debug-information about how efficient the hashtable
331 * used for archetypes has been in the static errmsg array.
332 */
333
334void
335arch_info (object *op)
336{
337 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
338 new_draw_info (NDI_BLACK, 0, op, errmsg);
339}
340
341/*
342 * Initialise the hashtable used by the archetypes.
343 */
344
345void
346clear_archetable (void)
347{
348 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
349}
350
351/*
352 * An alternative way to init the hashtable which is slower, but _works_... 300 * An alternative way to init the hashtable which is slower, but _works_...
353 */ 301 */
354
355void 302void
356init_archetable (void) 303init_archetable (void)
357{ 304{
358 archetype *at; 305 archetype *at;
359 306
360 LOG (llevDebug, " Setting up archetable...\n"); 307 LOG (llevDebug, " Setting up archetable...\n");
361 308
362 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more) 309 for (at = first_archetype; at; at = at->more ? at->more : at->next)
363 at->hash_add (); 310 at->hash_add ();
364 311
365 LOG (llevDebug, "done\n"); 312 LOG (llevDebug, "done\n");
366} 313}
367 314
… …
369free_all_archs (void) 316free_all_archs (void)
370{ 317{
371 archetype *at, *next; 318 archetype *at, *next;
372 int i = 0, f = 0; 319 int i = 0, f = 0;
373 320
374 for (at = first_archetype; at != NULL; at = next) 321 for (at = first_archetype; at; at = next)
375 { 322 {
376 if (at->more) 323 if (at->more)
377 next = at->more; 324 next = at->more;
378 else 325 else
379 next = at->next; 326 next = at->next;
… …
560 507
561 { 508 {
562 object_thawer 509 object_thawer
563 thawer (filename); 510 thawer (filename);
564 511
565 clear_archetable ();
566 LOG (llevDebug, " arch-pass 1...\n"); 512 LOG (llevDebug, " arch-pass 1...\n");
567 first_arch_pass (thawer); 513 first_arch_pass (thawer);
568 LOG (llevDebug, " done\n"); 514 LOG (llevDebug, " done\n");
569 } 515 }
570 516
… …
575 object_thawer 521 object_thawer
576 thawer (filename); 522 thawer (filename);
577 523
578 LOG (llevDebug, " loading treasure...\n"); 524 LOG (llevDebug, " loading treasure...\n");
579 load_treasures (); 525 load_treasures ();
526 LOG (llevDebug, " done\n");
580 LOG (llevDebug, " done\n arch-pass 2...\n"); 527 LOG (llevDebug, " arch-pass 2...\n");
581 second_arch_pass (thawer); 528 second_arch_pass (thawer);
582 LOG (llevDebug, " done\n"); 529 LOG (llevDebug, " done\n");
583#ifdef DEBUG 530#ifdef DEBUG
584 check_generators (); 531 check_generators ();
585#endif 532#endif
… …
631 578
632/* 579/*
633 * Finds which archetype matches the given name, and returns a new 580 * Finds which archetype matches the given name, and returns a new
634 * object containing a copy of the archetype. 581 * object containing a copy of the archetype.
635 */ 582 */
636
637object * 583object *
638get_archetype (const char *name) 584get_archetype (const char *name)
639{ 585{
640 archetype *at = archetype::find (name); 586 archetype *at = archetype::find (name);
641 587
… …
677 623
678/* 624/*
679 * Finds, using the hashtable, which archetype matches the given name. 625 * Finds, using the hashtable, which archetype matches the given name.
680 * returns a pointer to the found archetype, otherwise NULL. 626 * returns a pointer to the found archetype, otherwise NULL.
681 */ 627 */
682
683archetype * 628archetype *
684archetype::find (const char *name) 629archetype::find (const char *name)
685{ 630{
686 if (!name) 631 if (!name)
687 return 0; 632 return 0;
688 633
689#if USE_UNORDERED_MAP
690 AUTODECL (i, ht.find ((size_t) name)); 634 AUTODECL (i, ht.find (name));
691 635
692 if (i == ht.end ()) 636 if (i == ht.end ())
693 return 0; 637 return 0;
694 else 638 else
695 return i->second; 639 return i->second;
696#endif
697
698 archetype *at;
699 unsigned long index;
700
701 index = hasharch (name, ARCHTABLE);
702 arch_search++;
703 for (;;)
704 {
705 at = arch_table[index];
706
707 if (at == NULL)
708 {
709 if (warn_archetypes)
710 LOG (llevError, "Couldn't find archetype %s\n", name);
711
712 return NULL;
713 }
714
715 arch_cmp++;
716
717 if (!strcmp ((const char *) at->name, name))
718 return at;
719
720 if (++index >= ARCHTABLE)
721 index = 0;
722 }
723} 640}
724 641
725/* 642/*
726 * Adds an archetype to the hashtable. 643 * Adds an archetype to the hashtable.
727 */ 644 */
728void 645void
729archetype::hash_add () 646archetype::hash_add ()
730{ 647{
731#if USE_UNORDERED_MAP
732 ht.insert (std::make_pair ((size_t) (const char *) name, this)); 648 ht.insert (std::make_pair (name, this));
733#else
734
735 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
736
737 for (;;)
738 {
739 if (!arch_table[index])
740 {
741 arch_table[index] = this;
742 break;
743 }
744
745 if (++index == ARCHTABLE)
746 index = 0;
747
748 if (index == org_index)
749 fatal (ARCHTABLE_TOO_SMALL);
750 }
751#endif
752} 649}
753 650
754void 651void
755archetype::hash_del () 652archetype::hash_del ()
756{ 653{
757#if USE_UNORDERED_MAP 654 ht.erase (name);
758# error remove this from HT
759#else
760
761 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
762
763 for (;;)
764 {
765 if (arch_table[index] == this)
766 {
767 arch_table[index] = 0;
768 break;
769 }
770
771 if (++index == ARCHTABLE)
772 index = 0;
773
774 if (index == org_index)
775 break;
776 }
777#endif
778} 655}
779 656
780/* 657/*
781 * Returns the first archetype using the given type. 658 * Returns the first archetype using the given type.
782 * Used in treasure-generation. 659 * Used in treasure-generation.
783 */ 660 */
784
785archetype * 661archetype *
786type_to_archetype (int type) 662type_to_archetype (int type)
787{ 663{
788 archetype *at; 664 archetype *at;
789 665

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines