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

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.49 by root, Wed Dec 5 19:03:27 2018 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.49 by root, Wed Dec 5 19:03:27 2018 UTC