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.9 by root, Thu Feb 1 19:17:03 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 if (path)
113 { 119 {
114 CALL_BEGIN (1); 120 CALL_BEGIN (1);
115 CALL_ARG_SV (newSVpv (filename, 0)); 121 CALL_ARG_SV (newSVpv (path, 0));
116 CALL_CALL ("cf::object_thawer_load", G_ARRAY); 122 CALL_CALL ("cf::object_thawer_load", G_ARRAY);
117 123
118 if (count == 2) 124 if (count == 2)
119 { 125 {
120 // second value - perl objects 126 // second value - perl objects
… …
141 CALL_END; 147 CALL_END;
142 } 148 }
143} 149}
144 150
145object_thawer::object_thawer (const char *data, AV *perlav) 151object_thawer::object_thawer (const char *data, AV *perlav)
152: name (strdup ("(memory stream"))
146{ 153{
147 av = perlav; 154 av = perlav;
148 text = newSVpv (data, 0); 155 text = newSVpv (data, 0);
149 sv_catpv (text, thawer_eof); 156 sv_catpv (text, thawer_eof);
150 line = SvPVbyte_nolen (text); 157 line = SvPVbyte_nolen (text);
151} 158}
152 159
160void
153void object_thawer::get (attachable *obj, int oid) 161object_thawer::get (attachable *obj, int oid)
154{ 162{
155 if (!av || oid < 0) // this is actually an error of sorts 163 if (!av || oid < 0) // this is actually an error of sorts
156 return; 164 return;
157 165
158 SV **svp = av_fetch ((AV *)av, oid, 0); 166 SV **svp = av_fetch ((AV *)av, oid, 0);
… …
179 187
180 if (obj->self) 188 if (obj->self)
181 { 189 {
182 // the hard way(?) 190 // the hard way(?)
183 191
184 // the dirty blues: "just" swap the XPVHV's 192 CALL_BEGIN (2);
185 swap (SvANY (obj->self), SvANY (hv)); 193 CALL_ARG_SV (newRV_inc ((SV *)obj->self));
186 194 CALL_ARG_SV (newRV_inc ((SV *)hv));
187 // do not swap magic, though 195 PUTBACK;
188 swap (SvMAGIC (obj->self), SvMAGIC (hv)); 196 call_method ("thawer_merge", G_DISCARD | G_EVAL);
197 SPAGAIN;
198 CALL_END;
189 } 199 }
190 else 200 else
191 { 201 {
192 // the easy way(?) 202 // the easy way(?)
193 203
194 obj->self = hv; 204 obj->self = hv;
195 SvRV_set (*svp, &PL_sv_undef); 205 SvRV_set (*svp, &PL_sv_undef);
196 206
197 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 207 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 } 208 }
203 209
204 obj->reattach (); 210 obj->reattach ();
205} 211}
206 212
207object_thawer::~object_thawer () 213object_thawer::~object_thawer ()
208{ 214{
209 if (text) SvREFCNT_dec (text); 215 if (text) SvREFCNT_dec (text);
210 if (av) SvREFCNT_dec (av); 216 if (av) SvREFCNT_dec (av);
211}
212 217
218 free ((void *)name);
219}
220
221//TODO: remove
222char *
213char *fgets (char *s, int n, object_thawer &thawer) 223fgets (char *s, int n, object_thawer &thawer)
214{ 224{
215 char *p = thawer.line; 225 char *p = thawer.line;
216 char *q = s; 226 char *q = s;
217 227
218 if (!p) 228 if (!p)
… …
224 break; 234 break;
225 235
226 *q++ = *p; 236 *q++ = *p;
227 237
228 if (*p++ == '\n') 238 if (*p++ == '\n')
239 {
240 ++thawer.linenum;
229 break; 241 break;
242 }
230 } 243 }
231 244
232 *q = 0; 245 *q = 0;
233 thawer.line = p; 246 thawer.line = p;
234 247
235 return s == q ? 0 : s; 248 return s == q ? 0 : s;
236} 249}
237 250
251bool
252object_thawer::parse_error (keyword kw, const char *type, const char *name, bool skip)
253{
254 if (!type) type = "file section";
255 if (!name) name = "generic";
256
257 switch (kw)
258 {
259 case KW_EOF:
260 LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
261 this->name, linenum, type, name);
262 return false;
263
264 case KW_ERROR:
265 LOG (llevError, "%s:%d errornous line (%s) while reading %s '%s', aborting load.\n",
266 this->name, linenum,
267 last_keyword ? last_keyword : "<null>",
268 type, name);
269 return false;
270
271 default:
272 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
273 this->name, linenum,
274 last_keyword ? last_keyword : "<null>",
275 last_value ? last_value : "<null>",
276 type, name,
277 skip ? "skipping line" : "aborting load");
278 return skip;
279 }
280}
281
282keyword
238keyword object_thawer::get_kv () 283object_thawer::get_kv ()
239{ 284{
240 if (!line) 285 if (!line)
241 return KW_EOF; 286 return KW_EOF;
242 287
243 for (;;) 288 for (;;)
… …
267 *p++ = 0; 312 *p++ = 0;
268 } 313 }
269 else 314 else
270 last_value = 0; 315 last_value = 0;
271 316
317 ++linenum;
272 line [klen] = 0; 318 line [klen] = 0;
273 keyword_idx *kw = kw_lex::match (line, klen); 319 keyword_idx *kw = kw_lex::match (line, klen);
274 320
275 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D 321 //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D
276 322
… …
284 else 330 else
285 return KW_ERROR; 331 return KW_ERROR;
286 } 332 }
287} 333}
288 334
335void
289void object_thawer::skip_kv (keyword kw) 336object_thawer::skip_kv (keyword kw)
290{ 337{
291 shstr ml; 338 shstr ml;
292 339
293 switch (kw) 340 switch (kw)
294 { 341 {
… …
296 case KW_lore: get_ml (KW_endlore , ml); break; 343 case KW_lore: get_ml (KW_endlore , ml); break;
297 case KW_maplore: get_ml (KW_endmaplore, ml); break; 344 case KW_maplore: get_ml (KW_endmaplore, ml); break;
298 } 345 }
299} 346}
300 347
348void
301void object_thawer::get (shstr &sh) const 349object_thawer::get (shstr &sh) const
302{ 350{
303 if (last_value) 351 if (last_value)
304 sh = last_value; 352 sh = last_value;
305 else 353 else
306 { 354 {
307 sh = "<value missing>"; 355 sh = "<value missing>";
308 LOG (llevError, "keyword requires value: <%.320s>\n", line);//TODO: add filename 356 LOG (llevError, "keyword \"%s\" requires value, substituting with <value missing>\n", last_keyword);//TODO: add filename
309 } 357 }
310} 358}
311 359
360void
312void object_thawer::get_ml (keyword kend, shstr &sh) 361object_thawer::get_ml (keyword kend, shstr &sh)
313{ 362{
314 char kw[128]; 363 char kw[128];
315 364
316 int klen = keyword_len [kend]; 365 int klen = keyword_len [kend];
317 366
318 kw [0] = '\n'; 367 kw [0] = '\n';
319 memcpy (kw + 1, keyword_str [kend], klen); 368 memcpy (kw + 1, keyword_str [kend], klen);
320 kw [klen + 1] = '\n'; 369 kw [klen + 1] = '\n';
321 kw [klen + 2] = 0; 370 kw [klen + 2] = 0;
371
372 ++linenum;
322 373
323 // first test for completely empty msg... "endXXX\n" 374 // first test for completely empty msg... "endXXX\n"
324 if (!strncmp (line, kw + 1, klen + 1)) 375 if (!strncmp (line, kw + 1, klen + 1))
325 { 376 {
326 sh = 0; 377 sh = 0;
… …
342 } 393 }
343 394
344 *end = 0; 395 *end = 0;
345 sh = line; 396 sh = line;
346 397
398 // count line numbers
399 while (line < end)
400 linenum += *line++ == '\n';
401
347 line = end + keyword_len [kend] + 1; 402 line += keyword_len [kend];
348 403
349 while (*line++ != '\n') 404 while (*line++ != '\n')
350 ; 405 ;
351 }
352}
353 406
407 ++linenum;
408 }
409}
410
411sint32
354sint32 object_thawer::get_sint32 () const 412object_thawer::get_sint32 () const
355{ 413{
356 char *p = last_value; 414 char *p = last_value;
357 415
358 if (!p) 416 if (!p)
359 return 0; 417 return 0;
… …
377 while (*p); 435 while (*p);
378 436
379 return negate ? -val : val; 437 return negate ? -val : val;
380} 438}
381 439
440sint64
382sint64 object_thawer::get_sint64 () const 441object_thawer::get_sint64 () const
383{ 442{
384 return last_value ? atoll (last_value) : 0; 443 return last_value ? atoll (last_value) : 0;
385} 444}
386 445
446double
387double object_thawer::get_double () const 447object_thawer::get_double () const
388{ 448{
389 return last_value ? atof (last_value) : 0; 449 return last_value ? atof (last_value) : 0;
390} 450}
391 451

Diff Legend

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