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

Comparing deliantra/server/server/freezethaw.C (file contents):
Revision 1.2 by elmex, Sat Dec 30 14:34:10 2006 UTC vs.
Revision 1.34 by root, Sun Nov 8 00:01:34 2009 UTC

1/*****************************************************************************/
2/* CrossFire, A roguelike realtime multiplayer game */
3/*****************************************************************************/
4
5/* 1/*
6 * This code is placed under the GNU General Public Licence (GPL) 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
7 * 3 *
8 * Copyright (C) 2006 by Marc Lehmann <crossfire@schmorp.de> 4 * Copyright (©) 2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
9 * 5 *
10 * This program is free software; you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
11 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
12 * the Free Software Foundation; either version 2 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
13 * (at your option) any later version. 9 * option) any later version.
14 * 10 *
15 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details. 14 * GNU General Public License for more details.
19 * 15 *
20 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
21 * along with this program; if not, write to the Free Software 17 * and the GNU General Public License along with this program. If not, see
22 * Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18 * <http://www.gnu.org/licenses/>.
19 *
20 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 21 */
24 22
23#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff
25#include "logger.h" 24#include "logger.h"
26#include "cfperl.h" 25#include "cfperl.h"
27#include "kw_hash.h" 26#include "kw_hash.h"
28 27
29object_freezer::object_freezer () 28object_freezer::object_freezer ()
30: dynbuf (128 * 1024, 64 * 1024) 29: dynbuf_text (128 * 1024, 64 * 1024)
31{ 30{
32 av = newAV (); 31 av = newAV ();
33} 32}
34 33
35object_freezer::~object_freezer () 34object_freezer::~object_freezer ()
36{ 35{
37 SvREFCNT_dec (av); 36 SvREFCNT_dec (av);
38} 37}
39 38
39void
40void object_freezer::put (attachable *ext) 40object_freezer::put (attachable *ext)
41{ 41{
42 ext->optimise (); 42 ext->optimise ();
43 43
44 if (ext->self) 44 if (ext->self)
45 { 45 {
… …
50 add ((sint32)idx); 50 add ((sint32)idx);
51 add ('\n'); 51 add ('\n');
52 } 52 }
53} 53}
54 54
55bool
55bool object_freezer::save (const char *filename) 56object_freezer::save (const char *path)
56{ 57{
57 CALL_BEGIN (3); 58 CALL_BEGIN (3);
58 CALL_ARG_SV (newSVpv (filename, 0)); 59 CALL_ARG_SV (newSVpv (path, 0));
59 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ()))); 60 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));
60 CALL_ARG_SV (newRV_inc ((SV *)av)); 61 CALL_ARG_SV (newRV_inc ((SV *)av));
61 CALL_CALL ("cf::object_freezer_save", G_VOID | G_DISCARD); 62 CALL_CALL ("cf::object_freezer_save", G_VOID | G_DISCARD);
62 CALL_END; 63 CALL_END;
63}
64 64
65 return 1;
66}
67
68char *
65char *object_freezer::as_string () 69object_freezer::as_string ()
66{ 70{
67 CALL_BEGIN (2); 71 CALL_BEGIN (2);
68 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ()))); 72 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));
69 CALL_ARG_SV (newRV_inc ((SV *)av)); 73 CALL_ARG_SV (newRV_inc ((SV *)av));
70 CALL_CALL ("cf::object_freezer_as_string", G_SCALAR); 74 CALL_CALL ("cf::object_freezer_as_string", G_SCALAR);
71 75
72 STRLEN len;
73
74 char *res = count > 0 76 char *res = count > 0
75 ? strdup (SvPVx (POPs, len)) 77 ? strdup (SvPVX (POPs))
76 : strdup ("[fatal error]"); 78 : strdup ("[fatal error]");
77 79
78 CALL_END; 80 CALL_END;
79 81
80 return res; 82 return res;
81} 83}
82 84
85#if 0
86void
83int fprintf (object_freezer &freezer, const char *format, ...) 87fprintf (object_freezer &freezer, const char *format, ...)
84{ 88{
85 va_list ap; 89 va_list ap;
86 90
87 va_start (ap, format); 91 va_start (ap, format);
88 92
… …
92 freezer.alloc (len); 96 freezer.alloc (len);
93 97
94 va_end (ap); 98 va_end (ap);
95} 99}
96 100
101// XXX: function not returning an int
102void
97int fputs (const char *s, object_freezer &freezer) 103fputs (const char *s, object_freezer &freezer)
98{ 104{
99 freezer.add (s); 105 freezer.add (s);
100} 106}
107#endif
101 108
102static const char thawer_eof[] = "\n\n\n\0\0\0"; 109static const char thawer_eof[] = "\n\n\n\0\0\0";
103 110
104object_thawer::object_thawer (const char *filename) 111object_thawer::object_thawer (const char *path)
112: name (strdup (path))
105{ 113{
106 static const char eof[] = "\n\n\n\0\0\0";
107
108 av = 0; 114 av = 0;
109 text = 0; 115 text = 0;
110 line = 0; 116 line = 0;
117 linenum = 0;
111 118
112 if (filename) 119 kw = KW_ERROR;
120 kw_str = 0;
121 value = 0;
122
123 if (path)
113 { 124 {
114 CALL_BEGIN (1); 125 CALL_BEGIN (1);
115 CALL_ARG_SV (newSVpv (filename, 0)); 126 CALL_ARG_SV (newSVpv (path, 0));
116 CALL_CALL ("cf::object_thawer_load", G_ARRAY); 127 CALL_CALL ("cf::object_thawer_load", G_ARRAY);
117 128
118 if (count == 2) 129 if (count == 2)
119 { 130 {
120 // second value - perl objects 131 // second value - perl objects
… …
127 // first value - text part, pad with 3 zeroes 138 // first value - text part, pad with 3 zeroes
128 { 139 {
129 SV *sv = POPs; 140 SV *sv = POPs;
130 STRLEN len; 141 STRLEN len;
131 char *sv_ = SvPVbyte (sv, len); 142 char *sv_ = SvPVbyte (sv, len);
132 text = newSV (len + sizeof (eof)); 143 text = newSV (len + sizeof (thawer_eof));
133 SvCUR_set (text, len); 144 SvCUR_set (text, len + sizeof (thawer_eof));
134 memcpy (SvPVX (text), sv_, len); 145 memcpy (SvPVX (text), sv_, len);
135 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure 146 memcpy (SvPVX (text) + len, thawer_eof, sizeof (thawer_eof));
136 147
137 line = SvPVX (text); 148 line = SvPVX (text);
149 next ();
138 } 150 }
139 } 151 }
140 152
141 CALL_END; 153 CALL_END;
142 } 154 }
143} 155}
144 156
145object_thawer::object_thawer (const char *data, AV *perlav) 157object_thawer::object_thawer (const char *data, AV *perlav)
158: name (strdup ("(memory stream)"))
146{ 159{
147 av = perlav; 160 av = perlav;
148 text = newSVpv (data, 0); 161 text = newSVpv (data, 0);
149 sv_catpv (text, thawer_eof); 162 sv_catpv (text, thawer_eof);
150 line = SvPVbyte_nolen (text); 163 line = SvPVbyte_nolen (text);
164 next ();
151} 165}
152 166
167void
153void object_thawer::get (attachable *obj, int oid) 168object_thawer::get (attachable *obj, int oid)
154{ 169{
155 if (!av || oid < 0) // this is actually an error of sorts 170 if (!av || oid < 0) // this is actually an error of sorts
156 return; 171 return;
157 172
158 SV **svp = av_fetch ((AV *)av, oid, 0); 173 SV **svp = av_fetch ((AV *)av, oid, 0);
159 174
160 if (!svp || !SvROK (*svp)) 175 if (!svp || !SvROK (*svp))
161 { 176 {
162 printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid); 177 LOG (llevError, "trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
163 return; 178 return;
164 } 179 }
165 180
166 if (!SvROK (*svp)) 181 if (!SvROK (*svp))
167 { 182 {
168 LOG (llevError, "deserialised perl object is not an RV"); 183 LOG (llevError, "deserialised perl object is not an RV\n");
169 return; 184 return;
170 } 185 }
171 186
172 HV *hv = (HV *)SvRV (*svp); 187 HV *hv = (HV *)SvRV (*svp);
173 188
174 if (SvTYPE (hv) != SVt_PVHV) 189 if (SvTYPE (hv) != SVt_PVHV)
175 { 190 {
176 LOG (llevError, "deserialised perl object is not a PVHV"); 191 LOG (llevError, "deserialised perl object is not a PVHV\n");
177 return; 192 return;
178 } 193 }
179 194
180 if (obj->self) 195 if (obj->self)
181 { 196 {
182 // the hard way(?) 197 // the hard way(?)
183 198
184 // the dirty blues: "just" swap the XPVHV's 199 CALL_BEGIN (2);
185 swap (SvANY (obj->self), SvANY (hv)); 200 CALL_ARG_SV (newRV_inc ((SV *)obj->self));
186 201 CALL_ARG_SV (newRV_inc ((SV *)hv));
187 // do not swap magic, though 202 PUTBACK;
188 swap (SvMAGIC (obj->self), SvMAGIC (hv)); 203 call_method ("thawer_merge", G_DISCARD | G_EVAL);
204 SPAGAIN;
205 CALL_END;
189 } 206 }
190 else 207 else
191 { 208 {
192 // the easy way(?) 209 // the easy way(?)
193 210
194 obj->self = hv; 211 obj->self = hv;
195 SvRV_set (*svp, &PL_sv_undef); 212 SvRV_set (*svp, &PL_sv_undef);
196 213
197 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 214 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
198
199 // borrow a refcount for the perl object
200 obj->flags |= attachable::F_BORROWED;
201 obj->refcnt_dec ();
202 } 215 }
203 216
204 obj->reattach (); 217 obj->reattach ();
205} 218}
206 219
207object_thawer::~object_thawer () 220object_thawer::~object_thawer ()
208{ 221{
209 if (text) SvREFCNT_dec (text); 222 if (text) SvREFCNT_dec (text);
210 if (av) SvREFCNT_dec (av); 223 if (av) SvREFCNT_dec (av);
211}
212 224
225 resolve_delayed_derefs (false);
226
227 free ((void *)name);
228}
229
230//TODO: remove
231char *
213char *fgets (char *s, int n, object_thawer &thawer) 232fgets (char *s, int n, object_thawer &thawer)
214{ 233{
215 char *p = thawer.line; 234 char *p = thawer.line;
216 char *q = s; 235 char *q = s;
217 236
218 if (!p) 237 if (!p)
… …
224 break; 243 break;
225 244
226 *q++ = *p; 245 *q++ = *p;
227 246
228 if (*p++ == '\n') 247 if (*p++ == '\n')
248 {
249 ++thawer.linenum;
229 break; 250 break;
251 }
230 } 252 }
231 253
232 *q = 0; 254 *q = 0;
233 thawer.line = p; 255 thawer.line = p;
234 256
235 return s == q ? 0 : s; 257 return s == q ? 0 : s;
236} 258}
237 259
238keyword object_thawer::get_kv () 260void
261object_thawer::parse_warn (const char *msg)
262{
263 LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
264 this->name, linenum,
265 kw_str ? kw_str : "<null>",
266 value ? value : "<null>",
267 msg);
268}
269
270bool
271object_thawer::parse_error (const char *type, const char *name, bool skip)
272{
273 if (!type) type = "file section";
274 if (!name) name = "generic";
275
276 switch (kw)
277 {
278 case KW_EOF:
279 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
280 this->name, linenum, type, name);
281 return false;
282
283 case KW_ERROR:
284 LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n",
285 this->name, linenum,
286 type, name,
287 kw_str ? kw_str : "<file load>");
288 return false;
289
290 default:
291 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
292 this->name, linenum,
293 kw_str ? kw_str : "<null>",
294 value ? value : "<null>",
295 type, name,
296 skip ? "skipping line" : "aborting load");
297 return skip;
298 }
299}
300
301void
302object_thawer::next ()
239{ 303{
240 if (!line) 304 if (!line)
241 return KW_EOF; 305 {
306 kw = KW_ERROR;
307 return;
308 }
242 309
243 for (;;) 310 for (;;)
244 { 311 {
245 char *p = line; 312 char *p = line;
246 313
314 if (*p <= ' ')
315 {
316 // skip whitespace (only some files need this)
317 while (*p == ' ' || *p == '\t')
318 p++;
319
320 line = p;
321 }
322
247 if (!*p) 323 if (!*p)
248 return KW_EOF; 324 {
325 kw = KW_EOF;
326 break;
327 }
249 328
250 // parse keyword 329 // parse keyword
251 while (*p > ' ') 330 while (*p > ' ')
252 p++; 331 p++;
253 332
254 int klen = p - line; 333 int klen = p - line;
255 334
335 value_nn = "";
336 value = 0;
337
256 if (*p++ != '\n') 338 if (*p++ != '\n')
257 { 339 {
258 // parse value 340 // parse value
259 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20 341 while (*(unsigned char *)p <= ' ' && *p != '\n')
260 ++p; 342 ++p;
261 343
262 last_value = p; 344 value_nn = value = p;
263 345
264 while (*p != '\n') 346 while (*p != '\n')
265 p++; 347 p++;
266 348
267 *p++ = 0; 349 *p++ = 0;
268 } 350 }
269 else
270 last_value = 0;
271 351
352 ++linenum;
272 line [klen] = 0; 353 line [klen] = 0;
273 keyword_idx *kw = kw_lex::match (line, klen); 354 keyword_idx *kw_idx = kw_lex::match (line, klen);
274 355
275 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D 356 kw_str = line;
276
277 last_keyword = line;
278 line = p; 357 line = p;
279 358
280 if (kw) 359 if (kw_idx)
281 return kw->index; 360 {
361 kw = kw_idx->index;
362 break;
363 }
282 else if (!*last_keyword || *last_keyword == '#') 364 else if (!*kw_str || *kw_str == '#')
283 ; // empty/comment line 365 ; // empty/comment line
284 else 366 else
367 {
285 return KW_ERROR; 368 kw = KW_ERROR;
369 break;
370 }
286 } 371 }
287} 372}
288 373
289void object_thawer::skip_kv (keyword kw) 374void
375object_thawer::skip ()
290{ 376{
291 shstr ml; 377 shstr ml;
292 378
293 switch (kw) 379 switch (kw)
294 { 380 {
295 case KW_msg: get_ml (KW_endmsg , ml); break; 381 case KW_msg: get_ml (KW_endmsg , ml); break;
296 case KW_lore: get_ml (KW_endlore , ml); break; 382 case KW_lore: get_ml (KW_endlore , ml); break;
297 case KW_maplore: get_ml (KW_endmaplore, ml); break; 383 case KW_maplore: get_ml (KW_endmaplore, ml); break;
384 default: break;
298 } 385 }
386
387 next ();
299} 388}
300 389
301void object_thawer::get (shstr &sh) const 390void
391object_thawer::skip_block ()
302{ 392{
303 if (last_value) 393 // must not stop at KW_ERROR, as those signify custom keys
304 sh = last_value; 394 while (kw != KW_EOF)
305 else
306 {
307 sh = "<value missing>";
308 LOG (llevError, "keyword requires value: <%.320s>\n", line);//TODO: add filename
309 } 395 {
310} 396 keyword w = kw;
397 skip ();
311 398
399 if (0 && (w == KW_map || w == KW_arch || w == KW_object || w == KW_region))
400 skip_block ();
401 else if (w == KW_end)
402 break;
403 }
404}
405
406void
312void object_thawer::get_ml (keyword kend, shstr &sh) 407object_thawer::get_ml (keyword kend, shstr &sh)
313{ 408{
314 char kw[128]; 409 char kw[128];
315 410
316 int klen = keyword_len [kend]; 411 int klen = keyword_len [kend];
317 412
318 kw [0] = '\n'; 413 kw [0] = '\n';
319 memcpy (kw + 1, keyword_str [kend], klen); 414 memcpy (kw + 1, keyword_str [kend], klen);
320 kw [klen + 1] = '\n'; 415 kw [klen + 1] = '\n';
321 kw [klen + 2] = 0; 416 kw [klen + 2] = 0;
322 417
418 ++linenum;
419
323 // first test for completely empty msg... "endXXX\n" 420 // first test for completely empty msg... "endXXX\n"
324 if (!strncmp (line, kw + 1, klen + 1)) 421 if (!strncmp (line, kw + 1, klen + 1))
325 { 422 {
326 sh = 0; 423 sh = 0;
327 424
… …
342 } 439 }
343 440
344 *end = 0; 441 *end = 0;
345 sh = line; 442 sh = line;
346 443
444 // count line numbers
445 while (line < end)
446 linenum += *line++ == '\n';
447
347 line = end + keyword_len [kend] + 1; 448 line += keyword_len [kend];
348 449
349 while (*line++ != '\n') 450 while (*line++ != '\n')
350 ; 451 ;
351 }
352}
353 452
453 ++linenum;
454 }
455}
456
457sint32
354sint32 object_thawer::get_sint32 () const 458object_thawer::get_sint32 () const
355{ 459{
356 char *p = last_value; 460 const char *p = value_nn;
357
358 if (!p)
359 return 0;
360 461
361 sint32 val = 0; 462 sint32 val = 0;
362 bool negate; 463 bool negate;
363 464
364 if (*p == '-') 465 if (*p == '-')
… …
377 while (*p); 478 while (*p);
378 479
379 return negate ? -val : val; 480 return negate ? -val : val;
380} 481}
381 482
382sint64 object_thawer::get_sint64 () const 483void
484object_thawer::delayed_deref (attachable *op, object_ptr &ptr, const char *ref)
383{ 485{
384 return last_value ? atoll (last_value) : 0; 486 op->refcnt_inc ();
487 delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
488 delrefs.push_back (r);
489 ptr = 0;
385} 490}
386 491
387double object_thawer::get_double () const 492void
493object_thawer::resolve_delayed_derefs (bool deref)
388{ 494{
389 return last_value ? atof (last_value) : 0; 495 while (!delrefs.empty ())
390} 496 {
497 delayed_ref r = delrefs.back ();
498 delrefs.pop_back ();
391 499
500 if (deref)
501 *r.ptr = object::deref (r.ref);
502
503 free ((void *)r.ref);
504 r.op->refcnt_dec ();
505 }
506}

Diff Legend

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