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.2 by elmex, Sat Dec 30 14:34:10 2006 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
23#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff
25#include "logger.h" 24#include "logger.h"
26#include "cfperl.h" 25#include "cfperl.h"
27#include "kw_hash.h" 26#include "kw_hash.h"
28 27
29object_freezer::object_freezer () 28object_freezer::object_freezer ()
30: dynbuf (128 * 1024, 64 * 1024) 29: dynbuf_text (128 * 1024, 64 * 1024)
31{ 30{
32 av = newAV (); 31 av = newAV ();
33} 32}
34 33
35object_freezer::~object_freezer () 34object_freezer::~object_freezer ()
36{ 35{
37 SvREFCNT_dec (av); 36 SvREFCNT_dec (av);
38} 37}
39 38
39void
40void object_freezer::put (attachable *ext) 40object_freezer::put_ (attachable *ext)
41{ 41{
42 ext->optimise (); 42 ext->optimise ();
43 43
44 if (ext->self) 44 if (ext->self)
45 { 45 {
46 int idx = AvFILLp ((AV *)av) + 1; 46 int idx = AvFILLp ((AV *)av) + 1;
47 av_store (av, idx, newRV_inc ((SV *)ext->self)); 47 av_store (av, idx, newRV_inc ((SV *)ext->self));
48 48
49 add ((void *)"oid ", 4); 49 put (KW(oid), sint32(idx));
50 add ((sint32)idx);
51 add ('\n');
52 } 50 }
53} 51}
54 52
53bool
55bool object_freezer::save (const char *filename) 54object_freezer::save (const char *path)
56{ 55{
57 CALL_BEGIN (3); 56 CALL_BEGIN (3);
58 CALL_ARG_SV (newSVpv (filename, 0)); 57 CALL_ARG_SV (newSVpv (path, 0));
59 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ()))); 58 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));
60 CALL_ARG_SV (newRV_inc ((SV *)av)); 59 CALL_ARG_SV (newRV_inc ((SV *)av));
61 CALL_CALL ("cf::object_freezer_save", G_VOID | G_DISCARD); 60 CALL_CALL ("cf::object_freezer_save", G_VOID | G_DISCARD);
62 CALL_END; 61 CALL_END;
63}
64 62
63 return 1;
64}
65
66char *
65char *object_freezer::as_string () 67object_freezer::as_string ()
66{ 68{
67 CALL_BEGIN (2); 69 CALL_BEGIN (2);
68 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ()))); 70 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));
69 CALL_ARG_SV (newRV_inc ((SV *)av)); 71 CALL_ARG_SV (newRV_inc ((SV *)av));
70 CALL_CALL ("cf::object_freezer_as_string", G_SCALAR); 72 CALL_CALL ("cf::object_freezer_as_string", G_SCALAR);
71 73
72 STRLEN len;
73
74 char *res = count > 0 74 char *res = count > 0
75 ? strdup (SvPVx (POPs, len)) 75 ? strdup (SvPVX (POPs))
76 : strdup ("[fatal error]"); 76 : strdup ("[fatal error]");
77 77
78 CALL_END; 78 CALL_END;
79 79
80 return res; 80 return res;
81} 81}
82 82
83#if 0
84void
83int fprintf (object_freezer &freezer, const char *format, ...) 85fprintf (object_freezer &freezer, const char *format, ...)
84{ 86{
85 va_list ap; 87 va_list ap;
86 88
87 va_start (ap, format); 89 va_start (ap, format);
88 90
… …
92 freezer.alloc (len); 94 freezer.alloc (len);
93 95
94 va_end (ap); 96 va_end (ap);
95} 97}
96 98
99// XXX: function not returning an int
100void
97int fputs (const char *s, object_freezer &freezer) 101fputs (const char *s, object_freezer &freezer)
98{ 102{
99 freezer.add (s); 103 freezer.add (s);
100} 104}
105#endif
101 106
102static const char thawer_eof[] = "\n\n\n\0\0\0"; 107static const char thawer_eof[] = "\n\n\n\0\0\0";
103 108
104object_thawer::object_thawer (const char *filename) 109object_thawer::object_thawer (const char *path)
110: name (strdup (path))
105{ 111{
106 static const char eof[] = "\n\n\n\0\0\0";
107
108 av = 0; 112 av = 0;
109 text = 0; 113 text = 0;
110 line = 0; 114 line = 0;
115 linenum = 0;
111 116
112 if (filename) 117 kw = KW_ERROR;
118 kw_str = 0;
119 value = 0;
120
121 if (path)
113 { 122 {
114 CALL_BEGIN (1); 123 CALL_BEGIN (1);
115 CALL_ARG_SV (newSVpv (filename, 0)); 124 CALL_ARG_SV (newSVpv (path, 0));
116 CALL_CALL ("cf::object_thawer_load", G_ARRAY); 125 CALL_CALL ("cf::object_thawer_load", G_ARRAY);
117 126
118 if (count == 2) 127 if (count == 2)
119 { 128 {
120 // second value - perl objects 129 // second value - perl objects
… …
127 // first value - text part, pad with 3 zeroes 136 // first value - text part, pad with 3 zeroes
128 { 137 {
129 SV *sv = POPs; 138 SV *sv = POPs;
130 STRLEN len; 139 STRLEN len;
131 char *sv_ = SvPVbyte (sv, len); 140 char *sv_ = SvPVbyte (sv, len);
132 text = newSV (len + sizeof (eof)); 141 text = newSV (len + sizeof (thawer_eof));
133 SvCUR_set (text, len); 142 SvCUR_set (text, len + sizeof (thawer_eof));
134 memcpy (SvPVX (text), sv_, len); 143 memcpy (SvPVX (text), sv_, len);
135 memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure 144 memcpy (SvPVX (text) + len, thawer_eof, sizeof (thawer_eof));
136 145
137 line = SvPVX (text); 146 line = SvPVX (text);
147 next ();
138 } 148 }
139 } 149 }
140 150
141 CALL_END; 151 CALL_END;
142 } 152 }
143} 153}
144 154
145object_thawer::object_thawer (const char *data, AV *perlav) 155object_thawer::object_thawer (const char *data, AV *perlav)
156: name (strdup ("(memory stream)"))
146{ 157{
147 av = perlav; 158 av = perlav;
148 text = newSVpv (data, 0); 159 text = newSVpv (data, 0);
149 sv_catpv (text, thawer_eof); 160 sv_catpv (text, thawer_eof);
150 line = SvPVbyte_nolen (text); 161 line = SvPVbyte_nolen (text);
162 next ();
151} 163}
152 164
165void
153void object_thawer::get (attachable *obj, int oid) 166object_thawer::get (attachable *obj, int oid)
154{ 167{
155 if (!av || oid < 0) // this is actually an error of sorts 168 if (!av || oid < 0) // this is actually an error of sorts
156 return; 169 return;
157 170
158 SV **svp = av_fetch ((AV *)av, oid, 0); 171 SV **svp = av_fetch ((AV *)av, oid, 0);
159 172
160 if (!svp || !SvROK (*svp)) 173 if (!svp || !SvROK (*svp))
161 { 174 {
162 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);
163 return; 176 return;
164 } 177 }
165 178
166 if (!SvROK (*svp)) 179 if (!SvROK (*svp))
167 { 180 {
168 LOG (llevError, "deserialised perl object is not an RV"); 181 LOG (llevError, "deserialised perl object is not an RV\n");
169 return; 182 return;
170 } 183 }
171 184
172 HV *hv = (HV *)SvRV (*svp); 185 HV *hv = (HV *)SvRV (*svp);
173 186
174 if (SvTYPE (hv) != SVt_PVHV) 187 if (SvTYPE (hv) != SVt_PVHV)
175 { 188 {
176 LOG (llevError, "deserialised perl object is not a PVHV"); 189 LOG (llevError, "deserialised perl object is not a PVHV\n");
177 return; 190 return;
178 } 191 }
179 192
180 if (obj->self) 193 if (obj->self)
181 { 194 {
182 // the hard way(?) 195 // the hard way(?)
183 196
184 // the dirty blues: "just" swap the XPVHV's 197 CALL_BEGIN (2);
185 swap (SvANY (obj->self), SvANY (hv)); 198 CALL_ARG_SV (newRV_inc ((SV *)obj->self));
186 199 CALL_ARG_SV (newRV_inc ((SV *)hv));
187 // do not swap magic, though 200 PUTBACK;
188 swap (SvMAGIC (obj->self), SvMAGIC (hv)); 201 call_method ("thawer_merge", G_DISCARD | G_EVAL);
202 SPAGAIN;
203 CALL_END;
189 } 204 }
190 else 205 else
191 { 206 {
192 // the easy way(?) 207 // the easy way(?)
193 208
194 obj->self = hv; 209 obj->self = hv;
195 SvRV_set (*svp, &PL_sv_undef); 210 SvRV_set (*svp, &PL_sv_undef);
196 211
197 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 212 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
198
199 // borrow a refcount for the perl object
200 obj->flags |= attachable::F_BORROWED;
201 obj->refcnt_dec ();
202 } 213 }
203 214
204 obj->reattach (); 215 obj->reattach ();
205} 216}
206 217
207object_thawer::~object_thawer () 218object_thawer::~object_thawer ()
208{ 219{
209 if (text) SvREFCNT_dec (text); 220 if (text) SvREFCNT_dec (text);
210 if (av) SvREFCNT_dec (av); 221 if (av) SvREFCNT_dec (av);
211}
212 222
223 resolve_delayed_derefs (false);
224
225 free ((void *)name);
226}
227
228//TODO: remove
229char *
213char *fgets (char *s, int n, object_thawer &thawer) 230fgets (char *s, int n, object_thawer &thawer)
214{ 231{
215 char *p = thawer.line; 232 char *p = thawer.line;
216 char *q = s; 233 char *q = s;
217 234
218 if (!p) 235 if (!p)
… …
224 break; 241 break;
225 242
226 *q++ = *p; 243 *q++ = *p;
227 244
228 if (*p++ == '\n') 245 if (*p++ == '\n')
246 {
247 ++thawer.linenum;
229 break; 248 break;
249 }
230 } 250 }
231 251
232 *q = 0; 252 *q = 0;
233 thawer.line = p; 253 thawer.line = p;
234 254
235 return s == q ? 0 : s; 255 return s == q ? 0 : s;
236} 256}
237 257
238keyword object_thawer::get_kv () 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);
266}
267
268bool
269object_thawer::parse_error (const char *type, const char *name, bool skip)
270{
271 if (!type) type = "file section";
272 if (!name) name = "generic";
273
274 switch (kw)
275 {
276 case KW_EOF:
277 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
278 this->name, linenum, type, name);
279 return false;
280
281 case KW_ERROR:
282 LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n",
283 this->name, linenum,
284 type, name,
285 kw_str ? kw_str : "<file load>");
286 return false;
287
288 default:
289 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
290 this->name, linenum,
291 kw_str ? kw_str : "<null>",
292 value ? value : "<null>",
293 type, name,
294 skip ? "skipping line" : "aborting load");
295 return skip;
296 }
297}
298
299void
300object_thawer::next ()
239{ 301{
240 if (!line) 302 if (!line)
241 return KW_EOF; 303 {
304 kw = KW_ERROR;
305 return;
306 }
242 307
243 for (;;) 308 for (;;)
244 { 309 {
245 char *p = line; 310 char *p = line;
246 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
247 if (!*p) 321 if (!*p)
248 return KW_EOF; 322 {
323 kw = KW_EOF;
324 break;
325 }
249 326
250 // parse keyword 327 // parse keyword
251 while (*p > ' ') 328 while (*p > ' ')
252 p++; 329 p++;
253 330
254 int klen = p - line; 331 int klen = p - line;
255 332
333 value_nn = "";
334 value = 0;
335
256 if (*p++ != '\n') 336 if (*p++ != '\n')
257 { 337 {
258 // parse value 338 // parse value
259 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20 339 while (*(unsigned char *)p <= ' ' && *p != '\n')
260 ++p; 340 ++p;
261 341
262 last_value = p; 342 value_nn = value = p;
263 343
264 while (*p != '\n') 344 while (*p != '\n')
265 p++; 345 p++;
266 346
267 *p++ = 0; 347 *p++ = 0;
268 } 348 }
269 else
270 last_value = 0;
271 349
350 ++linenum;
272 line [klen] = 0; 351 line [klen] = 0;
273 keyword_idx *kw = kw_lex::match (line, klen); 352 keyword_idx *kw_idx = kw_lex::match (line, klen);
274 353
275 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D 354 kw_str = line;
276
277 last_keyword = line;
278 line = p; 355 line = p;
279 356
280 if (kw) 357 if (kw_idx)
281 return kw->index; 358 {
359 kw = kw_idx->index;
360 break;
361 }
282 else if (!*last_keyword || *last_keyword == '#') 362 else if (!*kw_str || *kw_str == '#')
283 ; // empty/comment line 363 ; // empty/comment line
284 else 364 else
365 {
285 return KW_ERROR; 366 kw = KW_ERROR;
367 break;
368 }
286 } 369 }
287} 370}
288 371
289void object_thawer::skip_kv (keyword kw) 372void
373object_thawer::skip ()
290{ 374{
291 shstr ml; 375 shstr ml;
292 376
293 switch (kw) 377 switch (kw)
294 { 378 {
295 case KW_msg: get_ml (KW_endmsg , ml); break; 379 case KW_msg: get_ml (KW_endmsg , ml); break;
296 case KW_lore: get_ml (KW_endlore , ml); break; 380 case KW_lore: get_ml (KW_endlore , ml); break;
297 case KW_maplore: get_ml (KW_endmaplore, ml); break; 381 case KW_maplore: get_ml (KW_endmaplore, ml); break;
382 default: break;
298 } 383 }
384
385 next ();
299} 386}
300 387
301void object_thawer::get (shstr &sh) const 388void
389object_thawer::skip_block ()
302{ 390{
303 if (last_value) 391 // must not stop at KW_ERROR, as those signify custom keys
304 sh = last_value; 392 while (kw != KW_EOF)
305 else
306 {
307 sh = "<value missing>";
308 LOG (llevError, "keyword requires value: <%.320s>\n", line);//TODO: add filename
309 } 393 {
310} 394 keyword w = kw;
395 skip ();
311 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;
401 }
402}
403
404void
312void object_thawer::get_ml (keyword kend, shstr &sh) 405object_thawer::get_ml (keyword kend, shstr &sh)
313{ 406{
314 char kw[128]; 407 char kw[128];
315 408
316 int klen = keyword_len [kend]; 409 int klen = keyword_len [kend];
317 410
318 kw [0] = '\n'; 411 kw [0] = '\n';
319 memcpy (kw + 1, keyword_str [kend], klen); 412 memcpy (kw + 1, keyword_str [kend], klen);
320 kw [klen + 1] = '\n'; 413 kw [klen + 1] = '\n';
321 kw [klen + 2] = 0; 414 kw [klen + 2] = 0;
322 415
416 ++linenum;
417
323 // first test for completely empty msg... "endXXX\n" 418 // first test for completely empty msg... "endXXX\n"
324 if (!strncmp (line, kw + 1, klen + 1)) 419 if (!strncmp (line, kw + 1, klen + 1))
325 { 420 {
326 sh = 0; 421 sh = 0;
327 422
… …
342 } 437 }
343 438
344 *end = 0; 439 *end = 0;
345 sh = line; 440 sh = line;
346 441
442 // count line numbers
443 while (line < end)
444 linenum += *line++ == '\n';
445
347 line = end + keyword_len [kend] + 1; 446 line += keyword_len [kend];
348 447
349 while (*line++ != '\n') 448 while (*line++ != '\n')
350 ; 449 ;
351 }
352}
353 450
451 ++linenum;
452 }
453}
454
455sint32
354sint32 object_thawer::get_sint32 () const 456object_thawer::get_sint32 () const
355{ 457{
356 char *p = last_value; 458 const char *p = value_nn;
357
358 if (!p)
359 return 0;
360 459
361 sint32 val = 0; 460 sint32 val = 0;
362 bool negate; 461 bool negate;
363 462
364 if (*p == '-') 463 if (*p == '-')
… …
377 while (*p); 476 while (*p);
378 477
379 return negate ? -val : val; 478 return negate ? -val : val;
380} 479}
381 480
382sint64 object_thawer::get_sint64 () const 481void
482object_thawer::delayed_deref (attachable *op, object_ptr &ptr, const char *ref)
383{ 483{
384 return last_value ? atoll (last_value) : 0; 484 op->refcnt_inc ();
485 delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
486 delrefs.push_back (r);
487 ptr = 0;
385} 488}
386 489
387double object_thawer::get_double () const 490void
491object_thawer::resolve_delayed_derefs (bool deref)
388{ 492{
389 return last_value ? atof (last_value) : 0; 493 while (!delrefs.empty ())
390} 494 {
495 delayed_ref r = delrefs.back ();
496 delrefs.pop_back ();
391 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