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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.33 by root, Tue Sep 12 00:53:56 2006 UTC vs.
Revision 1.42 by root, Thu Sep 14 01:19:47 2006 UTC

… …
32#include <object.h> 32#include <object.h>
33#include <funcpoint.h> 33#include <funcpoint.h>
34#include <loader.h> 34#include <loader.h>
35 35
36int nrofallocobjects = 0; 36int nrofallocobjects = 0;
37static UUID uuid;
38const uint64 UUID_SKIP = 1<<19;
37 39
38object *objects; /* Pointer to the list of used objects */ 40object *objects; /* Pointer to the list of used objects */
39object *active_objects; /* List of active objects that need to be processed */ 41object *active_objects; /* List of active objects that need to be processed */
40 42
41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
49}; 51};
50int freedir[SIZEOFFREE] = { 52int freedir[SIZEOFFREE] = {
51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 53 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 54 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53}; 55};
56
57static void
58write_uuid (void)
59{
60 char filename1[MAX_BUF], filename2[MAX_BUF];
61
62 sprintf (filename1, "%s/uuid", settings.localdir);
63 sprintf (filename2, "%s/uuid~", settings.localdir);
64
65 FILE *fp;
66
67 if (!(fp = fopen (filename2, "w")))
68 {
69 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70 return;
71 }
72
73 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74 fclose (fp);
75 rename (filename2, filename1);
76}
77
78static void
79read_uuid (void)
80{
81 char filename[MAX_BUF];
82
83 sprintf (filename, "%s/uuid", settings.localdir);
84
85 FILE *fp;
86
87 if (!(fp = fopen (filename, "r")))
88 {
89 if (errno == ENOENT)
90 {
91 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0;
93 write_uuid ();
94 return;
95 }
96
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1);
99 }
100
101 int version;
102 unsigned long long uid;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
104 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
106 _exit (1);
107 }
108
109 uuid.seq = uid;
110 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid);
112 fclose (fp);
113}
114
115UUID
116gen_uuid ()
117{
118 UUID uid;
119
120 uid.seq = ++uuid.seq;
121
122 if (!(uuid.seq & (UUID_SKIP - 1)))
123 write_uuid ();
124
125 return uid;
126}
127
128void
129init_uuid ()
130{
131 read_uuid ();
132}
54 133
55/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 134/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56static int 135static int
57compare_ob_value_lists_one (const object *wants, const object *has) 136compare_ob_value_lists_one (const object *wants, const object *has)
58{ 137{
… …
254 { 333 {
255 if (inv->inv) 334 if (inv->inv)
256 sum_weight (inv); 335 sum_weight (inv);
257 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 336 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258 } 337 }
338
259 if (op->type == CONTAINER && op->stats.Str) 339 if (op->type == CONTAINER && op->stats.Str)
260 sum = (sum * (100 - op->stats.Str)) / 100; 340 sum = (sum * (100 - op->stats.Str)) / 100;
341
261 if (op->carrying != sum) 342 if (op->carrying != sum)
262 op->carrying = sum; 343 op->carrying = sum;
344
263 return sum; 345 return sum;
264} 346}
265 347
266/** 348/**
267 * Return the outermost environment object for a given object. 349 * Return the outermost environment object for a given object.
… …
416 */ 498 */
417 499
418object * 500object *
419find_object_name (const char *str) 501find_object_name (const char *str)
420{ 502{
421 const char *name = shstr::find (str); 503 shstr_cmp str_ (str);
422 object *op; 504 object *op;
423 505
424 for (op = objects; op != NULL; op = op->next) 506 for (op = objects; op != NULL; op = op->next)
425 if (&op->name == name) 507 if (op->name == str_)
426 break; 508 break;
427 509
428 return op; 510 return op;
429} 511}
430 512
… …
836 if (op->more != NULL) 918 if (op->more != NULL)
837 update_object (op->more, action); 919 update_object (op->more, action);
838} 920}
839 921
840static unordered_vector<object *> mortals; 922static unordered_vector<object *> mortals;
841static std::vector<object *> freed;
842 923
843void object::free_mortals () 924void object::free_mortals ()
844{ 925{
845 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
846 if ((*i)->refcnt) 927 if ((*i)->refcnt)
847 ++i; // further delay freeing 928 ++i; // further delay freeing
848 else 929 else
849 { 930 {
850 freed.push_back (*i);//D
851 //delete *i; 931 delete *i;
852 mortals.erase (i); 932 mortals.erase (i);
853 } 933 }
854 934
935 static int lastmortals = 0;//D
936
855 if (mortals.size())//D 937 if (mortals.size() != lastmortals)//D
938 {
939 lastmortals = mortals.size ();//D
856 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 }
857} 942}
858 943
859object::object () 944object::object ()
860{ 945{
861 SET_FLAG (this, FLAG_REMOVED); 946 SET_FLAG (this, FLAG_REMOVED);
… …
871} 956}
872 957
873void object::link () 958void object::link ()
874{ 959{
875 count = ++ob_count; 960 count = ++ob_count;
961 uuid = gen_uuid ();
876 962
877 prev = 0; 963 prev = 0;
878 next = objects; 964 next = objects;
879 965
880 if (objects) 966 if (objects)
… …
883 objects = this; 969 objects = this;
884} 970}
885 971
886void object::unlink () 972void object::unlink ()
887{ 973{
888 count = 0; 974 //count = 0;//D
889 975 if (!prev && !next) return;//D
890 /* Remove this object from the list of used objects */
891 if (prev)
892 {
893 prev->next = next;
894 prev = 0;
895 }
896
897 if (next)
898 {
899 next->prev = prev;
900 next = 0;
901 }
902 976
903 if (this == objects) 977 if (this == objects)
904 objects = next; 978 objects = next;
979
980 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next;
982 if (next) next->prev = prev;
983
984 prev = 0;
985 next = 0;
905} 986}
906 987
907object *object::create () 988object *object::create ()
908{ 989{
909 object *op;
910
911 if (freed.empty ())
912 op = new object; 990 object *op = new object;
913 else
914 {
915 // highly annoying, but the only way to get it stable right now
916 op = freed.back ();
917 freed.pop_back ();
918 op->~object ();
919 new ((void *) op) object;
920 }
921
922 op->link (); 991 op->link ();
923 return op; 992 return op;
924} 993}
925 994
926/* 995/*
… …
1222 * This function goes through all objects below and including top, and 1291 * This function goes through all objects below and including top, and
1223 * merges op to the first matching object. 1292 * merges op to the first matching object.
1224 * If top is NULL, it is calculated. 1293 * If top is NULL, it is calculated.
1225 * Returns pointer to object if it succeded in the merge, otherwise NULL 1294 * Returns pointer to object if it succeded in the merge, otherwise NULL
1226 */ 1295 */
1227
1228object * 1296object *
1229merge_ob (object *op, object *top) 1297merge_ob (object *op, object *top)
1230{ 1298{
1231 if (!op->nrof) 1299 if (!op->nrof)
1232 return 0; 1300 return 0;
… …
2653 2721
2654 if (tempfile == NULL) 2722 if (tempfile == NULL)
2655 { 2723 {
2656 LOG (llevError, "Error - Unable to access load object temp file\n"); 2724 LOG (llevError, "Error - Unable to access load object temp file\n");
2657 return NULL; 2725 return NULL;
2658 }; 2726 }
2727
2659 fprintf (tempfile, obstr); 2728 fprintf (tempfile, obstr);
2660 fclose (tempfile); 2729 fclose (tempfile);
2661 2730
2662 op = get_object (); 2731 op = get_object ();
2663 2732
… …
2720 * The returned string is shared. 2789 * The returned string is shared.
2721 */ 2790 */
2722const char * 2791const char *
2723get_ob_key_value (const object *op, const char *const key) 2792get_ob_key_value (const object *op, const char *const key)
2724{ 2793{
2725 key_value * 2794 key_value *link;
2726 link; 2795 shstr_cmp canonical_key (key);
2727 const char *
2728 canonical_key;
2729 2796
2730 canonical_key = shstr::find (key);
2731
2732 if (canonical_key == NULL) 2797 if (!canonical_key)
2733 { 2798 {
2734 /* 1. There being a field named key on any object 2799 /* 1. There being a field named key on any object
2735 * implies there'd be a shared string to find. 2800 * implies there'd be a shared string to find.
2736 * 2. Since there isn't, no object has this field. 2801 * 2. Since there isn't, no object has this field.
2737 * 3. Therefore, *this* object doesn't have this field. 2802 * 3. Therefore, *this* object doesn't have this field.
2738 */ 2803 */
2739 return NULL; 2804 return 0;
2740 } 2805 }
2741 2806
2742 /* This is copied from get_ob_key_link() above - 2807 /* This is copied from get_ob_key_link() above -
2743 * only 4 lines, and saves the function call overhead. 2808 * only 4 lines, and saves the function call overhead.
2744 */ 2809 */
2745 for (link = op->key_values; link != NULL; link = link->next) 2810 for (link = op->key_values; link; link = link->next)
2746 {
2747 if (link->key == canonical_key) 2811 if (link->key == canonical_key)
2748 {
2749 return link->value; 2812 return link->value;
2750 } 2813
2751 }
2752 return NULL; 2814 return 0;
2753} 2815}
2754 2816
2755 2817
2756/* 2818/*
2757 * Updates the canonical_key in op to value. 2819 * Updates the canonical_key in op to value.
… …
2843 shstr key_ (key); 2905 shstr key_ (key);
2844 2906
2845 return set_ob_key_value_s (op, key_, value, add_key); 2907 return set_ob_key_value_s (op, key_, value, add_key);
2846} 2908}
2847 2909
2910object::depth_iterator::depth_iterator (object *container)
2911: iterator_base (container)
2912{
2913 while (item->inv)
2914 item = item->inv;
2915}
2916
2848void 2917void
2849object::deep_iterator::next () 2918object::depth_iterator::next ()
2850{ 2919{
2851 if (item->inv)
2852 item = item->inv;
2853 else if (item->below) 2920 if (item->below)
2921 {
2854 item = item->below; 2922 item = item->below;
2923
2924 while (item->inv)
2925 item = item->inv;
2926 }
2855 else 2927 else
2856 item = item->env->below; 2928 item = item->env;
2857} 2929}
2930
2931// return a suitable string describing an objetc in enough detail to find it
2932const char *
2933object::debug_desc (char *info) const
2934{
2935 char info2[256 * 3];
2936 char *p = info;
2937
2938 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2939 count,
2940 &name,
2941 title ? " " : "",
2942 title ? (const char *)title : "");
2943
2944 if (env)
2945 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2946
2947 if (map)
2948 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2949
2950 return info;
2951}
2952
2953const char *
2954object::debug_desc () const
2955{
2956 static char info[256 * 3];
2957 return debug_desc (info);
2958}
2959

Diff Legend

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