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.13 by root, Thu Mar 1 19:32:59 2007 UTC vs.
Revision 1.49 by root, Wed Dec 5 19:03:27 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
9 * 5 * Copyright (©) 2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6 *
10 * This program is free software; you can redistribute it and/or modify 7 * 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 8 * 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 9 * Free Software Foundation, either version 3 of the License, or (at your
13 * (at your option) any later version. 10 * option) any later version.
14 * 11 *
15 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details. 15 * GNU General Public License for more details.
19 * 16 *
20 * You should have received a copy of the GNU General Public License 17 * 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 18 * 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 19 * <http://www.gnu.org/licenses/>.
20 *
21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff 24#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff
26#include "logger.h" 25#include "logger.h"
27#include "cfperl.h" 26#include "cfperl.h"
28#include "kw_hash.h" 27#include "kw_hash.h"
29 28
30object_freezer::object_freezer () 29object_freezer::object_freezer ()
31: dynbuf (128 * 1024, 64 * 1024) 30: dynbuf_text (128 * 1024, 64 * 1024)
32{ 31{
33 av = newAV (); 32 av = newAV ();
34} 33}
35 34
36object_freezer::~object_freezer () 35object_freezer::~object_freezer ()
37{ 36{
38 SvREFCNT_dec (av); 37 SvREFCNT_dec (av);
39} 38}
40 39
41void 40void
42object_freezer::put (attachable *ext) 41object_freezer::put_ (attachable *ext)
43{ 42{
44 ext->optimise (); 43 ext->optimise ();
45 44
46 if (ext->self) 45 if (ext->self)
47 { 46 {
48 int idx = AvFILLp ((AV *)av) + 1; 47 int idx = AvFILLp ((AV *)av) + 1;
49 av_store (av, idx, newRV_inc ((SV *)ext->self)); 48 av_store (av, idx, newRV_inc ((SV *)ext->self));
50 49
51 add ((void *)"oid ", 4); 50 put (KW(oid), sint32(idx));
52 add ((sint32)idx);
53 add ('\n');
54 } 51 }
55} 52}
56 53
57bool 54bool
58object_freezer::save (const char *path) 55object_freezer::save (const char *path)
… …
82 CALL_END; 79 CALL_END;
83 80
84 return res; 81 return res;
85} 82}
86 83
84#if 0
87void 85void
88fprintf (object_freezer &freezer, const char *format, ...) 86fprintf (object_freezer &freezer, const char *format, ...)
89{ 87{
90 va_list ap; 88 va_list ap;
91 89
… …
103void 101void
104fputs (const char *s, object_freezer &freezer) 102fputs (const char *s, object_freezer &freezer)
105{ 103{
106 freezer.add (s); 104 freezer.add (s);
107} 105}
106#endif
108 107
109static const char thawer_eof[] = "\n\n\n\0\0\0"; 108static const char thawer_eof[] = "\n\n\n\0\0\0";
110 109
110bool object_thawer::errors_are_fatal = true;
111
111object_thawer::object_thawer (const char *path) 112object_thawer::object_thawer (const char *data, AV *perlav)
113: name (strdup ("(memory stream)"))
114{
115 init ("(memory stream)");
116
117 av = perlav;
118 text = newSVpv (data, 0); sv_catpv (text, thawer_eof);
119 line = SvPVbyte_nolen (text);
120 next ();
121}
122
123object_thawer::object_thawer (const_utf8_string path)
124{
125 init_from_file (path);
126}
127
128// convenience constructor
129object_thawer::object_thawer (const_utf8_string dir, const_utf8_string file)
130{
131 init_from_file (format ("%s/%s", dir, file));
132}
133
134void
135object_thawer::init (const_utf8_string path)
136{
112: name (strdup (path)) 137 name = strdup (path);
113{
114 static const char eof[] = "\n\n\n\0\0\0";
115
116 av = 0; 138 av = 0;
117 text = 0; 139 text = 0;
118 line = 0; 140 line = 0;
119 linenum = 0; 141 linenum = 0;
120 142
121 kw = KW_ERROR; 143 kw = KW_ERROR;
122 kw_str = 0; 144 kw_str = 0;
123 value = 0; 145 value = 0;
146}
124 147
148void
149object_thawer::init_from_file (const_utf8_string path)
150{
125 if (path) 151 init (path);
126 { 152
127 CALL_BEGIN (1); 153 CALL_BEGIN (1);
128 CALL_ARG_SV (newSVpv (path, 0)); 154 CALL_ARG_SV (newSVpv (path, 0));
129 CALL_CALL ("cf::object_thawer_load", G_ARRAY); 155 CALL_CALL ("cf::object_thawer_load", G_ARRAY);
130 156
131 if (count == 2) 157 if (count == 2)
132 { 158 {
133 // second value - perl objects 159 // second value - perl objects
134 { 160 {
135 SV *sv = POPs; 161 SV *sv = POPs;
136 if (SvROK (sv)) 162 if (SvROK (sv))
137 av = (AV *)SvREFCNT_inc (SvRV (sv)); 163 av = (AV *)SvREFCNT_inc (SvRV (sv));
138 } 164 }
139 165
140 // first value - text part, pad with 3 zeroes 166 // first value - text part, pad with 3 zeroes
141 { 167 {
142 SV *sv = POPs; 168 SV *sv = POPs;
143 STRLEN len; 169 STRLEN len;
144 char *sv_ = SvPVbyte (sv, len); 170 char *sv_ = SvPVbyte (sv, len);
145 text = newSV (len + sizeof (eof)); 171 text = newSV (len + sizeof (thawer_eof));
146 SvCUR_set (text, len); 172 SvCUR_set (text, len + sizeof (thawer_eof));
147 memcpy (SvPVX (text), sv_, len); 173 memcpy (SvPVX (text), sv_, len);
148 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure 174 memcpy (SvPVX (text) + len, thawer_eof, sizeof (thawer_eof));
149 175
150 line = SvPVX (text); 176 line = SvPVX (text);
151 } 177 next ();
152 } 178 }
179 }
153 180
154 CALL_END; 181 CALL_END;
155 }
156}
157
158object_thawer::object_thawer (const char *data, AV *perlav)
159: name (strdup ("(memory stream"))
160{
161 av = perlav;
162 text = newSVpv (data, 0);
163 sv_catpv (text, thawer_eof);
164 line = SvPVbyte_nolen (text);
165} 182}
166 183
167void 184void
168object_thawer::get (attachable *obj, int oid) 185object_thawer::get (attachable *obj, int oid)
169{ 186{
… …
172 189
173 SV **svp = av_fetch ((AV *)av, oid, 0); 190 SV **svp = av_fetch ((AV *)av, oid, 0);
174 191
175 if (!svp || !SvROK (*svp)) 192 if (!svp || !SvROK (*svp))
176 { 193 {
177 printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid); 194 LOG (llevError, "trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
178 return; 195 return;
179 } 196 }
180 197
181 if (!SvROK (*svp)) 198 if (!SvROK (*svp))
182 { 199 {
183 LOG (llevError, "deserialised perl object is not an RV"); 200 LOG (llevError, "deserialised perl object is not an RV\n");
184 return; 201 return;
185 } 202 }
186 203
187 HV *hv = (HV *)SvRV (*svp); 204 HV *hv = (HV *)SvRV (*svp);
188 205
189 if (SvTYPE (hv) != SVt_PVHV) 206 if (SvTYPE (hv) != SVt_PVHV)
190 { 207 {
191 LOG (llevError, "deserialised perl object is not a PVHV"); 208 LOG (llevError, "deserialised perl object is not a PVHV\n");
192 return; 209 return;
193 } 210 }
194 211
195 if (obj->self) 212 if (obj->self)
196 { 213 {
… …
220object_thawer::~object_thawer () 237object_thawer::~object_thawer ()
221{ 238{
222 if (text) SvREFCNT_dec (text); 239 if (text) SvREFCNT_dec (text);
223 if (av) SvREFCNT_dec (av); 240 if (av) SvREFCNT_dec (av);
224 241
242 resolve_delayed_derefs (false);
243
225 free ((void *)name); 244 free ((void *)name);
226} 245}
227 246
228//TODO: remove 247static void
229char * 248error_out ()
230fgets (char *s, int n, object_thawer &thawer)
231{ 249{
232 char *p = thawer.line; 250 if (object_thawer::errors_are_fatal)
233 char *q = s;
234
235 if (!p)
236 return 0;
237
238 while (--n)
239 {
240 if (!*p)
241 break;
242
243 *q++ = *p;
244
245 if (*p++ == '\n')
246 {
247 ++thawer.linenum;
248 break;
249 }
250 } 251 {
252 LOG (llevError, "(parse errors at this time are fatal, exiting)");
253 exit (1);
254 }
255}
251 256
252 *q = 0; 257void
253 thawer.line = p; 258object_thawer::parse_warn (const char *msg) const
254 259{
255 return s == q ? 0 : s; 260 LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
261 this->name, linenum,
262 kw_str ? kw_str : "<null>",
263 value ? value : "<null>",
264 msg);
256} 265}
257 266
258bool 267bool
259object_thawer::parse_error (const char *type, const char *name, bool skip) 268object_thawer::parse_error (const char *type, const char *name, bool skip) const
260{ 269{
261 if (!type) type = "file section"; 270 if (!type) type = "file section";
262 if (!name) name = "generic"; 271 if (!name) name = "generic";
263 272
264 switch (kw) 273 switch (kw)
265 { 274 {
266 case KW_EOF: 275 case KW_EOF:
267 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n", 276 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
268 this->name, linenum, type, name); 277 this->name, linenum, type, name);
278 error_out ();
269 return false; 279 return false;
270 280
271 case KW_ERROR: 281 case KW_ERROR:
272 LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n", 282 LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n",
273 this->name, linenum, 283 this->name, linenum,
274 type, name, 284 type, name,
275 kw_str ? kw_str : "<file load>"); 285 kw_str ? kw_str : "<file load>");
286 error_out ();
276 return false; 287 return false;
277 288
278 default: 289 default:
279 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n", 290 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
280 this->name, linenum, 291 this->name, linenum,
281 kw_str ? kw_str : "<null>", 292 kw_str ? kw_str : "<null>",
282 value ? value : "<null>", 293 value ? value : "<null>",
283 type, name, 294 type, name,
284 skip ? "skipping line" : "aborting load"); 295 skip ? "skipping line" : "aborting load");
296 error_out ();
285 return skip; 297 return skip;
286 } 298 }
287} 299}
288 300
289void 301void
… …
296 } 308 }
297 309
298 for (;;) 310 for (;;)
299 { 311 {
300 char *p = line; 312 char *p = line;
313
314 if (ecb_expect_false (*p <= ' '))
315 {
316 // skip whitespace (only some files need this)
317 while (*p == ' ' || *p == '\t')
318 p++;
319
320 line = p;
321 }
301 322
302 if (!*p) 323 if (!*p)
303 { 324 {
304 kw = KW_EOF; 325 kw = KW_EOF;
305 break; 326 break;
… …
309 while (*p > ' ') 330 while (*p > ' ')
310 p++; 331 p++;
311 332
312 int klen = p - line; 333 int klen = p - line;
313 334
335 value_nn = "";
336 value = 0;
337
314 if (*p++ != '\n') 338 if (*p++ != '\n')
315 { 339 {
316 // parse value 340 // parse value
317 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20 341 while (*(unsigned char *)p <= ' ' && *p != '\n')
318 ++p; 342 ++p;
319 343
320 value = p; 344 value_nn = value = p;
321 345
322 while (*p != '\n') 346 while (*p != '\n')
323 p++; 347 p++;
324 348
325 *p++ = 0; 349 *p++ = 0;
326 } 350 }
327 else
328 value = 0;
329 351
330 ++linenum; 352 ++linenum;
331 line [klen] = 0; 353 line [klen] = 0;
332 keyword_idx *kw_idx = kw_lex::match (line, klen); 354 keyword_idx *kw_idx = kw_lex::match (line, klen);
333 355
334 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, value);//D
335
336 kw_str = line; 356 kw_str = line;
337 line = p; 357 line = p;
338 358
339 if (kw_idx) 359 if (kw_idx)
340 { 360 {
… …
349 break; 369 break;
350 } 370 }
351 } 371 }
352} 372}
353 373
374bool
375object_thawer::next_line ()
376{
377 if (!line)
378 {
379 kw = KW_ERROR;
380 return 0;
381 }
382
383 for (;;)
384 {
385 char *p = line;
386
387 if (ecb_expect_false (*p <= ' '))
388 {
389 // skip whitespace (only some files need this)
390 while (*p == ' ' || *p == '\t')
391 p++;
392
393 line = p;
394 }
395
396 if (!*p)
397 {
398 kw = KW_EOF;
399 return 0;
400 }
401
402 kw = KW_value;
403 kw_str = p;
404 value_nn = p;
405 value = p;
406
407 // parse till newline
408 while (*p > '\n')
409 p++;
410
411 if (*p == '\n')
412 *p++ = 0;
413
414 ++linenum;
415
416 line = p;
417
418 if (*kw_str && *kw_str != '#')
419 break;
420
421 // empty/comment line -> skip it
422 }
423
424 return 1;
425}
426
354void 427void
355object_thawer::skip () 428object_thawer::skip ()
356{ 429{
357 shstr ml; 430 shstr ml;
358 431
359 switch (kw) 432 switch (kw)
360 { 433 {
361 case KW_msg: get_ml (KW_endmsg , ml); break; 434 case KW_msg: get_ml (KW_endmsg , ml); break;
362 case KW_lore: get_ml (KW_endlore , ml); break; 435 case KW_lore: get_ml (KW_endlore , ml); break;
363 case KW_maplore: get_ml (KW_endmaplore, ml); break; 436 case KW_maplore: get_ml (KW_endmaplore, ml); break;
437 default: break;
364 } 438 }
365 439
366 next (); 440 next ();
367} 441}
368 442
369void 443void
370object_thawer::get (shstr &sh) const 444object_thawer::skip_block ()
371{ 445{
372 if (value) 446 // must not stop at KW_ERROR, as those signify custom keys
373 sh = value; 447 while (kw != KW_EOF)
374 else
375 { 448 {
376 sh = "<value missing>"; 449 keyword w = kw;
377 LOG (llevError, "keyword \"%s\" requires value, substituting with <value missing>\n", kw_str);//TODO: add filename 450 skip ();
451
452 if (0 && (w == KW_map || w == KW_arch || w == KW_object || w == KW_region))
453 skip_block ();
454 else if (w == KW_end)
455 break;
378 } 456 }
379} 457}
380 458
381void 459void
382object_thawer::get_ml (keyword kend, shstr &sh) 460object_thawer::get_ml (keyword kend, shstr &sh)
… …
430} 508}
431 509
432sint32 510sint32
433object_thawer::get_sint32 () const 511object_thawer::get_sint32 () const
434{ 512{
435 char *p = value; 513 const char *p = value_nn;
436
437 if (!p)
438 return 0;
439 514
440 sint32 val = 0; 515 sint32 val = 0;
441 bool negate; 516 bool negate;
442 517
443 if (*p == '-') 518 if (*p == '-')
… …
456 while (*p); 531 while (*p);
457 532
458 return negate ? -val : val; 533 return negate ? -val : val;
459} 534}
460 535
461sint64 536void
462object_thawer::get_sint64 () const 537object_thawer::delayed_deref (attachable *op, object_ptr &ptr, const char *ref)
463{ 538{
464 return value ? atoll (value) : 0; 539 op->refcnt_inc ();
540 delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
541 delrefs.push_back (r);
542 ptr = 0;
465} 543}
466 544
467double 545void
468object_thawer::get_double () const 546object_thawer::resolve_delayed_derefs (bool deref)
469{ 547{
470 return value ? atof (value) : 0; 548 while (!delrefs.empty ())
471} 549 {
550 delayed_ref r = delrefs.back ();
551 delrefs.pop_back ();
472 552
553 if (deref)
554 *r.ptr = object::deref (r.ref);
555
556 free ((void *)r.ref);
557 r.op->refcnt_dec ();
558 }
559}

Diff Legend

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