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.8 by root, Thu Feb 1 19:15:39 2007 UTC vs.
Revision 1.40 by root, Wed Apr 28 19:49:50 2010 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,2008,2009,2010 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
25#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff 23#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff
26#include "logger.h" 24#include "logger.h"
27#include "cfperl.h" 25#include "cfperl.h"
28#include "kw_hash.h" 26#include "kw_hash.h"
29 27
30object_freezer::object_freezer () 28object_freezer::object_freezer ()
31: dynbuf (128 * 1024, 64 * 1024) 29: dynbuf_text (128 * 1024, 64 * 1024)
32{ 30{
33 av = newAV (); 31 av = newAV ();
34} 32}
35 33
36object_freezer::~object_freezer () 34object_freezer::~object_freezer ()
37{ 35{
38 SvREFCNT_dec (av); 36 SvREFCNT_dec (av);
39} 37}
40 38
41void 39void
42object_freezer::put (attachable *ext) 40object_freezer::put_ (attachable *ext)
43{ 41{
44 ext->optimise (); 42 ext->optimise ();
45 43
46 if (ext->self) 44 if (ext->self)
47 { 45 {
48 int idx = AvFILLp ((AV *)av) + 1; 46 int idx = AvFILLp ((AV *)av) + 1;
49 av_store (av, idx, newRV_inc ((SV *)ext->self)); 47 av_store (av, idx, newRV_inc ((SV *)ext->self));
50 48
51 add ((void *)"oid ", 4); 49 put (KW(oid), sint32(idx));
52 add ((sint32)idx);
53 add ('\n');
54 } 50 }
55} 51}
56 52
57bool 53bool
58object_freezer::save (const char *path) 54object_freezer::save (const char *path)
… …
61 CALL_ARG_SV (newSVpv (path, 0)); 57 CALL_ARG_SV (newSVpv (path, 0));
62 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ()))); 58 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));
63 CALL_ARG_SV (newRV_inc ((SV *)av)); 59 CALL_ARG_SV (newRV_inc ((SV *)av));
64 CALL_CALL ("cf::object_freezer_save", G_VOID | G_DISCARD); 60 CALL_CALL ("cf::object_freezer_save", G_VOID | G_DISCARD);
65 CALL_END; 61 CALL_END;
62
63 return 1;
66} 64}
67 65
68char * 66char *
69object_freezer::as_string () 67object_freezer::as_string ()
70{ 68{
… …
80 CALL_END; 78 CALL_END;
81 79
82 return res; 80 return res;
83} 81}
84 82
85int 83#if 0
84void
86fprintf (object_freezer &freezer, const char *format, ...) 85fprintf (object_freezer &freezer, const char *format, ...)
87{ 86{
88 va_list ap; 87 va_list ap;
89 88
90 va_start (ap, format); 89 va_start (ap, format);
… …
95 freezer.alloc (len); 94 freezer.alloc (len);
96 95
97 va_end (ap); 96 va_end (ap);
98} 97}
99 98
100int 99// XXX: function not returning an int
100void
101fputs (const char *s, object_freezer &freezer) 101fputs (const char *s, object_freezer &freezer)
102{ 102{
103 freezer.add (s); 103 freezer.add (s);
104} 104}
105#endif
105 106
106static const char thawer_eof[] = "\n\n\n\0\0\0"; 107static const char thawer_eof[] = "\n\n\n\0\0\0";
107 108
109bool object_thawer::errors_are_fatal = true;
110
108object_thawer::object_thawer (const char *path) 111object_thawer::object_thawer (const_utf8_string path)
112{
113 new_from_path (path);
114}
115
116// convenience constructor
117object_thawer::object_thawer (const_utf8_string dir, const_utf8_string file)
118{
119 new_from_path (format ("%s/%s", dir, file));
120}
121
122void
123object_thawer::new_from_path (const_utf8_string path)
124{
109: name (strdup (path)) 125 name = strdup (path);
110{
111 static const char eof[] = "\n\n\n\0\0\0";
112
113 av = 0; 126 av = 0;
114 text = 0; 127 text = 0;
115 line = 0; 128 line = 0;
116 linenum = 0; 129 linenum = 0;
130
131 kw = KW_ERROR;
132 kw_str = 0;
133 value = 0;
117 134
118 if (path) 135 if (path)
119 { 136 {
120 CALL_BEGIN (1); 137 CALL_BEGIN (1);
121 CALL_ARG_SV (newSVpv (path, 0)); 138 CALL_ARG_SV (newSVpv (path, 0));
… …
133 // first value - text part, pad with 3 zeroes 150 // first value - text part, pad with 3 zeroes
134 { 151 {
135 SV *sv = POPs; 152 SV *sv = POPs;
136 STRLEN len; 153 STRLEN len;
137 char *sv_ = SvPVbyte (sv, len); 154 char *sv_ = SvPVbyte (sv, len);
138 text = newSV (len + sizeof (eof)); 155 text = newSV (len + sizeof (thawer_eof));
139 SvCUR_set (text, len); 156 SvCUR_set (text, len + sizeof (thawer_eof));
140 memcpy (SvPVX (text), sv_, len); 157 memcpy (SvPVX (text), sv_, len);
141 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure 158 memcpy (SvPVX (text) + len, thawer_eof, sizeof (thawer_eof));
142 159
143 line = SvPVX (text); 160 line = SvPVX (text);
161 next ();
144 } 162 }
145 } 163 }
146 164
147 CALL_END; 165 CALL_END;
148 } 166 }
149} 167}
150 168
151object_thawer::object_thawer (const char *data, AV *perlav) 169object_thawer::object_thawer (const char *data, AV *perlav)
152: name (strdup ("(memory stream")) 170: name (strdup ("(memory stream)"))
153{ 171{
154 av = perlav; 172 av = perlav;
155 text = newSVpv (data, 0); 173 text = newSVpv (data, 0);
156 sv_catpv (text, thawer_eof); 174 sv_catpv (text, thawer_eof);
157 line = SvPVbyte_nolen (text); 175 line = SvPVbyte_nolen (text);
176 next ();
158} 177}
159 178
160void 179void
161object_thawer::get (attachable *obj, int oid) 180object_thawer::get (attachable *obj, int oid)
162{ 181{
… …
165 184
166 SV **svp = av_fetch ((AV *)av, oid, 0); 185 SV **svp = av_fetch ((AV *)av, oid, 0);
167 186
168 if (!svp || !SvROK (*svp)) 187 if (!svp || !SvROK (*svp))
169 { 188 {
170 printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid); 189 LOG (llevError, "trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
171 return; 190 return;
172 } 191 }
173 192
174 if (!SvROK (*svp)) 193 if (!SvROK (*svp))
175 { 194 {
176 LOG (llevError, "deserialised perl object is not an RV"); 195 LOG (llevError, "deserialised perl object is not an RV\n");
177 return; 196 return;
178 } 197 }
179 198
180 HV *hv = (HV *)SvRV (*svp); 199 HV *hv = (HV *)SvRV (*svp);
181 200
182 if (SvTYPE (hv) != SVt_PVHV) 201 if (SvTYPE (hv) != SVt_PVHV)
183 { 202 {
184 LOG (llevError, "deserialised perl object is not a PVHV"); 203 LOG (llevError, "deserialised perl object is not a PVHV\n");
185 return; 204 return;
186 } 205 }
187 206
188 if (obj->self) 207 if (obj->self)
189 { 208 {
… …
213object_thawer::~object_thawer () 232object_thawer::~object_thawer ()
214{ 233{
215 if (text) SvREFCNT_dec (text); 234 if (text) SvREFCNT_dec (text);
216 if (av) SvREFCNT_dec (av); 235 if (av) SvREFCNT_dec (av);
217 236
237 resolve_delayed_derefs (false);
238
218 free ((void *)name); 239 free ((void *)name);
219} 240}
220 241
221//TODO: remove 242static void
222char * 243error_out ()
223fgets (char *s, int n, object_thawer &thawer)
224{ 244{
225 char *p = thawer.line; 245 if (object_thawer::errors_are_fatal)
226 char *q = s;
227
228 if (!p)
229 return 0;
230
231 while (--n)
232 {
233 if (!*p)
234 break;
235
236 *q++ = *p;
237
238 if (*p++ == '\n')
239 {
240 ++thawer.linenum;
241 break;
242 }
243 } 246 {
247 LOG (llevError, "(parse errors at this time are fatal, exiting)");
248 exit (1);
249 }
250}
244 251
245 *q = 0; 252void
246 thawer.line = p; 253object_thawer::parse_warn (const char *msg)
247 254{
248 return s == q ? 0 : s; 255 LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
256 this->name, linenum,
257 kw_str ? kw_str : "<null>",
258 value ? value : "<null>",
259 msg);
249} 260}
250 261
251bool 262bool
252object_thawer::parse_error (keyword kw, const char *type, const char *name, bool skip) 263object_thawer::parse_error (const char *type, const char *name, bool skip)
253{ 264{
254 if (!type) type = "file section"; 265 if (!type) type = "file section";
255 if (!name) name = "generic"; 266 if (!name) name = "generic";
256 267
257 switch (kw) 268 switch (kw)
258 { 269 {
259 case KW_EOF: 270 case KW_EOF:
260 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n", 271 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
261 this->name, linenum, type, name); 272 this->name, linenum, type, name);
273 error_out ();
262 return false; 274 return false;
263 275
264 case KW_ERROR: 276 case KW_ERROR:
265 LOG (llevError, "%s:%d errornous line (%s) while reading %s '%s', aborting load.\n", 277 LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n",
266 this->name, linenum, 278 this->name, linenum,
267 last_keyword ? last_keyword : "<null>",
268 type, name); 279 type, name,
280 kw_str ? kw_str : "<file load>");
281 error_out ();
269 return false; 282 return false;
270 283
271 default: 284 default:
272 LOG (llevError, "%s:%d unexpected line (%s) while reading %s '%s', %s.\n", 285 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
273 this->name, linenum, 286 this->name, linenum,
274 last_keyword ? last_keyword : "<null>", 287 kw_str ? kw_str : "<null>",
275 last_value ? last_value : "<null>", 288 value ? value : "<null>",
276 type, name, 289 type, name,
277 skip ? "skipping line" : "aborting load"); 290 skip ? "skipping line" : "aborting load");
291 error_out ();
278 return skip; 292 return skip;
279 } 293 }
280} 294}
281 295
282keyword 296void
283object_thawer::get_kv () 297object_thawer::next ()
284{ 298{
285 if (!line) 299 if (!line)
286 return KW_EOF; 300 {
301 kw = KW_ERROR;
302 return;
303 }
287 304
288 for (;;) 305 for (;;)
289 { 306 {
290 char *p = line; 307 char *p = line;
291 308
309 if (expect_false (*p <= ' '))
310 {
311 // skip whitespace (only some files need this)
312 while (*p == ' ' || *p == '\t')
313 p++;
314
315 line = p;
316 }
317
292 if (!*p) 318 if (!*p)
293 return KW_EOF; 319 {
320 kw = KW_EOF;
321 break;
322 }
294 323
295 // parse keyword 324 // parse keyword
296 while (*p > ' ') 325 while (*p > ' ')
297 p++; 326 p++;
298 327
299 int klen = p - line; 328 int klen = p - line;
300 329
330 value_nn = "";
331 value = 0;
332
301 if (*p++ != '\n') 333 if (*p++ != '\n')
302 { 334 {
303 // parse value 335 // parse value
304 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20 336 while (*(unsigned char *)p <= ' ' && *p != '\n')
305 ++p; 337 ++p;
306 338
307 last_value = p; 339 value_nn = value = p;
308 340
309 while (*p != '\n') 341 while (*p != '\n')
310 p++; 342 p++;
311 343
312 *p++ = 0; 344 *p++ = 0;
313 } 345 }
314 else
315 last_value = 0;
316 346
317 ++linenum; 347 ++linenum;
318 line [klen] = 0; 348 line [klen] = 0;
319 keyword_idx *kw = kw_lex::match (line, klen); 349 keyword_idx *kw_idx = kw_lex::match (line, klen);
320 350
321 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D 351 kw_str = line;
322
323 last_keyword = line;
324 line = p; 352 line = p;
325 353
326 if (kw) 354 if (kw_idx)
327 return kw->index; 355 {
356 kw = kw_idx->index;
357 break;
358 }
328 else if (!*last_keyword || *last_keyword == '#') 359 else if (!*kw_str || *kw_str == '#')
329 ; // empty/comment line 360 ; // empty/comment line
330 else 361 else
362 {
331 return KW_ERROR; 363 kw = KW_ERROR;
364 break;
365 }
366 }
367}
368
369bool
370object_thawer::next_line ()
371{
372 if (!line)
332 } 373 {
333} 374 kw = KW_ERROR;
375 return 0;
376 }
334 377
378 for (;;)
379 {
380 char *p = line;
381
382 if (expect_false (*p <= ' '))
383 {
384 // skip whitespace (only some files need this)
385 while (*p == ' ' || *p == '\t')
386 p++;
387
388 line = p;
389 }
390
391 if (!*p)
392 {
393 kw = KW_EOF;
394 return 0;
395 }
396
397 kw = KW_value;
398 kw_str = p;
399 value_nn = p;
400 value = p;
401
402 // parse till newline
403 while (*p > '\n')
404 p++;
405
406 if (*p == '\n')
407 *p++ = 0;
408
409 ++linenum;
410
411 line = p;
412
413 if (*kw_str && *kw_str != '#')
414 break;
415
416 // empty/comment line -> skip it
417 }
418
419 return 1;
420}
421
335void 422void
336object_thawer::skip_kv (keyword kw) 423object_thawer::skip ()
337{ 424{
338 shstr ml; 425 shstr ml;
339 426
340 switch (kw) 427 switch (kw)
341 { 428 {
342 case KW_msg: get_ml (KW_endmsg , ml); break; 429 case KW_msg: get_ml (KW_endmsg , ml); break;
343 case KW_lore: get_ml (KW_endlore , ml); break; 430 case KW_lore: get_ml (KW_endlore , ml); break;
344 case KW_maplore: get_ml (KW_endmaplore, ml); break; 431 case KW_maplore: get_ml (KW_endmaplore, ml); break;
432 default: break;
345 } 433 }
434
435 next ();
346} 436}
347 437
348void 438void
349object_thawer::get (shstr &sh) const 439object_thawer::skip_block ()
350{ 440{
351 if (last_value) 441 // must not stop at KW_ERROR, as those signify custom keys
352 sh = last_value; 442 while (kw != KW_EOF)
353 else
354 { 443 {
355 sh = "<value missing>"; 444 keyword w = kw;
356 LOG (llevError, "keyword \"%s\" requires value, substituting with <value missing>\n", last_keyword);//TODO: add filename 445 skip ();
446
447 if (0 && (w == KW_map || w == KW_arch || w == KW_object || w == KW_region))
448 skip_block ();
449 else if (w == KW_end)
450 break;
357 } 451 }
358} 452}
359 453
360void 454void
361object_thawer::get_ml (keyword kend, shstr &sh) 455object_thawer::get_ml (keyword kend, shstr &sh)
… …
409} 503}
410 504
411sint32 505sint32
412object_thawer::get_sint32 () const 506object_thawer::get_sint32 () const
413{ 507{
414 char *p = last_value; 508 const char *p = value_nn;
415
416 if (!p)
417 return 0;
418 509
419 sint32 val = 0; 510 sint32 val = 0;
420 bool negate; 511 bool negate;
421 512
422 if (*p == '-') 513 if (*p == '-')
… …
435 while (*p); 526 while (*p);
436 527
437 return negate ? -val : val; 528 return negate ? -val : val;
438} 529}
439 530
440sint64 531void
441object_thawer::get_sint64 () const 532object_thawer::delayed_deref (attachable *op, object_ptr &ptr, const char *ref)
442{ 533{
443 return last_value ? atoll (last_value) : 0; 534 op->refcnt_inc ();
535 delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
536 delrefs.push_back (r);
537 ptr = 0;
444} 538}
445 539
446double 540void
447object_thawer::get_double () const 541object_thawer::resolve_delayed_derefs (bool deref)
448{ 542{
449 return last_value ? atof (last_value) : 0; 543 while (!delrefs.empty ())
450} 544 {
545 delayed_ref r = delrefs.back ();
546 delrefs.pop_back ();
451 547
548 if (deref)
549 *r.ptr = object::deref (r.ref);
550
551 free ((void *)r.ref);
552 r.op->refcnt_dec ();
553 }
554}

Diff Legend

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