[ViewVC] Diff of: cvs/deliantra/server/server/freezethaw.C

Comparing deliantra/server/server/freezethaw.C (file contents):
Revision 1.9 by root, Thu Feb 1 19:17:03 2007 UTC vs.
Revision 1.46 by root, Mon Oct 29 23:55:55 2012 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,2011,2012 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
30	object_freezer::object_freezer ()	28	object_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
36	object_freezer::~object_freezer ()	34	object_freezer::~object_freezer ()
37	{	35	{
38	SvREFCNT_dec (av);	36	SvREFCNT_dec (av);
39	}	37	}
40		38
41	void	39	void
42	object_freezer::put (attachable *ext)	40	object_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
57	bool	53	bool
58	object_freezer::save (const char *path)	54	object_freezer::save (const char *path)
61	CALL_ARG_SV (newSVpv (path, 0));	57	CALL_ARG_SV (newSVpv (path, 0));
62	CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));	58	CALL_ARG_SV (newRV_noinc (newSVpvn ((char *)linearise (), size ())));
63	CALL_ARG_SV (newRV_inc ((SV *)av));	59	CALL_ARG_SV (newRV_inc ((SV *)av));
64	CALL_CALL ("cf::object_freezer_save", G_VOID \| G_DISCARD);	60	CALL_CALL ("cf::object_freezer_save", G_VOID \| G_DISCARD);
65	CALL_END;	61	CALL_END;
		62
		63	return 1;
66	}	64	}
67		65
68	char *	66	char *
69	object_freezer::as_string ()	67	object_freezer::as_string ()
70	{	68	{
…		…
80	CALL_END;	78	CALL_END;
81		79
82	return res;	80	return res;
83	}	81	}
84		82
85	int	83	#if 0
		84	void
86	fprintf (object_freezer &freezer, const char *format, ...)	85	fprintf (object_freezer &freezer, const char *format, ...)
87	{	86	{
88	va_list ap;	87	va_list ap;
89		88
90	va_start (ap, format);	89	va_start (ap, format);
…		…
95	freezer.alloc (len);	94	freezer.alloc (len);
96		95
97	va_end (ap);	96	va_end (ap);
98	}	97	}
99		98
100	int	99	// XXX: function not returning an int
		100	void
101	fputs (const char *s, object_freezer &freezer)	101	fputs (const char *s, object_freezer &freezer)
102	{	102	{
103	freezer.add (s);	103	freezer.add (s);
104	}	104	}
		105	#endif
105		106
106	static const char thawer_eof[] = "\n\n\n\0\0\0";	107	static const char thawer_eof[] = "\n\n\n\0\0\0";
107		108
		109	bool object_thawer::errors_are_fatal = true;
		110
108	object_thawer::object_thawer (const char *path)	111	object_thawer::object_thawer (const char data, AV perlav)
		112	: name (strdup ("(memory stream)"))
		113	{
		114	init ("(memory stream)");
		115
		116	av = perlav;
		117	text = newSVpv (data, 0); sv_catpv (text, thawer_eof);
		118	line = SvPVbyte_nolen (text);
		119	next ();
		120	}
		121
		122	object_thawer::object_thawer (const_utf8_string path)
		123	{
		124	init_from_file (path);
		125	}
		126
		127	// convenience constructor
		128	object_thawer::object_thawer (const_utf8_string dir, const_utf8_string file)
		129	{
		130	init_from_file (format ("%s/%s", dir, file));
		131	}
		132
		133	void
		134	object_thawer::init (const_utf8_string path)
		135	{
109	: name (strdup (path))	136	name = strdup (path);
110	{
111	static const char eof[] = "\n\n\n\0\0\0";
112
113	av = 0;	137	av = 0;
114	text = 0;	138	text = 0;
115	line = 0;	139	line = 0;
116	linenum = 0;	140	linenum = 0;
117		141
		142	kw = KW_ERROR;
		143	kw_str = 0;
		144	value = 0;
		145	}
		146
		147	void
		148	object_thawer::init_from_file (const_utf8_string path)
		149	{
118	if (path)	150	init (path);
119	{	151
120	CALL_BEGIN (1);	152	CALL_BEGIN (1);
121	CALL_ARG_SV (newSVpv (path, 0));	153	CALL_ARG_SV (newSVpv (path, 0));
122	CALL_CALL ("cf::object_thawer_load", G_ARRAY);	154	CALL_CALL ("cf::object_thawer_load", G_ARRAY);
123		155
124	if (count == 2)	156	if (count == 2)
125	{	157	{
126	// second value - perl objects	158	// second value - perl objects
127	{	159	{
128	SV *sv = POPs;	160	SV *sv = POPs;
129	if (SvROK (sv))	161	if (SvROK (sv))
130	av = (AV *)SvREFCNT_inc (SvRV (sv));	162	av = (AV *)SvREFCNT_inc (SvRV (sv));
131	}	163	}
132		164
133	// first value - text part, pad with 3 zeroes	165	// first value - text part, pad with 3 zeroes
134	{	166	{
135	SV *sv = POPs;	167	SV *sv = POPs;
136	STRLEN len;	168	STRLEN len;
137	char *sv_ = SvPVbyte (sv, len);	169	char *sv_ = SvPVbyte (sv, len);
138	text = newSV (len + sizeof (eof));	170	text = newSV (len + sizeof (thawer_eof));
139	SvCUR_set (text, len);	171	SvCUR_set (text, len + sizeof (thawer_eof));
140	memcpy (SvPVX (text), sv_, len);	172	memcpy (SvPVX (text), sv_, len);
141	memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure	173	memcpy (SvPVX (text) + len, thawer_eof, sizeof (thawer_eof));
142		174
143	line = SvPVX (text);	175	line = SvPVX (text);
144	}	176	next ();
145	}	177	}
		178	}
146		179
147	CALL_END;	180	CALL_END;
148	}
149	}
150
151	object_thawer::object_thawer (const char data, AV perlav)
152	: name (strdup ("(memory stream"))
153	{
154	av = perlav;
155	text = newSVpv (data, 0);
156	sv_catpv (text, thawer_eof);
157	line = SvPVbyte_nolen (text);
158	}	181	}
159		182
160	void	183	void
161	object_thawer::get (attachable *obj, int oid)	184	object_thawer::get (attachable *obj, int oid)
162	{	185	{
…		…
165		188
166	SV *svp = av_fetch ((AV )av, oid, 0);	189	SV *svp = av_fetch ((AV )av, oid, 0);
167		190
168	if (!svp \|\| !SvROK (*svp))	191	if (!svp \|\| !SvROK (*svp))
169	{	192	{
170	printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);	193	LOG (llevError, "trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
171	return;	194	return;
172	}	195	}
173		196
174	if (!SvROK (*svp))	197	if (!SvROK (*svp))
175	{	198	{
176	LOG (llevError, "deserialised perl object is not an RV");	199	LOG (llevError, "deserialised perl object is not an RV\n");
177	return;	200	return;
178	}	201	}
179		202
180	HV hv = (HV )SvRV (*svp);	203	HV hv = (HV )SvRV (*svp);
181		204
182	if (SvTYPE (hv) != SVt_PVHV)	205	if (SvTYPE (hv) != SVt_PVHV)
183	{	206	{
184	LOG (llevError, "deserialised perl object is not a PVHV");	207	LOG (llevError, "deserialised perl object is not a PVHV\n");
185	return;	208	return;
186	}	209	}
187		210
188	if (obj->self)	211	if (obj->self)
189	{	212	{
…		…
213	object_thawer::~object_thawer ()	236	object_thawer::~object_thawer ()
214	{	237	{
215	if (text) SvREFCNT_dec (text);	238	if (text) SvREFCNT_dec (text);
216	if (av) SvREFCNT_dec (av);	239	if (av) SvREFCNT_dec (av);
217		240
		241	resolve_delayed_derefs (false);
		242
218	free ((void *)name);	243	free ((void *)name);
219	}	244	}
220		245
221	//TODO: remove	246	static void
222	char *	247	error_out ()
223	fgets (char *s, int n, object_thawer &thawer)
224	{	248	{
225	char *p = thawer.line;	249	if (object_thawer::errors_are_fatal)
226	char *q = s;
227
228	if (!p)
229	return 0;
230
231	while (--n)
232	{
233	if (!*p)
234	break;
235
236	q++ = p;
237
238	if (*p++ == '\n')
239	{
240	++thawer.linenum;
241	break;
242	}
243	}	250	{
		251	LOG (llevError, "(parse errors at this time are fatal, exiting)");
		252	exit (1);
		253	}
		254	}
244		255
245	*q = 0;	256	void
246	thawer.line = p;	257	object_thawer::parse_warn (const char *msg) const
247		258	{
248	return s == q ? 0 : s;	259	LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
		260	this->name, linenum,
		261	kw_str ? kw_str : "<null>",
		262	value ? value : "<null>",
		263	msg);
249	}	264	}
250		265
251	bool	266	bool
252	object_thawer::parse_error (keyword kw, const char type, const char name, bool skip)	267	object_thawer::parse_error (const char type, const char name, bool skip) const
253	{	268	{
254	if (!type) type = "file section";	269	if (!type) type = "file section";
255	if (!name) name = "generic";	270	if (!name) name = "generic";
256		271
257	switch (kw)	272	switch (kw)
258	{	273	{
259	case KW_EOF:	274	case KW_EOF:
260	LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",	275	LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
261	this->name, linenum, type, name);	276	this->name, linenum, type, name);
		277	error_out ();
262	return false;	278	return false;
263		279
264	case KW_ERROR:	280	case KW_ERROR:
265	LOG (llevError, "%s:%d errornous line (%s) while reading %s '%s', aborting load.\n",	281	LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n",
266	this->name, linenum,	282	this->name, linenum,
267	last_keyword ? last_keyword : "<null>",
268	type, name);	283	type, name,
		284	kw_str ? kw_str : "<file load>");
		285	error_out ();
269	return false;	286	return false;
270		287
271	default:	288	default:
272	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",
273	this->name, linenum,	290	this->name, linenum,
274	last_keyword ? last_keyword : "<null>",	291	kw_str ? kw_str : "<null>",
275	last_value ? last_value : "<null>",	292	value ? value : "<null>",
276	type, name,	293	type, name,
277	skip ? "skipping line" : "aborting load");	294	skip ? "skipping line" : "aborting load");
		295	error_out ();
278	return skip;	296	return skip;
279	}	297	}
280	}	298	}
281		299
282	keyword	300	void
283	object_thawer::get_kv ()	301	object_thawer::next ()
284	{	302	{
285	if (!line)	303	if (!line)
286	return KW_EOF;	304	{
		305	kw = KW_ERROR;
		306	return;
		307	}
287		308
288	for (;;)	309	for (;;)
289	{	310	{
290	char *p = line;	311	char *p = line;
291		312
		313	if (expect_false (*p <= ' '))
		314	{
		315	// skip whitespace (only some files need this)
		316	while (p == ' ' \|\| p == '\t')
		317	p++;
		318
		319	line = p;
		320	}
		321
292	if (!*p)	322	if (!*p)
293	return KW_EOF;	323	{
		324	kw = KW_EOF;
		325	break;
		326	}
294		327
295	// parse keyword	328	// parse keyword
296	while (*p > ' ')	329	while (*p > ' ')
297	p++;	330	p++;
298		331
299	int klen = p - line;	332	int klen = p - line;
300		333
		334	value_nn = "";
		335	value = 0;
		336
301	if (*p++ != '\n')	337	if (*p++ != '\n')
302	{	338	{
303	// parse value	339	// parse value
304	while ((unsigned char )p <= ' ' && *p != '\n') // skip 0x01 .. 0x20	340	while ((unsigned char )p <= ' ' && *p != '\n')
305	++p;	341	++p;
306		342
307	last_value = p;	343	value_nn = value = p;
308		344
309	while (*p != '\n')	345	while (*p != '\n')
310	p++;	346	p++;
311		347
312	*p++ = 0;	348	*p++ = 0;
313	}	349	}
314	else
315	last_value = 0;
316		350
317	++linenum;	351	++linenum;
318	line [klen] = 0;	352	line [klen] = 0;
319	keyword_idx *kw = kw_lex::match (line, klen);	353	keyword_idx *kw_idx = kw_lex::match (line, klen);
320		354
321	//printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D	355	kw_str = line;
322
323	last_keyword = line;
324	line = p;	356	line = p;
325		357
326	if (kw)	358	if (kw_idx)
327	return kw->index;	359	{
		360	kw = kw_idx->index;
		361	break;
		362	}
328	else if (!last_keyword \|\| last_keyword == '#')	363	else if (!kw_str \|\| kw_str == '#')
329	; // empty/comment line	364	; // empty/comment line
330	else	365	else
		366	{
331	return KW_ERROR;	367	kw = KW_ERROR;
		368	break;
		369	}
		370	}
		371	}
		372
		373	bool
		374	object_thawer::next_line ()
		375	{
		376	if (!line)
332	}	377	{
333	}	378	kw = KW_ERROR;
		379	return 0;
		380	}
334		381
		382	for (;;)
		383	{
		384	char *p = line;
		385
		386	if (expect_false (*p <= ' '))
		387	{
		388	// skip whitespace (only some files need this)
		389	while (p == ' ' \|\| p == '\t')
		390	p++;
		391
		392	line = p;
		393	}
		394
		395	if (!*p)
		396	{
		397	kw = KW_EOF;
		398	return 0;
		399	}
		400
		401	kw = KW_value;
		402	kw_str = p;
		403	value_nn = p;
		404	value = p;
		405
		406	// parse till newline
		407	while (*p > '\n')
		408	p++;
		409
		410	if (*p == '\n')
		411	*p++ = 0;
		412
		413	++linenum;
		414
		415	line = p;
		416
		417	if (kw_str && kw_str != '#')
		418	break;
		419
		420	// empty/comment line -> skip it
		421	}
		422
		423	return 1;
		424	}
		425
335	void	426	void
336	object_thawer::skip_kv (keyword kw)	427	object_thawer::skip ()
337	{	428	{
338	shstr ml;	429	shstr ml;
339		430
340	switch (kw)	431	switch (kw)
341	{	432	{
342	case KW_msg: get_ml (KW_endmsg , ml); break;	433	case KW_msg: get_ml (KW_endmsg , ml); break;
343	case KW_lore: get_ml (KW_endlore , ml); break;	434	case KW_lore: get_ml (KW_endlore , ml); break;
344	case KW_maplore: get_ml (KW_endmaplore, ml); break;	435	case KW_maplore: get_ml (KW_endmaplore, ml); break;
		436	default: break;
345	}	437	}
		438
		439	next ();
346	}	440	}
347		441
348	void	442	void
349	object_thawer::get (shstr &sh) const	443	object_thawer::skip_block ()
350	{	444	{
351	if (last_value)	445	// must not stop at KW_ERROR, as those signify custom keys
352	sh = last_value;	446	while (kw != KW_EOF)
353	else
354	{	447	{
355	sh = "<value missing>";	448	keyword w = kw;
356	LOG (llevError, "keyword \"%s\" requires value, substituting with <value missing>\n", last_keyword);//TODO: add filename	449	skip ();
		450
		451	if (0 && (w == KW_map \|\| w == KW_arch \|\| w == KW_object \|\| w == KW_region))
		452	skip_block ();
		453	else if (w == KW_end)
		454	break;
357	}	455	}
358	}	456	}
359		457
360	void	458	void
361	object_thawer::get_ml (keyword kend, shstr &sh)	459	object_thawer::get_ml (keyword kend, shstr &sh)
…		…
409	}	507	}
410		508
411	sint32	509	sint32
412	object_thawer::get_sint32 () const	510	object_thawer::get_sint32 () const
413	{	511	{
414	char *p = last_value;	512	const char *p = value_nn;
415
416	if (!p)
417	return 0;
418		513
419	sint32 val = 0;	514	sint32 val = 0;
420	bool negate;	515	bool negate;
421		516
422	if (*p == '-')	517	if (*p == '-')
…		…
435	while (*p);	530	while (*p);
436		531
437	return negate ? -val : val;	532	return negate ? -val : val;
438	}	533	}
439		534
440	sint64	535	void
441	object_thawer::get_sint64 () const	536	object_thawer::delayed_deref (attachable op, object_ptr &ptr, const char ref)
442	{	537	{
443	return last_value ? atoll (last_value) : 0;	538	op->refcnt_inc ();
		539	delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
		540	delrefs.push_back (r);
		541	ptr = 0;
444	}	542	}
445		543
446	double	544	void
447	object_thawer::get_double () const	545	object_thawer::resolve_delayed_derefs (bool deref)
448	{	546	{
449	return last_value ? atof (last_value) : 0;	547	while (!delrefs.empty ())
450	}	548	{
		549	delayed_ref r = delrefs.back ();
		550	delrefs.pop_back ();
451		551
		552	if (deref)
		553	*r.ptr = object::deref (r.ref);
		554
		555	free ((void *)r.ref);
		556	r.op->refcnt_dec ();
		557	}
		558	}

Diff Legend

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

Comparing deliantra/server/server/freezethaw.C (file contents): Revision 1.9 by root, Thu Feb 1 19:17:03 2007 UTC vs. Revision 1.46 by root, Mon Oct 29 23:55:55 2012 UTC

Diff Legend

Comparing deliantra/server/server/freezethaw.C (file contents):
Revision 1.9 by root, Thu Feb 1 19:17:03 2007 UTC vs.
Revision 1.46 by root, Mon Oct 29 23:55:55 2012 UTC