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.11 by root, Fri Feb 16 19:43:41 2007 UTC

… …
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 22 * Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 */ 23 */
24 24
25#include "global.h" // bug in cfperl.h, doesn't include interface_class stuff
25#include "logger.h" 26#include "logger.h"
26#include "cfperl.h" 27#include "cfperl.h"
27#include "kw_hash.h" 28#include "kw_hash.h"
28 29
29object_freezer::object_freezer () 30object_freezer::object_freezer ()
… …
35object_freezer::~object_freezer () 36object_freezer::~object_freezer ()
36{ 37{
37 SvREFCNT_dec (av); 38 SvREFCNT_dec (av);
38} 39}
39 40
41void
40void object_freezer::put (attachable *ext) 42object_freezer::put (attachable *ext)
41{ 43{
42 ext->optimise (); 44 ext->optimise ();
43 45
44 if (ext->self) 46 if (ext->self)
45 { 47 {
… …
50 add ((sint32)idx); 52 add ((sint32)idx);
51 add ('\n'); 53 add ('\n');
52 } 54 }
53} 55}
54 56
57bool
55bool object_freezer::save (const char *filename) 58object_freezer::save (const char *path)
56{ 59{
57 CALL_BEGIN (3); 60 CALL_BEGIN (3);
58 CALL_ARG_SV (newSVpv (filename, 0)); 61 CALL_ARG_SV (newSVpv (path, 0));
59 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ()))); 62 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));
60 CALL_ARG_SV (newRV_inc ((SV *)av)); 63 CALL_ARG_SV (newRV_inc ((SV *)av));
61 CALL_CALL ("cf::object_freezer_save", G_VOID | G_DISCARD); 64 CALL_CALL ("cf::object_freezer_save", G_VOID | G_DISCARD);
62 CALL_END; 65 CALL_END;
63} 66}
64 67
68char *
65char *object_freezer::as_string () 69object_freezer::as_string ()
66{ 70{
67 CALL_BEGIN (2); 71 CALL_BEGIN (2);
68 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ()))); 72 CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));
69 CALL_ARG_SV (newRV_inc ((SV *)av)); 73 CALL_ARG_SV (newRV_inc ((SV *)av));
70 CALL_CALL ("cf::object_freezer_as_string", G_SCALAR); 74 CALL_CALL ("cf::object_freezer_as_string", G_SCALAR);
71 75
72 STRLEN len;
73
74 char *res = count > 0 76 char *res = count > 0
75 ? strdup (SvPVx (POPs, len)) 77 ? strdup (SvPVX (POPs))
76 : strdup ("[fatal error]"); 78 : strdup ("[fatal error]");
77 79
78 CALL_END; 80 CALL_END;
79 81
80 return res; 82 return res;
81} 83}
82 84
85int
83int fprintf (object_freezer &freezer, const char *format, ...) 86fprintf (object_freezer &freezer, const char *format, ...)
84{ 87{
85 va_list ap; 88 va_list ap;
86 89
87 va_start (ap, format); 90 va_start (ap, format);
88 91
… …
92 freezer.alloc (len); 95 freezer.alloc (len);
93 96
94 va_end (ap); 97 va_end (ap);
95} 98}
96 99
100int
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}
101 105
102static const char thawer_eof[] = "\n\n\n\0\0\0"; 106static const char thawer_eof[] = "\n\n\n\0\0\0";
103 107
104object_thawer::object_thawer (const char *filename) 108object_thawer::object_thawer (const char *path)
109: name (strdup (path))
105{ 110{
106 static const char eof[] = "\n\n\n\0\0\0"; 111 static const char eof[] = "\n\n\n\0\0\0";
107 112
108 av = 0; 113 av = 0;
109 text = 0; 114 text = 0;
110 line = 0; 115 line = 0;
116 linenum = 0;
111 117
112 if (filename) 118 kw = KW_ERROR;
119 kw_str = 0;
120 value = 0;
121
122 if (path)
113 { 123 {
114 CALL_BEGIN (1); 124 CALL_BEGIN (1);
115 CALL_ARG_SV (newSVpv (filename, 0)); 125 CALL_ARG_SV (newSVpv (path, 0));
116 CALL_CALL ("cf::object_thawer_load", G_ARRAY); 126 CALL_CALL ("cf::object_thawer_load", G_ARRAY);
117 127
118 if (count == 2) 128 if (count == 2)
119 { 129 {
120 // second value - perl objects 130 // second value - perl objects
… …
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);
151} 162}
152 163
164void
153void object_thawer::get (attachable *obj, int oid) 165object_thawer::get (attachable *obj, int oid)
154{ 166{
155 if (!av || oid < 0) // this is actually an error of sorts 167 if (!av || oid < 0) // this is actually an error of sorts
156 return; 168 return;
157 169
158 SV **svp = av_fetch ((AV *)av, oid, 0); 170 SV **svp = av_fetch ((AV *)av, oid, 0);
… …
179 191
180 if (obj->self) 192 if (obj->self)
181 { 193 {
182 // the hard way(?) 194 // the hard way(?)
183 195
184 // the dirty blues: "just" swap the XPVHV's 196 CALL_BEGIN (2);
185 swap (SvANY (obj->self), SvANY (hv)); 197 CALL_ARG_SV (newRV_inc ((SV *)obj->self));
186 198 CALL_ARG_SV (newRV_inc ((SV *)hv));
187 // do not swap magic, though 199 PUTBACK;
188 swap (SvMAGIC (obj->self), SvMAGIC (hv)); 200 call_method ("thawer_merge", G_DISCARD | G_EVAL);
201 SPAGAIN;
202 CALL_END;
189 } 203 }
190 else 204 else
191 { 205 {
192 // the easy way(?) 206 // the easy way(?)
193 207
194 obj->self = hv; 208 obj->self = hv;
195 SvRV_set (*svp, &PL_sv_undef); 209 SvRV_set (*svp, &PL_sv_undef);
196 210
197 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 211 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 } 212 }
203 213
204 obj->reattach (); 214 obj->reattach ();
205} 215}
206 216
207object_thawer::~object_thawer () 217object_thawer::~object_thawer ()
208{ 218{
209 if (text) SvREFCNT_dec (text); 219 if (text) SvREFCNT_dec (text);
210 if (av) SvREFCNT_dec (av); 220 if (av) SvREFCNT_dec (av);
211}
212 221
222 free ((void *)name);
223}
224
225//TODO: remove
226char *
213char *fgets (char *s, int n, object_thawer &thawer) 227fgets (char *s, int n, object_thawer &thawer)
214{ 228{
215 char *p = thawer.line; 229 char *p = thawer.line;
216 char *q = s; 230 char *q = s;
217 231
218 if (!p) 232 if (!p)
… …
224 break; 238 break;
225 239
226 *q++ = *p; 240 *q++ = *p;
227 241
228 if (*p++ == '\n') 242 if (*p++ == '\n')
243 {
244 ++thawer.linenum;
229 break; 245 break;
246 }
230 } 247 }
231 248
232 *q = 0; 249 *q = 0;
233 thawer.line = p; 250 thawer.line = p;
234 251
235 return s == q ? 0 : s; 252 return s == q ? 0 : s;
236} 253}
237 254
238keyword object_thawer::get_kv () 255bool
256object_thawer::parse_error (const char *type, const char *name, bool skip)
257{
258 if (!type) type = "file section";
259 if (!name) name = "generic";
260
261 switch (kw)
262 {
263 case KW_EOF:
264 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
265 this->name, linenum, type, name);
266 return false;
267
268 case KW_ERROR:
269 LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n",
270 this->name, linenum,
271 type, name,
272 kw_str ? kw_str : "<file load>");
273 return false;
274
275 default:
276 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
277 this->name, linenum,
278 kw_str ? kw_str : "<null>",
279 value ? value : "<null>",
280 type, name,
281 skip ? "skipping line" : "aborting load");
282 return skip;
283 }
284}
285
286void
287object_thawer::next ()
239{ 288{
240 if (!line) 289 if (!line)
241 return KW_EOF; 290 {
291 kw = KW_ERROR;
292 return;
293 }
242 294
243 for (;;) 295 for (;;)
244 { 296 {
245 char *p = line; 297 char *p = line;
246 298
247 if (!*p) 299 if (!*p)
248 return KW_EOF; 300 {
301 kw = KW_EOF;
302 break;
303 }
249 304
250 // parse keyword 305 // parse keyword
251 while (*p > ' ') 306 while (*p > ' ')
252 p++; 307 p++;
253 308
… …
257 { 312 {
258 // parse value 313 // parse value
259 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20 314 while (*(unsigned char *)p <= ' ' && *p != '\n') // skip 0x01 .. 0x20
260 ++p; 315 ++p;
261 316
262 last_value = p; 317 value = p;
263 318
264 while (*p != '\n') 319 while (*p != '\n')
265 p++; 320 p++;
266 321
267 *p++ = 0; 322 *p++ = 0;
268 } 323 }
269 else 324 else
270 last_value = 0; 325 value = 0;
271 326
327 ++linenum;
272 line [klen] = 0; 328 line [klen] = 0;
273 keyword_idx *kw = kw_lex::match (line, klen); 329 keyword_idx *kw_idx = kw_lex::match (line, klen);
274 330
275 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D 331 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, value);//D
276 332
277 last_keyword = line; 333 kw_str = line;
278 line = p; 334 line = p;
279 335
280 if (kw) 336 if (kw_idx)
281 return kw->index; 337 {
338 kw = kw_idx->index;
339 break;
340 }
282 else if (!*last_keyword || *last_keyword == '#') 341 else if (!*kw_str || *kw_str == '#')
283 ; // empty/comment line 342 ; // empty/comment line
284 else 343 else
344 {
285 return KW_ERROR; 345 kw = KW_ERROR;
346 break;
347 }
286 } 348 }
287} 349}
288 350
289void object_thawer::skip_kv (keyword kw) 351void
352object_thawer::skip ()
290{ 353{
291 shstr ml; 354 shstr ml;
292 355
293 switch (kw) 356 switch (kw)
294 { 357 {
295 case KW_msg: get_ml (KW_endmsg , ml); break; 358 case KW_msg: get_ml (KW_endmsg , ml); break;
296 case KW_lore: get_ml (KW_endlore , ml); break; 359 case KW_lore: get_ml (KW_endlore , ml); break;
297 case KW_maplore: get_ml (KW_endmaplore, ml); break; 360 case KW_maplore: get_ml (KW_endmaplore, ml); break;
298 } 361 }
362
363 next ();
299} 364}
300 365
366void
301void object_thawer::get (shstr &sh) const 367object_thawer::get (shstr &sh) const
302{ 368{
303 if (last_value) 369 if (value)
304 sh = last_value; 370 sh = value;
305 else 371 else
306 { 372 {
307 sh = "<value missing>"; 373 sh = "<value missing>";
308 LOG (llevError, "keyword requires value: <%.320s>\n", line);//TODO: add filename 374 LOG (llevError, "keyword \"%s\" requires value, substituting with <value missing>\n", kw_str);//TODO: add filename
309 } 375 }
310} 376}
311 377
378void
312void object_thawer::get_ml (keyword kend, shstr &sh) 379object_thawer::get_ml (keyword kend, shstr &sh)
313{ 380{
314 char kw[128]; 381 char kw[128];
315 382
316 int klen = keyword_len [kend]; 383 int klen = keyword_len [kend];
317 384
318 kw [0] = '\n'; 385 kw [0] = '\n';
319 memcpy (kw + 1, keyword_str [kend], klen); 386 memcpy (kw + 1, keyword_str [kend], klen);
320 kw [klen + 1] = '\n'; 387 kw [klen + 1] = '\n';
321 kw [klen + 2] = 0; 388 kw [klen + 2] = 0;
322 389
390 ++linenum;
391
323 // first test for completely empty msg... "endXXX\n" 392 // first test for completely empty msg... "endXXX\n"
324 if (!strncmp (line, kw + 1, klen + 1)) 393 if (!strncmp (line, kw + 1, klen + 1))
325 { 394 {
326 sh = 0; 395 sh = 0;
327 396
… …
342 } 411 }
343 412
344 *end = 0; 413 *end = 0;
345 sh = line; 414 sh = line;
346 415
416 // count line numbers
417 while (line < end)
418 linenum += *line++ == '\n';
419
347 line = end + keyword_len [kend] + 1; 420 line += keyword_len [kend];
348 421
349 while (*line++ != '\n') 422 while (*line++ != '\n')
350 ; 423 ;
351 }
352}
353 424
425 ++linenum;
426 }
427}
428
429sint32
354sint32 object_thawer::get_sint32 () const 430object_thawer::get_sint32 () const
355{ 431{
356 char *p = last_value; 432 char *p = value;
357 433
358 if (!p) 434 if (!p)
359 return 0; 435 return 0;
360 436
361 sint32 val = 0; 437 sint32 val = 0;
… …
377 while (*p); 453 while (*p);
378 454
379 return negate ? -val : val; 455 return negate ? -val : val;
380} 456}
381 457
458sint64
382sint64 object_thawer::get_sint64 () const 459object_thawer::get_sint64 () const
383{ 460{
384 return last_value ? atoll (last_value) : 0; 461 return value ? atoll (value) : 0;
385} 462}
386 463
464double
387double object_thawer::get_double () const 465object_thawer::get_double () const
388{ 466{
389 return last_value ? atof (last_value) : 0; 467 return value ? atof (value) : 0;
390} 468}
391 469

Diff Legend

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