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.14 by pippijn, Fri Mar 2 10:15:40 2007 UTC vs.
Revision 1.29 by root, Mon Sep 10 17:24:36 2007 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 Crossfire TRT, the Roguelike Realtime MORPG.
7 * 3 *
8 * Copyright (C) 2006 by Marc Lehmann <crossfire@schmorp.de> 4 * Copyright (©) 2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
9 * 5 *
10 * This program is free software; you can redistribute it and/or modify 6 * Crossfire TRT is free software: you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 8 * the Free Software Foundation, either version 3 of the License, or
13 * (at your option) any later version. 9 * (at your 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 GNU General Public License
21 * along with this program; if not, write to the Free Software 17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
22 * Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18 *
19 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 20 */
24 21
25#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff 22#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff
26#include "logger.h" 23#include "logger.h"
27#include "cfperl.h" 24#include "cfperl.h"
28#include "kw_hash.h" 25#include "kw_hash.h"
29 26
30object_freezer::object_freezer () 27object_freezer::object_freezer ()
31: dynbuf (128 * 1024, 64 * 1024) 28: dynbuf_text (128 * 1024, 64 * 1024)
32{ 29{
33 av = newAV (); 30 av = newAV ();
34} 31}
35 32
36object_freezer::~object_freezer () 33object_freezer::~object_freezer ()
… …
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
111object_thawer::object_thawer (const char *path) 110object_thawer::object_thawer (const char *path)
112: name (strdup (path)) 111: name (strdup (path))
… …
146 SvCUR_set (text, len); 145 SvCUR_set (text, len);
147 memcpy (SvPVX (text), sv_, len); 146 memcpy (SvPVX (text), sv_, len);
148 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure 147 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure
149 148
150 line = SvPVX (text); 149 line = SvPVX (text);
150 next ();
151 } 151 }
152 } 152 }
153 153
154 CALL_END; 154 CALL_END;
155 } 155 }
156} 156}
157 157
158object_thawer::object_thawer (const char *data, AV *perlav) 158object_thawer::object_thawer (const char *data, AV *perlav)
159: name (strdup ("(memory stream")) 159: name (strdup ("(memory stream)"))
160{ 160{
161 av = perlav; 161 av = perlav;
162 text = newSVpv (data, 0); 162 text = newSVpv (data, 0);
163 sv_catpv (text, thawer_eof); 163 sv_catpv (text, thawer_eof);
164 line = SvPVbyte_nolen (text); 164 line = SvPVbyte_nolen (text);
165 next ();
165} 166}
166 167
167void 168void
168object_thawer::get (attachable *obj, int oid) 169object_thawer::get (attachable *obj, int oid)
169{ 170{
… …
172 173
173 SV **svp = av_fetch ((AV *)av, oid, 0); 174 SV **svp = av_fetch ((AV *)av, oid, 0);
174 175
175 if (!svp || !SvROK (*svp)) 176 if (!svp || !SvROK (*svp))
176 { 177 {
177 printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid); 178 LOG (llevError, "trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
178 return; 179 return;
179 } 180 }
180 181
181 if (!SvROK (*svp)) 182 if (!SvROK (*svp))
182 { 183 {
183 LOG (llevError, "deserialised perl object is not an RV"); 184 LOG (llevError, "deserialised perl object is not an RV\n");
184 return; 185 return;
185 } 186 }
186 187
187 HV *hv = (HV *)SvRV (*svp); 188 HV *hv = (HV *)SvRV (*svp);
188 189
189 if (SvTYPE (hv) != SVt_PVHV) 190 if (SvTYPE (hv) != SVt_PVHV)
190 { 191 {
191 LOG (llevError, "deserialised perl object is not a PVHV"); 192 LOG (llevError, "deserialised perl object is not a PVHV\n");
192 return; 193 return;
193 } 194 }
194 195
195 if (obj->self) 196 if (obj->self)
196 { 197 {
… …
220object_thawer::~object_thawer () 221object_thawer::~object_thawer ()
221{ 222{
222 if (text) SvREFCNT_dec (text); 223 if (text) SvREFCNT_dec (text);
223 if (av) SvREFCNT_dec (av); 224 if (av) SvREFCNT_dec (av);
224 225
226 resolve_delayed_derefs (false);
227
225 free ((void *)name); 228 free ((void *)name);
226} 229}
227 230
228//TODO: remove 231//TODO: remove
229char * 232char *
… …
251 254
252 *q = 0; 255 *q = 0;
253 thawer.line = p; 256 thawer.line = p;
254 257
255 return s == q ? 0 : s; 258 return s == q ? 0 : s;
259}
260
261void
262object_thawer::parse_warn (const char *msg)
263{
264 LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
265 this->name, linenum,
266 kw_str ? kw_str : "<null>",
267 value ? value : "<null>",
268 msg);
256} 269}
257 270
258bool 271bool
259object_thawer::parse_error (const char *type, const char *name, bool skip) 272object_thawer::parse_error (const char *type, const char *name, bool skip)
260{ 273{
… …
277 290
278 default: 291 default:
279 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n", 292 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
280 this->name, linenum, 293 this->name, linenum,
281 kw_str ? kw_str : "<null>", 294 kw_str ? kw_str : "<null>",
282 value ? value : "<null>", 295 value ? value : "<null>",
283 type, name, 296 type, name,
284 skip ? "skipping line" : "aborting load"); 297 skip ? "skipping line" : "aborting load");
285 return skip; 298 return skip;
286 } 299 }
287} 300}
… …
297 310
298 for (;;) 311 for (;;)
299 { 312 {
300 char *p = line; 313 char *p = line;
301 314
315 if (*p <= ' ')
316 {
317 // skip whitespace (only some files need this)
318 while (*p == ' ' || *p == '\t')
319 p++;
320
321 line = p;
322 }
323
302 if (!*p) 324 if (!*p)
303 { 325 {
304 kw = KW_EOF; 326 kw = KW_EOF;
305 break; 327 break;
306 } 328 }
… …
309 while (*p > ' ') 331 while (*p > ' ')
310 p++; 332 p++;
311 333
312 int klen = p - line; 334 int klen = p - line;
313 335
336 value_nn = "";
337 value = 0;
338
314 if (*p++ != '\n') 339 if (*p++ != '\n')
315 { 340 {
316 // parse value 341 // parse value
317 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20 342 while (*(unsigned char *)p <= ' ' && *p != '\n')
318 ++p; 343 ++p;
319 344
320 value = p; 345 value_nn = value = p;
321 346
322 while (*p != '\n') 347 while (*p != '\n')
323 p++; 348 p++;
324 349
325 *p++ = 0; 350 *p++ = 0;
326 } 351 }
327 else
328 value = 0;
329 352
330 ++linenum; 353 ++linenum;
331 line [klen] = 0; 354 line [klen] = 0;
332 keyword_idx *kw_idx = kw_lex::match (line, klen); 355 keyword_idx *kw_idx = kw_lex::match (line, klen);
333
334 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, value);//D
335 356
336 kw_str = line; 357 kw_str = line;
337 line = p; 358 line = p;
338 359
339 if (kw_idx) 360 if (kw_idx)
… …
366 387
367 next (); 388 next ();
368} 389}
369 390
370void 391void
371object_thawer::get (shstr &sh) const 392object_thawer::skip_block ()
372{ 393{
373 if (value) 394 // must not stop at KW_ERROR, as those signify custom keys
374 sh = value; 395 while (kw != KW_EOF)
375 else
376 { 396 {
377 sh = "<value missing>"; 397 keyword w = kw;
378 LOG (llevError, "keyword \"%s\" requires value, substituting with <value missing>\n", kw_str);//TODO: add filename 398 skip ();
399
400 if (0 && (w == KW_map || w == KW_arch || w == KW_object || w == KW_region))
401 skip_block ();
402 else if (w == KW_end)
403 break;
379 } 404 }
380} 405}
381 406
382void 407void
383object_thawer::get_ml (keyword kend, shstr &sh) 408object_thawer::get_ml (keyword kend, shstr &sh)
… …
431} 456}
432 457
433sint32 458sint32
434object_thawer::get_sint32 () const 459object_thawer::get_sint32 () const
435{ 460{
436 char *p = value; 461 char *p = value_nn;
437
438 if (!p)
439 return 0;
440 462
441 sint32 val = 0; 463 sint32 val = 0;
442 bool negate; 464 bool negate;
443 465
444 if (*p == '-') 466 if (*p == '-')
… …
457 while (*p); 479 while (*p);
458 480
459 return negate ? -val : val; 481 return negate ? -val : val;
460} 482}
461 483
462sint64 484void
463object_thawer::get_sint64 () const 485object_thawer::delayed_deref (attachable *op, object_ptr &ptr, const char *ref)
464{ 486{
465 return value ? atoll (value) : 0; 487 op->refcnt_inc ();
488 delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
489 delrefs.push_back (r);
490 ptr = 0;
466} 491}
467 492
468double 493void
469object_thawer::get_double () const 494object_thawer::resolve_delayed_derefs (bool deref)
470{ 495{
471 return value ? atof (value) : 0; 496 while (!delrefs.empty ())
472} 497 {
498 delayed_ref r = delrefs.back ();
499 delrefs.pop_back ();
473 500
501 if (deref)
502 *r.ptr = object::deref (r.ref);
503
504 free ((void *)r.ref);
505 r.op->refcnt_dec ();
506 }
507}

Diff Legend

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