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

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

Diff Legend

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

Comparing deliantra/server/server/freezethaw.C (file contents): Revision 1.2 by elmex, Sat Dec 30 14:34:10 2006 UTC vs. Revision 1.40 by root, Wed Apr 28 19:49:50 2010 UTC

Diff Legend

Comparing deliantra/server/server/freezethaw.C (file contents):
Revision 1.2 by elmex, Sat Dec 30 14:34:10 2006 UTC vs.
Revision 1.40 by root, Wed Apr 28 19:49:50 2010 UTC