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.202 by root, Thu Apr 10 15:35:15 2008 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

… …
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38UUID UUID::cur; 38UUID UUID::cur;
39static uint64_t seq_next_save;
39static const uint64 UUID_SKIP = 1<<19; 40static const uint64 UUID_GAP = 1<<19;
40 41
41objectvec objects; 42objectvec objects;
42activevec actives; 43activevec actives;
43 44
44short 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, 45short freearr_x[SIZEOFFREE] = {
46 0,
47 0, 1, 1, 1, 0, -1, -1, -1,
48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
45 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
46}; 50};
47short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 51short freearr_y[SIZEOFFREE] = {
52 0,
53 -1, -1, 0, 1, 1, 1, 0, -1,
54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
48 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
49}; 56};
50int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 57int maxfree[SIZEOFFREE] = {
58 0,
59 9, 10, 13, 14, 17, 18, 21, 22,
60 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
51 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
52}; 62};
53int freedir[SIZEOFFREE] = { 63int freedir[SIZEOFFREE] = {
54 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, 64 0,
65 1, 2, 3, 4, 5, 6, 7, 8,
66 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
55 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 67 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
56}; 68};
57 69
58static void 70static void
59write_uuid (void) 71write_uuid (uval64 skip, bool sync)
60{ 72{
61 char filename1[MAX_BUF], filename2[MAX_BUF]; 73 CALL_BEGIN (2);
62 74 CALL_ARG_SV (newSVval64 (skip));
63 sprintf (filename1, "%s/uuid", settings.localdir); 75 CALL_ARG_SV (boolSV (sync));
64 sprintf (filename2, "%s/uuid~", settings.localdir); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
65 77 CALL_END;
66 FILE *fp;
67
68 if (!(fp = fopen (filename2, "w")))
69 {
70 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
71 return;
72 }
73
74 fprintf (fp, "<1,%llx>\n", (unsigned long long)UUID::cur.seq + UUID_SKIP * 2);
75 fclose (fp);
76 rename (filename2, filename1);
77} 78}
78 79
79static void 80static void
80read_uuid (void) 81read_uuid (void)
81{ 82{
82 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
83 84
84 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
85 86
87 seq_next_save = 0;
88
86 FILE *fp; 89 FILE *fp;
87 90
88 if (!(fp = fopen (filename, "r"))) 91 if (!(fp = fopen (filename, "r")))
89 { 92 {
90 if (errno == ENOENT) 93 if (errno == ENOENT)
91 { 94 {
92 LOG (llevInfo, "RESET uid to 1\n"); 95 LOG (llevInfo, "RESET uid to 1\n");
93 UUID::cur.seq = 0; 96 UUID::cur.seq = 0;
94 write_uuid (); 97 write_uuid (UUID_GAP, true);
95 return; 98 return;
96 } 99 }
97 100
98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99 _exit (1); 102 _exit (1);
100 } 103 }
101 104
102 int version; 105 UUID::BUF buf;
103 unsigned long long uid; 106 buf[0] = 0;
104 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
105 { 110 {
106 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
107 _exit (1); 112 _exit (1);
108 } 113 }
109 114
110 UUID::cur.seq = uid; 115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
111 write_uuid (); 116
112 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 117 write_uuid (UUID_GAP, true);
113 fclose (fp); 118 fclose (fp);
114} 119}
115 120
116UUID 121UUID
117UUID::gen () 122UUID::gen ()
118{ 123{
119 UUID uid; 124 UUID uid;
120 125
121 uid.seq = ++cur.seq; 126 uid.seq = ++cur.seq;
122 127
123 if (!(cur.seq & (UUID_SKIP - 1))) 128 if (expect_false (cur.seq >= seq_next_save))
124 write_uuid (); 129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
125 134
126 return uid; 135 return uid;
127} 136}
128 137
129void 138void
… …
2607{ 2616{
2608 char flagdesc[512]; 2617 char flagdesc[512];
2609 char info2[256 * 4]; 2618 char info2[256 * 4];
2610 char *p = info; 2619 char *p = info;
2611 2620
2612 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2621 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2613 count, uuid.seq, 2622 count,
2623 uuid.c_str (),
2614 &name, 2624 &name,
2615 title ? "\",title:\"" : "", 2625 title ? "\",title:\"" : "",
2616 title ? (const char *)title : "", 2626 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type); 2627 flag_desc (flagdesc, 512), type);
2618 2628

Diff Legend

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