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.10 by root, Thu Feb 15 21:07:49 2007 UTC vs.
Revision 1.46 by root, Mon Oct 29 23:55:55 2012 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,2011,2012 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 char *data, AV *perlav)
112: name (strdup ("(memory stream)"))
113{
114 init ("(memory stream)");
115
116 av = perlav;
117 text = newSVpv (data, 0); sv_catpv (text, thawer_eof);
118 line = SvPVbyte_nolen (text);
119 next ();
120}
121
122object_thawer::object_thawer (const_utf8_string path)
123{
124 init_from_file (path);
125}
126
127// convenience constructor
128object_thawer::object_thawer (const_utf8_string dir, const_utf8_string file)
129{
130 init_from_file (format ("%s/%s", dir, file));
131}
132
133void
134object_thawer::init (const_utf8_string path)
135{
109: name (strdup (path)) 136 name = strdup (path);
110{
111 static const char eof[] = "\n\n\n\0\0\0";
112
113 av = 0; 137 av = 0;
114 text = 0; 138 text = 0;
115 line = 0; 139 line = 0;
116 linenum = 0; 140 linenum = 0;
117 141
118 kw = KW_ERROR; 142 kw = KW_ERROR;
119 kw_str = 0; 143 kw_str = 0;
120 value = 0; 144 value = 0;
145}
121 146
147void
148object_thawer::init_from_file (const_utf8_string path)
149{
122 if (path) 150 init (path);
123 { 151
124 CALL_BEGIN (1); 152 CALL_BEGIN (1);
125 CALL_ARG_SV (newSVpv (path, 0)); 153 CALL_ARG_SV (newSVpv (path, 0));
126 CALL_CALL ("cf::object_thawer_load", G_ARRAY); 154 CALL_CALL ("cf::object_thawer_load", G_ARRAY);
127 155
128 if (count == 2) 156 if (count == 2)
129 { 157 {
130 // second value - perl objects 158 // second value - perl objects
131 { 159 {
132 SV *sv = POPs; 160 SV *sv = POPs;
133 if (SvROK (sv)) 161 if (SvROK (sv))
134 av = (AV *)SvREFCNT_inc (SvRV (sv)); 162 av = (AV *)SvREFCNT_inc (SvRV (sv));
135 } 163 }
136 164
137 // first value - text part, pad with 3 zeroes 165 // first value - text part, pad with 3 zeroes
138 { 166 {
139 SV *sv = POPs; 167 SV *sv = POPs;
140 STRLEN len; 168 STRLEN len;
141 char *sv_ = SvPVbyte (sv, len); 169 char *sv_ = SvPVbyte (sv, len);
142 text = newSV (len + sizeof (eof)); 170 text = newSV (len + sizeof (thawer_eof));
143 SvCUR_set (text, len); 171 SvCUR_set (text, len + sizeof (thawer_eof));
144 memcpy (SvPVX (text), sv_, len); 172 memcpy (SvPVX (text), sv_, len);
145 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure 173 memcpy (SvPVX (text) + len, thawer_eof, sizeof (thawer_eof));
146 174
147 line = SvPVX (text); 175 line = SvPVX (text);
148 } 176 next ();
149 } 177 }
178 }
150 179
151 CALL_END; 180 CALL_END;
152 }
153}
154
155object_thawer::object_thawer (const char *data, AV *perlav)
156: name (strdup ("(memory stream"))
157{
158 av = perlav;
159 text = newSVpv (data, 0);
160 sv_catpv (text, thawer_eof);
161 line = SvPVbyte_nolen (text);
162} 181}
163 182
164void 183void
165object_thawer::get (attachable *obj, int oid) 184object_thawer::get (attachable *obj, int oid)
166{ 185{
… …
169 188
170 SV **svp = av_fetch ((AV *)av, oid, 0); 189 SV **svp = av_fetch ((AV *)av, oid, 0);
171 190
172 if (!svp || !SvROK (*svp)) 191 if (!svp || !SvROK (*svp))
173 { 192 {
174 printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid); 193 LOG (llevError, "trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
175 return; 194 return;
176 } 195 }
177 196
178 if (!SvROK (*svp)) 197 if (!SvROK (*svp))
179 { 198 {
180 LOG (llevError, "deserialised perl object is not an RV"); 199 LOG (llevError, "deserialised perl object is not an RV\n");
181 return; 200 return;
182 } 201 }
183 202
184 HV *hv = (HV *)SvRV (*svp); 203 HV *hv = (HV *)SvRV (*svp);
185 204
186 if (SvTYPE (hv) != SVt_PVHV) 205 if (SvTYPE (hv) != SVt_PVHV)
187 { 206 {
188 LOG (llevError, "deserialised perl object is not a PVHV"); 207 LOG (llevError, "deserialised perl object is not a PVHV\n");
189 return; 208 return;
190 } 209 }
191 210
192 if (obj->self) 211 if (obj->self)
193 { 212 {
… …
217object_thawer::~object_thawer () 236object_thawer::~object_thawer ()
218{ 237{
219 if (text) SvREFCNT_dec (text); 238 if (text) SvREFCNT_dec (text);
220 if (av) SvREFCNT_dec (av); 239 if (av) SvREFCNT_dec (av);
221 240
241 resolve_delayed_derefs (false);
242
222 free ((void *)name); 243 free ((void *)name);
223} 244}
224 245
225//TODO: remove 246static void
226char * 247error_out ()
227fgets (char *s, int n, object_thawer &thawer)
228{ 248{
229 char *p = thawer.line; 249 if (object_thawer::errors_are_fatal)
230 char *q = s;
231
232 if (!p)
233 return 0;
234
235 while (--n)
236 {
237 if (!*p)
238 break;
239
240 *q++ = *p;
241
242 if (*p++ == '\n')
243 {
244 ++thawer.linenum;
245 break;
246 }
247 } 250 {
251 LOG (llevError, "(parse errors at this time are fatal, exiting)");
252 exit (1);
253 }
254}
248 255
249 *q = 0; 256void
250 thawer.line = p; 257object_thawer::parse_warn (const char *msg) const
251 258{
252 return s == q ? 0 : s; 259 LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
260 this->name, linenum,
261 kw_str ? kw_str : "<null>",
262 value ? value : "<null>",
263 msg);
253} 264}
254 265
255bool 266bool
256object_thawer::parse_error (const char *type, const char *name, bool skip) 267object_thawer::parse_error (const char *type, const char *name, bool skip) const
257{ 268{
258 if (!type) type = "file section"; 269 if (!type) type = "file section";
259 if (!name) name = "generic"; 270 if (!name) name = "generic";
260 271
261 switch (kw) 272 switch (kw)
262 { 273 {
263 case KW_EOF: 274 case KW_EOF:
264 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n", 275 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
265 this->name, linenum, type, name); 276 this->name, linenum, type, name);
277 error_out ();
266 return false; 278 return false;
267 279
268 case KW_ERROR: 280 case KW_ERROR:
269 LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n", 281 LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n",
270 this->name, linenum, 282 this->name, linenum,
271 type, name, 283 type, name,
272 kw_str ? kw_str : "<file load>"); 284 kw_str ? kw_str : "<file load>");
285 error_out ();
273 return false; 286 return false;
274 287
275 default: 288 default:
276 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n", 289 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
277 this->name, linenum, 290 this->name, linenum,
278 kw_str ? kw_str : "<null>", 291 kw_str ? kw_str : "<null>",
279 value ? value : "<null>", 292 value ? value : "<null>",
280 type, name, 293 type, name,
281 skip ? "skipping line" : "aborting load"); 294 skip ? "skipping line" : "aborting load");
295 error_out ();
282 return skip; 296 return skip;
283 } 297 }
284} 298}
285 299
286void 300void
287object_thawer::next_kv () 301object_thawer::next ()
288{ 302{
289 if (!line) 303 if (!line)
290 { 304 {
291 kw = KW_ERROR; 305 kw = KW_ERROR;
292 return; 306 return;
293 } 307 }
294 308
295 for (;;) 309 for (;;)
296 { 310 {
297 char *p = line; 311 char *p = line;
312
313 if (expect_false (*p <= ' '))
314 {
315 // skip whitespace (only some files need this)
316 while (*p == ' ' || *p == '\t')
317 p++;
318
319 line = p;
320 }
298 321
299 if (!*p) 322 if (!*p)
300 { 323 {
301 kw = KW_EOF; 324 kw = KW_EOF;
302 break; 325 break;
… …
306 while (*p > ' ') 329 while (*p > ' ')
307 p++; 330 p++;
308 331
309 int klen = p - line; 332 int klen = p - line;
310 333
334 value_nn = "";
335 value = 0;
336
311 if (*p++ != '\n') 337 if (*p++ != '\n')
312 { 338 {
313 // parse value 339 // parse value
314 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20 340 while (*(unsigned char *)p <= ' ' && *p != '\n')
315 ++p; 341 ++p;
316 342
317 value = p; 343 value_nn = value = p;
318 344
319 while (*p != '\n') 345 while (*p != '\n')
320 p++; 346 p++;
321 347
322 *p++ = 0; 348 *p++ = 0;
323 } 349 }
324 else
325 value = 0;
326 350
327 ++linenum; 351 ++linenum;
328 line [klen] = 0; 352 line [klen] = 0;
329 keyword_idx *kw_idx = kw_lex::match (line, klen); 353 keyword_idx *kw_idx = kw_lex::match (line, klen);
330 354
331 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, value);//D
332
333 kw_str = line; 355 kw_str = line;
334 line = p; 356 line = p;
335 357
336 if (kw_idx) 358 if (kw_idx)
337 { 359 {
… …
346 break; 368 break;
347 } 369 }
348 } 370 }
349} 371}
350 372
373bool
374object_thawer::next_line ()
375{
376 if (!line)
377 {
378 kw = KW_ERROR;
379 return 0;
380 }
381
382 for (;;)
383 {
384 char *p = line;
385
386 if (expect_false (*p <= ' '))
387 {
388 // skip whitespace (only some files need this)
389 while (*p == ' ' || *p == '\t')
390 p++;
391
392 line = p;
393 }
394
395 if (!*p)
396 {
397 kw = KW_EOF;
398 return 0;
399 }
400
401 kw = KW_value;
402 kw_str = p;
403 value_nn = p;
404 value = p;
405
406 // parse till newline
407 while (*p > '\n')
408 p++;
409
410 if (*p == '\n')
411 *p++ = 0;
412
413 ++linenum;
414
415 line = p;
416
417 if (*kw_str && *kw_str != '#')
418 break;
419
420 // empty/comment line -> skip it
421 }
422
423 return 1;
424}
425
351void 426void
352object_thawer::skip_kv () 427object_thawer::skip ()
353{ 428{
354 shstr ml; 429 shstr ml;
355 430
356 switch (kw) 431 switch (kw)
357 { 432 {
358 case KW_msg: get_ml (KW_endmsg , ml); break; 433 case KW_msg: get_ml (KW_endmsg , ml); break;
359 case KW_lore: get_ml (KW_endlore , ml); break; 434 case KW_lore: get_ml (KW_endlore , ml); break;
360 case KW_maplore: get_ml (KW_endmaplore, ml); break; 435 case KW_maplore: get_ml (KW_endmaplore, ml); break;
436 default: break;
361 } 437 }
362 438
363 next_kv (); 439 next ();
364} 440}
365 441
366void 442void
367object_thawer::get (shstr &sh) const 443object_thawer::skip_block ()
368{ 444{
369 if (value) 445 // must not stop at KW_ERROR, as those signify custom keys
370 sh = value; 446 while (kw != KW_EOF)
371 else
372 { 447 {
373 sh = "<value missing>"; 448 keyword w = kw;
374 LOG (llevError, "keyword \"%s\" requires value, substituting with <value missing>\n", kw_str);//TODO: add filename 449 skip ();
450
451 if (0 && (w == KW_map || w == KW_arch || w == KW_object || w == KW_region))
452 skip_block ();
453 else if (w == KW_end)
454 break;
375 } 455 }
376} 456}
377 457
378void 458void
379object_thawer::get_ml (keyword kend, shstr &sh) 459object_thawer::get_ml (keyword kend, shstr &sh)
… …
427} 507}
428 508
429sint32 509sint32
430object_thawer::get_sint32 () const 510object_thawer::get_sint32 () const
431{ 511{
432 char *p = value; 512 const char *p = value_nn;
433
434 if (!p)
435 return 0;
436 513
437 sint32 val = 0; 514 sint32 val = 0;
438 bool negate; 515 bool negate;
439 516
440 if (*p == '-') 517 if (*p == '-')
… …
453 while (*p); 530 while (*p);
454 531
455 return negate ? -val : val; 532 return negate ? -val : val;
456} 533}
457 534
458sint64 535void
459object_thawer::get_sint64 () const 536object_thawer::delayed_deref (attachable *op, object_ptr &ptr, const char *ref)
460{ 537{
461 return value ? atoll (value) : 0; 538 op->refcnt_inc ();
539 delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
540 delrefs.push_back (r);
541 ptr = 0;
462} 542}
463 543
464double 544void
465object_thawer::get_double () const 545object_thawer::resolve_delayed_derefs (bool deref)
466{ 546{
467 return value ? atof (value) : 0; 547 while (!delrefs.empty ())
468} 548 {
549 delayed_ref r = delrefs.back ();
550 delrefs.pop_back ();
469 551
552 if (deref)
553 *r.ptr = object::deref (r.ref);
554
555 free ((void *)r.ref);
556 r.op->refcnt_dec ();
557 }
558}

Diff Legend

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