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.36 by root, Fri Mar 26 01:04:45 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)
… …
82 CALL_END; 78 CALL_END;
83 79
84 return res; 80 return res;
85} 81}
86 82
83#if 0
87void 84void
88fprintf (object_freezer &freezer, const char *format, ...) 85fprintf (object_freezer &freezer, const char *format, ...)
89{ 86{
90 va_list ap; 87 va_list ap;
91 88
… …
103void 100void
104fputs (const char *s, object_freezer &freezer) 101fputs (const char *s, object_freezer &freezer)
105{ 102{
106 freezer.add (s); 103 freezer.add (s);
107} 104}
105#endif
108 106
109static const char thawer_eof[] = "\n\n\n\0\0\0"; 107static const char thawer_eof[] = "\n\n\n\0\0\0";
110 108
111object_thawer::object_thawer (const char *path) 109object_thawer::object_thawer (const char *path)
112: name (strdup (path)) 110: name (strdup (path))
113{ 111{
114 static const char eof[] = "\n\n\n\0\0\0";
115
116 av = 0; 112 av = 0;
117 text = 0; 113 text = 0;
118 line = 0; 114 line = 0;
119 linenum = 0; 115 linenum = 0;
120 116
… …
140 // first value - text part, pad with 3 zeroes 136 // first value - text part, pad with 3 zeroes
141 { 137 {
142 SV *sv = POPs; 138 SV *sv = POPs;
143 STRLEN len; 139 STRLEN len;
144 char *sv_ = SvPVbyte (sv, len); 140 char *sv_ = SvPVbyte (sv, len);
145 text = newSV (len + sizeof (eof)); 141 text = newSV (len + sizeof (thawer_eof));
146 SvCUR_set (text, len); 142 SvCUR_set (text, len + sizeof (thawer_eof));
147 memcpy (SvPVX (text), sv_, len); 143 memcpy (SvPVX (text), sv_, len);
148 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure 144 memcpy (SvPVX (text) + len, thawer_eof, sizeof (thawer_eof));
149 145
150 line = SvPVX (text); 146 line = SvPVX (text);
147 next ();
151 } 148 }
152 } 149 }
153 150
154 CALL_END; 151 CALL_END;
155 } 152 }
156} 153}
157 154
158object_thawer::object_thawer (const char *data, AV *perlav) 155object_thawer::object_thawer (const char *data, AV *perlav)
159: name (strdup ("(memory stream")) 156: name (strdup ("(memory stream)"))
160{ 157{
161 av = perlav; 158 av = perlav;
162 text = newSVpv (data, 0); 159 text = newSVpv (data, 0);
163 sv_catpv (text, thawer_eof); 160 sv_catpv (text, thawer_eof);
164 line = SvPVbyte_nolen (text); 161 line = SvPVbyte_nolen (text);
162 next ();
165} 163}
166 164
167void 165void
168object_thawer::get (attachable *obj, int oid) 166object_thawer::get (attachable *obj, int oid)
169{ 167{
… …
172 170
173 SV **svp = av_fetch ((AV *)av, oid, 0); 171 SV **svp = av_fetch ((AV *)av, oid, 0);
174 172
175 if (!svp || !SvROK (*svp)) 173 if (!svp || !SvROK (*svp))
176 { 174 {
177 printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid); 175 LOG (llevError, "trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
178 return; 176 return;
179 } 177 }
180 178
181 if (!SvROK (*svp)) 179 if (!SvROK (*svp))
182 { 180 {
183 LOG (llevError, "deserialised perl object is not an RV"); 181 LOG (llevError, "deserialised perl object is not an RV\n");
184 return; 182 return;
185 } 183 }
186 184
187 HV *hv = (HV *)SvRV (*svp); 185 HV *hv = (HV *)SvRV (*svp);
188 186
189 if (SvTYPE (hv) != SVt_PVHV) 187 if (SvTYPE (hv) != SVt_PVHV)
190 { 188 {
191 LOG (llevError, "deserialised perl object is not a PVHV"); 189 LOG (llevError, "deserialised perl object is not a PVHV\n");
192 return; 190 return;
193 } 191 }
194 192
195 if (obj->self) 193 if (obj->self)
196 { 194 {
… …
220object_thawer::~object_thawer () 218object_thawer::~object_thawer ()
221{ 219{
222 if (text) SvREFCNT_dec (text); 220 if (text) SvREFCNT_dec (text);
223 if (av) SvREFCNT_dec (av); 221 if (av) SvREFCNT_dec (av);
224 222
223 resolve_delayed_derefs (false);
224
225 free ((void *)name); 225 free ((void *)name);
226} 226}
227 227
228//TODO: remove 228//TODO: remove
229char * 229char *
… …
251 251
252 *q = 0; 252 *q = 0;
253 thawer.line = p; 253 thawer.line = p;
254 254
255 return s == q ? 0 : s; 255 return s == q ? 0 : s;
256}
257
258void
259object_thawer::parse_warn (const char *msg)
260{
261 LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
262 this->name, linenum,
263 kw_str ? kw_str : "<null>",
264 value ? value : "<null>",
265 msg);
256} 266}
257 267
258bool 268bool
259object_thawer::parse_error (const char *type, const char *name, bool skip) 269object_thawer::parse_error (const char *type, const char *name, bool skip)
260{ 270{
… …
277 287
278 default: 288 default:
279 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",
280 this->name, linenum, 290 this->name, linenum,
281 kw_str ? kw_str : "<null>", 291 kw_str ? kw_str : "<null>",
282 value ? value : "<null>", 292 value ? value : "<null>",
283 type, name, 293 type, name,
284 skip ? "skipping line" : "aborting load"); 294 skip ? "skipping line" : "aborting load");
285 return skip; 295 return skip;
286 } 296 }
287} 297}
… …
297 307
298 for (;;) 308 for (;;)
299 { 309 {
300 char *p = line; 310 char *p = line;
301 311
312 if (*p <= ' ')
313 {
314 // skip whitespace (only some files need this)
315 while (*p == ' ' || *p == '\t')
316 p++;
317
318 line = p;
319 }
320
302 if (!*p) 321 if (!*p)
303 { 322 {
304 kw = KW_EOF; 323 kw = KW_EOF;
305 break; 324 break;
306 } 325 }
… …
309 while (*p > ' ') 328 while (*p > ' ')
310 p++; 329 p++;
311 330
312 int klen = p - line; 331 int klen = p - line;
313 332
333 value_nn = "";
334 value = 0;
335
314 if (*p++ != '\n') 336 if (*p++ != '\n')
315 { 337 {
316 // parse value 338 // parse value
317 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20 339 while (*(unsigned char *)p <= ' ' && *p != '\n')
318 ++p; 340 ++p;
319 341
320 value = p; 342 value_nn = value = p;
321 343
322 while (*p != '\n') 344 while (*p != '\n')
323 p++; 345 p++;
324 346
325 *p++ = 0; 347 *p++ = 0;
326 } 348 }
327 else
328 value = 0;
329 349
330 ++linenum; 350 ++linenum;
331 line [klen] = 0; 351 line [klen] = 0;
332 keyword_idx *kw_idx = kw_lex::match (line, klen); 352 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 353
336 kw_str = line; 354 kw_str = line;
337 line = p; 355 line = p;
338 356
339 if (kw_idx) 357 if (kw_idx)
… …
366 384
367 next (); 385 next ();
368} 386}
369 387
370void 388void
371object_thawer::get (shstr &sh) const 389object_thawer::skip_block ()
372{ 390{
373 if (value) 391 // must not stop at KW_ERROR, as those signify custom keys
374 sh = value; 392 while (kw != KW_EOF)
375 else
376 { 393 {
377 sh = "<value missing>"; 394 keyword w = kw;
378 LOG (llevError, "keyword \"%s\" requires value, substituting with <value missing>\n", kw_str);//TODO: add filename 395 skip ();
396
397 if (0 && (w == KW_map || w == KW_arch || w == KW_object || w == KW_region))
398 skip_block ();
399 else if (w == KW_end)
400 break;
379 } 401 }
380} 402}
381 403
382void 404void
383object_thawer::get_ml (keyword kend, shstr &sh) 405object_thawer::get_ml (keyword kend, shstr &sh)
… …
431} 453}
432 454
433sint32 455sint32
434object_thawer::get_sint32 () const 456object_thawer::get_sint32 () const
435{ 457{
436 char *p = value; 458 const char *p = value_nn;
437
438 if (!p)
439 return 0;
440 459
441 sint32 val = 0; 460 sint32 val = 0;
442 bool negate; 461 bool negate;
443 462
444 if (*p == '-') 463 if (*p == '-')
… …
457 while (*p); 476 while (*p);
458 477
459 return negate ? -val : val; 478 return negate ? -val : val;
460} 479}
461 480
462sint64 481void
463object_thawer::get_sint64 () const 482object_thawer::delayed_deref (attachable *op, object_ptr &ptr, const char *ref)
464{ 483{
465 return value ? atoll (value) : 0; 484 op->refcnt_inc ();
485 delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
486 delrefs.push_back (r);
487 ptr = 0;
466} 488}
467 489
468double 490void
469object_thawer::get_double () const 491object_thawer::resolve_delayed_derefs (bool deref)
470{ 492{
471 return value ? atof (value) : 0; 493 while (!delrefs.empty ())
472} 494 {
495 delayed_ref r = delrefs.back ();
496 delrefs.pop_back ();
473 497
498 if (deref)
499 *r.ptr = object::deref (r.ref);
500
501 free ((void *)r.ref);
502 r.op->refcnt_dec ();
503 }
504}

Diff Legend

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