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.3 by root, Sat Dec 30 20:32:30 2006 UTC vs.
Revision 1.8 by root, Thu Feb 1 19:15:39 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);
… …
76 CALL_END; 80 CALL_END;
77 81
78 return res; 82 return res;
79} 83}
80 84
85int
81int fprintf (object_freezer &freezer, const char *format, ...) 86fprintf (object_freezer &freezer, const char *format, ...)
82{ 87{
83 va_list ap; 88 va_list ap;
84 89
85 va_start (ap, format); 90 va_start (ap, format);
86 91
… …
90 freezer.alloc (len); 95 freezer.alloc (len);
91 96
92 va_end (ap); 97 va_end (ap);
93} 98}
94 99
100int
95int fputs (const char *s, object_freezer &freezer) 101fputs (const char *s, object_freezer &freezer)
96{ 102{
97 freezer.add (s); 103 freezer.add (s);
98} 104}
99 105
100static const char thawer_eof[] = "\n\n\n\0\0\0"; 106static const char thawer_eof[] = "\n\n\n\0\0\0";
101 107
102object_thawer::object_thawer (const char *filename) 108object_thawer::object_thawer (const char *path)
109: name (strdup (path))
103{ 110{
104 static const char eof[] = "\n\n\n\0\0\0"; 111 static const char eof[] = "\n\n\n\0\0\0";
105 112
106 av = 0; 113 av = 0;
107 text = 0; 114 text = 0;
108 line = 0; 115 line = 0;
116 linenum = 0;
109 117
110 if (filename) 118 if (path)
111 { 119 {
112 CALL_BEGIN (1); 120 CALL_BEGIN (1);
113 CALL_ARG_SV (newSVpv (filename, 0)); 121 CALL_ARG_SV (newSVpv (path, 0));
114 CALL_CALL ("cf::object_thawer_load", G_ARRAY); 122 CALL_CALL ("cf::object_thawer_load", G_ARRAY);
115 123
116 if (count == 2) 124 if (count == 2)
117 { 125 {
118 // second value - perl objects 126 // second value - perl objects
… …
139 CALL_END; 147 CALL_END;
140 } 148 }
141} 149}
142 150
143object_thawer::object_thawer (const char *data, AV *perlav) 151object_thawer::object_thawer (const char *data, AV *perlav)
152: name (strdup ("(memory stream"))
144{ 153{
145 av = perlav; 154 av = perlav;
146 text = newSVpv (data, 0); 155 text = newSVpv (data, 0);
147 sv_catpv (text, thawer_eof); 156 sv_catpv (text, thawer_eof);
148 line = SvPVbyte_nolen (text); 157 line = SvPVbyte_nolen (text);
149} 158}
150 159
160void
151void object_thawer::get (attachable *obj, int oid) 161object_thawer::get (attachable *obj, int oid)
152{ 162{
153 if (!av || oid < 0) // this is actually an error of sorts 163 if (!av || oid < 0) // this is actually an error of sorts
154 return; 164 return;
155 165
156 SV **svp = av_fetch ((AV *)av, oid, 0); 166 SV **svp = av_fetch ((AV *)av, oid, 0);
… …
177 187
178 if (obj->self) 188 if (obj->self)
179 { 189 {
180 // the hard way(?) 190 // the hard way(?)
181 191
182 // the dirty blues: "just" swap the XPVHV's 192 CALL_BEGIN (2);
183 swap (SvANY (obj->self), SvANY (hv)); 193 CALL_ARG_SV (newRV_inc ((SV *)obj->self));
184 194 CALL_ARG_SV (newRV_inc ((SV *)hv));
185 // do not swap magic, though 195 PUTBACK;
186 swap (SvMAGIC (obj->self), SvMAGIC (hv)); 196 call_method ("thawer_merge", G_DISCARD | G_EVAL);
197 SPAGAIN;
198 CALL_END;
187 } 199 }
188 else 200 else
189 { 201 {
190 // the easy way(?) 202 // the easy way(?)
191 203
192 obj->self = hv; 204 obj->self = hv;
193 SvRV_set (*svp, &PL_sv_undef); 205 SvRV_set (*svp, &PL_sv_undef);
194 206
195 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);
196
197 // borrow a refcount for the perl object
198 obj->flags |= attachable::F_BORROWED;
199 obj->refcnt_dec ();
200 } 208 }
201 209
202 obj->reattach (); 210 obj->reattach ();
203} 211}
204 212
205object_thawer::~object_thawer () 213object_thawer::~object_thawer ()
206{ 214{
207 if (text) SvREFCNT_dec (text); 215 if (text) SvREFCNT_dec (text);
208 if (av) SvREFCNT_dec (av); 216 if (av) SvREFCNT_dec (av);
209}
210 217
218 free ((void *)name);
219}
220
221//TODO: remove
222char *
211char *fgets (char *s, int n, object_thawer &thawer) 223fgets (char *s, int n, object_thawer &thawer)
212{ 224{
213 char *p = thawer.line; 225 char *p = thawer.line;
214 char *q = s; 226 char *q = s;
215 227
216 if (!p) 228 if (!p)
… …
222 break; 234 break;
223 235
224 *q++ = *p; 236 *q++ = *p;
225 237
226 if (*p++ == '\n') 238 if (*p++ == '\n')
239 {
240 ++thawer.linenum;
227 break; 241 break;
242 }
228 } 243 }
229 244
230 *q = 0; 245 *q = 0;
231 thawer.line = p; 246 thawer.line = p;
232 247
233 return s == q ? 0 : s; 248 return s == q ? 0 : s;
234} 249}
235 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) 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
236keyword object_thawer::get_kv () 283object_thawer::get_kv ()
237{ 284{
238 if (!line) 285 if (!line)
239 return KW_EOF; 286 return KW_EOF;
240 287
241 for (;;) 288 for (;;)
… …
265 *p++ = 0; 312 *p++ = 0;
266 } 313 }
267 else 314 else
268 last_value = 0; 315 last_value = 0;
269 316
317 ++linenum;
270 line [klen] = 0; 318 line [klen] = 0;
271 keyword_idx *kw = kw_lex::match (line, klen); 319 keyword_idx *kw = kw_lex::match (line, klen);
272 320
273 //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
274 322
… …
282 else 330 else
283 return KW_ERROR; 331 return KW_ERROR;
284 } 332 }
285} 333}
286 334
335void
287void object_thawer::skip_kv (keyword kw) 336object_thawer::skip_kv (keyword kw)
288{ 337{
289 shstr ml; 338 shstr ml;
290 339
291 switch (kw) 340 switch (kw)
292 { 341 {
… …
294 case KW_lore: get_ml (KW_endlore , ml); break; 343 case KW_lore: get_ml (KW_endlore , ml); break;
295 case KW_maplore: get_ml (KW_endmaplore, ml); break; 344 case KW_maplore: get_ml (KW_endmaplore, ml); break;
296 } 345 }
297} 346}
298 347
348void
299void object_thawer::get (shstr &sh) const 349object_thawer::get (shstr &sh) const
300{ 350{
301 if (last_value) 351 if (last_value)
302 sh = last_value; 352 sh = last_value;
303 else 353 else
304 { 354 {
305 sh = "<value missing>"; 355 sh = "<value missing>";
306 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
307 } 357 }
308} 358}
309 359
360void
310void object_thawer::get_ml (keyword kend, shstr &sh) 361object_thawer::get_ml (keyword kend, shstr &sh)
311{ 362{
312 char kw[128]; 363 char kw[128];
313 364
314 int klen = keyword_len [kend]; 365 int klen = keyword_len [kend];
315 366
316 kw [0] = '\n'; 367 kw [0] = '\n';
317 memcpy (kw + 1, keyword_str [kend], klen); 368 memcpy (kw + 1, keyword_str [kend], klen);
318 kw [klen + 1] = '\n'; 369 kw [klen + 1] = '\n';
319 kw [klen + 2] = 0; 370 kw [klen + 2] = 0;
371
372 ++linenum;
320 373
321 // first test for completely empty msg... "endXXX\n" 374 // first test for completely empty msg... "endXXX\n"
322 if (!strncmp (line, kw + 1, klen + 1)) 375 if (!strncmp (line, kw + 1, klen + 1))
323 { 376 {
324 sh = 0; 377 sh = 0;
… …
340 } 393 }
341 394
342 *end = 0; 395 *end = 0;
343 sh = line; 396 sh = line;
344 397
398 // count line numbers
399 while (line < end)
400 linenum += *line++ == '\n';
401
345 line = end + keyword_len [kend] + 1; 402 line += keyword_len [kend];
346 403
347 while (*line++ != '\n') 404 while (*line++ != '\n')
348 ; 405 ;
349 }
350}
351 406
407 ++linenum;
408 }
409}
410
411sint32
352sint32 object_thawer::get_sint32 () const 412object_thawer::get_sint32 () const
353{ 413{
354 char *p = last_value; 414 char *p = last_value;
355 415
356 if (!p) 416 if (!p)
357 return 0; 417 return 0;
… …
375 while (*p); 435 while (*p);
376 436
377 return negate ? -val : val; 437 return negate ? -val : val;
378} 438}
379 439
440sint64
380sint64 object_thawer::get_sint64 () const 441object_thawer::get_sint64 () const
381{ 442{
382 return last_value ? atoll (last_value) : 0; 443 return last_value ? atoll (last_value) : 0;
383} 444}
384 445
446double
385double object_thawer::get_double () const 447object_thawer::get_double () const
386{ 448{
387 return last_value ? atof (last_value) : 0; 449 return last_value ? atof (last_value) : 0;
388} 450}
389 451

Diff Legend

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