ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.426 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 2009 UTC

…		…
19	# The authors can be reached via e-mail to <support@deliantra.net>	19	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	20	#
21		21
22	package cf;	22	package cf;
23		23
		24	use 5.10.0;
24	use utf8;	25	use utf8;
25	use strict;	26	use strict qw(vars subs);
26		27
27	use Symbol;	28	use Symbol;
28	use List::Util;	29	use List::Util;
29	use Socket;	30	use Socket;
30	use EV 3.2;	31	use EV;
31	use Opcode;	32	use Opcode;
32	use Safe;	33	use Safe;
33	use Safe::Hole;	34	use Safe::Hole;
34	use Storable ();	35	use Storable ();
35		36
		37	use Guard ();
36	use Coro 4.50 ();	38	use Coro ();
37	use Coro::State;	39	use Coro::State;
38	use Coro::Handle;	40	use Coro::Handle;
39	use Coro::EV;	41	use Coro::EV;
		42	use Coro::AnyEvent;
40	use Coro::Timer;	43	use Coro::Timer;
41	use Coro::Signal;	44	use Coro::Signal;
42	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
43	use Coro::AIO;	48	use Coro::AIO;
44	use Coro::BDB;	49	use Coro::BDB 1.6;
45	use Coro::Storable;	50	use Coro::Storable;
46	use Coro::Util ();	51	use Coro::Util ();
47		52
48	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
49	use BDB ();	54	use BDB ();
50	use Data::Dumper;	55	use Data::Dumper;
51	use Digest::MD5;	56	use Digest::MD5;
52	use Fcntl;	57	use Fcntl;
53	use YAML ();	58	use YAML ();
54	use IO::AIO 2.51 ();	59	use IO::AIO ();
55	use Time::HiRes;	60	use Time::HiRes;
56	use Compress::LZF;	61	use Compress::LZF;
57	use Digest::MD5 ();	62	use Digest::MD5 ();
		63
		64	AnyEvent::detect;
58		65
59	# configure various modules to our taste	66	# configure various modules to our taste
60	#	67	#
61	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
62	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	69	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		70
		71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		72
		73	# make sure c-lzf reinitialises itself
		74	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	75	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64		76
65	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	77	# strictly for debugging
		78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66		79
67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68		81
69	our %COMMAND = ();	82	our %COMMAND = ();
70	our %COMMAND_TIME = ();	83	our %COMMAND_TIME = ();
…		…
73	our %EXTCMD = ();	86	our %EXTCMD = ();
74	our %EXTICMD = ();	87	our %EXTICMD = ();
75	our %EXT_CORO = (); # coroutines bound to extensions	88	our %EXT_CORO = (); # coroutines bound to extensions
76	our %EXT_MAP = (); # pluggable maps	89	our %EXT_MAP = (); # pluggable maps
77		90
78	our $RELOAD; # number of reloads so far	91	our $RELOAD; # number of reloads so far, non-zero while in reload
79	our @EVENT;	92	our @EVENT;
		93	our @REFLECT; # set by XS
		94	our %REFLECT; # set by us
80		95
81	our $CONFDIR = confdir;	96	our $CONFDIR = confdir;
82	our $DATADIR = datadir;	97	our $DATADIR = datadir;
83	our $LIBDIR = "$DATADIR/ext";	98	our $LIBDIR = "$DATADIR/ext";
84	our $PODDIR = "$DATADIR/pod";	99	our $PODDIR = "$DATADIR/pod";
85	our $MAPDIR = "$DATADIR/" . mapdir;	100	our $MAPDIR = "$DATADIR/" . mapdir;
86	our $LOCALDIR = localdir;	101	our $LOCALDIR = localdir;
87	our $TMPDIR = "$LOCALDIR/" . tmpdir;	102	our $TMPDIR = "$LOCALDIR/" . tmpdir;
88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	103	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	104	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90	our $RANDOMDIR = "$LOCALDIR/random";	105	our $RANDOMDIR = "$LOCALDIR/random";
91	our $BDBDIR = "$LOCALDIR/db";	106	our $BDBDIR = "$LOCALDIR/db";
		107	our $PIDFILE = "$LOCALDIR/pid";
		108	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		109
92	our %RESOURCE;	110	our %RESOURCE;
93		111
94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	112	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95	our $AIO_POLL_WATCHER;
96	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	113	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97	our $NEXT_TICK;	114	our $NEXT_TICK;
98	our $USE_FSYNC = 1; # use fsync to write maps - default off	115	our $USE_FSYNC = 1; # use fsync to write maps - default on
99		116
100	our $BDB_POLL_WATCHER;
101	our $BDB_DEADLOCK_WATCHER;	117	our $BDB_DEADLOCK_WATCHER;
102	our $BDB_CHECKPOINT_WATCHER;	118	our $BDB_CHECKPOINT_WATCHER;
103	our $BDB_TRICKLE_WATCHER;	119	our $BDB_TRICKLE_WATCHER;
104	our $DB_ENV;	120	our $DB_ENV;
105		121
		122	our @EXTRA_MODULES = qw(pod mapscript);
		123
106	our %CFG;	124	our %CFG;
107		125
108	our $UPTIME; $UPTIME ||= time;	126	our $UPTIME; $UPTIME ||= time;
109	our $RUNTIME;	127	our $RUNTIME;
110	our $NOW;	128	our $NOW;
…		…
119	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	137	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120	our $LOADAVG; # same thing, but with alpha-smoothing	138	our $LOADAVG; # same thing, but with alpha-smoothing
121	our $JITTER; # average jitter	139	our $JITTER; # average jitter
122	our $TICK_START; # for load detecting purposes	140	our $TICK_START; # for load detecting purposes
123		141
		142	our @POST_INIT;
		143
		144	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		145	our $REALLY_UNLOOP; # never set to true, please :)
		146
124	binmode STDOUT;	147	binmode STDOUT;
125	binmode STDERR;	148	binmode STDERR;
126		149
127	# read virtual server time, if available	150	# read virtual server time, if available
128	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	151	unless ($RUNTIME || !-e $RUNTIMEFILE) {
129	open my $fh, "<", "$LOCALDIR/runtime"	152	open my $fh, "<", $RUNTIMEFILE
130	or die "unable to read runtime file: $!";	153	or die "unable to read $RUNTIMEFILE file: $!";
131	$RUNTIME = <$fh> + 0.;	154	$RUNTIME = <$fh> + 0.;
132	}	155	}
		156
		157	eval "sub TICK() { $TICK } 1" or die;
133		158
134	mkdir $_	159	mkdir $_
135	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	160	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136		161
137	our $EMERGENCY_POSITION;	162	our $EMERGENCY_POSITION;
138		163
139	sub cf::map::normalise;	164	sub cf::map::normalise;
		165
		166	#############################################################################
		167
		168	%REFLECT = ();
		169	for (@REFLECT) {
		170	my $reflect = JSON::XS::decode_json $_;
		171	$REFLECT{$reflect->{class}} = $reflect;
		172	}
		173
		174	# this is decidedly evil
		175	$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
140		176
141	#############################################################################	177	#############################################################################
142		178
143	=head2 GLOBAL VARIABLES	179	=head2 GLOBAL VARIABLES
144		180
…		…
195		231
196	This array contains the results of the last C<invoke ()> call. When	232	This array contains the results of the last C<invoke ()> call. When
197	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	233	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198	that call.	234	that call.
199		235
		236	=item %cf::REFLECT
		237
		238	Contains, for each (C++) class name, a hash reference with information
		239	about object members (methods, scalars, arrays and flags) and other
		240	metadata, which is useful for introspection.
		241
200	=back	242	=back
201		243
202	=cut	244	=cut
203		245
204	BEGIN {	246	$Coro::State::WARNHOOK = sub {
205	*CORE::GLOBAL::warn = sub {
206	my $msg = join "", @_;	247	my $msg = join "", @_;
207		248
208	$msg .= "\n"	249	$msg .= "\n"
209	unless $msg =~ /\n$/;	250	unless $msg =~ /\n$/;
210		251
211	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	252	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212		253
213	LOG llevError, $msg;	254	LOG llevError, $msg;
214	};	255	};
215	}
216		256
217	$Coro::State::DIEHOOK = sub {	257	$Coro::State::DIEHOOK = sub {
218	return unless $^S eq 0; # "eq", not "=="	258	return unless $^S eq 0; # "eq", not "=="
		259
		260	warn Carp::longmess $_[0];
219		261
220	if ($Coro::current == $Coro::main) {#d#	262	if ($Coro::current == $Coro::main) {#d#
221	warn "DIEHOOK called in main context, Coro bug?\n";#d#	263	warn "DIEHOOK called in main context, Coro bug?\n";#d#
222	return;#d#	264	return;#d#
223	}#d#	265	}#d#
224		266
225	# kill coroutine otherwise	267	# kill coroutine otherwise
226	warn Carp::longmess $_[0];
227	Coro::terminate	268	Coro::terminate
228	};	269	};
229
230	$SIG{__DIE__} = sub { }; #d#?
231		270
232	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	271	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	272	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	273	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	274	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
242	for my $pkg (qw(	281	for my $pkg (qw(
243	cf::global cf::attachable	282	cf::global cf::attachable
244	cf::object cf::object::player	283	cf::object cf::object::player
245	cf::client cf::player	284	cf::client cf::player
246	cf::arch cf::living	285	cf::arch cf::living
		286	cf::map cf::mapspace
247	cf::map cf::party cf::region	287	cf::party cf::region
248	)) {	288	)) {
249	no strict 'refs';
250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	289	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251	}	290	}
252		291
253	$EV::DIED = sub {	292	$EV::DIED = sub {
254	warn "error in event callback: @_";	293	warn "error in event callback: @_";
…		…
296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	335	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297		336
298	sub encode_json($) { $json_coder->encode ($_[0]) }	337	sub encode_json($) { $json_coder->encode ($_[0]) }
299	sub decode_json($) { $json_coder->decode ($_[0]) }	338	sub decode_json($) { $json_coder->decode ($_[0]) }
300		339
		340	=item cf::post_init { BLOCK }
		341
		342	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		343	but I<before> the server starts ticking again.
		344
		345	The cdoeblock will have a single boolean argument to indicate whether this
		346	is a reload or not.
		347
		348	=cut
		349
		350	sub post_init(&) {
		351	push @POST_INIT, shift;
		352	}
		353
301	=item cf::lock_wait $string	354	=item cf::lock_wait $string
302		355
303	Wait until the given lock is available. See cf::lock_acquire.	356	Wait until the given lock is available. See cf::lock_acquire.
304		357
305	=item my $lock = cf::lock_acquire $string	358	=item my $lock = cf::lock_acquire $string
306		359
307	Wait until the given lock is available and then acquires it and returns	360	Wait until the given lock is available and then acquires it and returns
308	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	361	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309	for example when the coroutine gets canceled), the lock is automatically	362	for example when the coroutine gets canceled), the lock is automatically
310	returned.	363	returned.
311		364
312	Locks are *not* recursive, locking from the same coro twice results in a	365	Locks are *not* recursive, locking from the same coro twice results in a
313	deadlocked coro.	366	deadlocked coro.
…		…
319		372
320	Return true if the lock is currently active, i.e. somebody has locked it.	373	Return true if the lock is currently active, i.e. somebody has locked it.
321		374
322	=cut	375	=cut
323		376
324	our %LOCK;	377	our $LOCKS = new Coro::SemaphoreSet;
325	our %LOCKER;#d#
326		378
327	sub lock_wait($) {	379	sub lock_wait($) {
328	my ($key) = @_;	380	$LOCKS->wait ($_[0]);
329
330	if ($LOCKER{$key} == $Coro::current) {#d#
331	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332	return;#d#
333	}#d#
334
335	# wait for lock, if any
336	while ($LOCK{$key}) {
337	push @{ $LOCK{$key} }, $Coro::current;
338	Coro::schedule;
339	}
340	}	381	}
341		382
342	sub lock_acquire($) {	383	sub lock_acquire($) {
343	my ($key) = @_;	384	$LOCKS->guard ($_[0])
344
345	# wait, to be sure we are not locked
346	lock_wait $key;
347
348	$LOCK{$key} = [];
349	$LOCKER{$key} = $Coro::current;#d#
350
351	Coro::guard {
352	delete $LOCKER{$key};#d#
353	# wake up all waiters, to be on the safe side
354	$_->ready for @{ delete $LOCK{$key} };
355	}
356	}	385	}
357		386
358	sub lock_active($) {	387	sub lock_active($) {
359	my ($key) = @_;	388	$LOCKS->count ($_[0]) < 1
360
361	! ! $LOCK{$key}
362	}	389	}
363		390
364	sub freeze_mainloop {	391	sub freeze_mainloop {
365	tick_inhibit_inc;	392	tick_inhibit_inc;
366		393
367	Coro::guard \&tick_inhibit_dec;	394	&Guard::guard (\&tick_inhibit_dec);
368	}	395	}
369		396
370	=item cf::periodic $interval, $cb	397	=item cf::periodic $interval, $cb
371		398
372	Like EV::periodic, but randomly selects a starting point so that the actions	399	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
724		751
725	#############################################################################	752	#############################################################################
726		753
727	=head2 ATTACHABLE OBJECTS	754	=head2 ATTACHABLE OBJECTS
728		755
729	Many objects in crossfire are so-called attachable objects. That means you can	756	Many objects in deliantra are so-called attachable objects. That means you can
730	attach callbacks/event handlers (a collection of which is called an "attachment")	757	attach callbacks/event handlers (a collection of which is called an "attachment")
731	to it. All such attachable objects support the following methods.	758	to it. All such attachable objects support the following methods.
732		759
733	In the following description, CLASS can be any of C<global>, C<object>	760	In the following description, CLASS can be any of C<global>, C<object>
734	C<player>, C<client> or C<map> (i.e. the attachable objects in	761	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
784	=item cf::CLASS::attachment $name, ...	811	=item cf::CLASS::attachment $name, ...
785		812
786	Register an attachment by C<$name> through which attachable objects of the	813	Register an attachment by C<$name> through which attachable objects of the
787	given CLASS can refer to this attachment.	814	given CLASS can refer to this attachment.
788		815
789	Some classes such as crossfire maps and objects can specify attachments	816	Some classes such as deliantra maps and objects can specify attachments
790	that are attached at load/instantiate time, thus the need for a name.	817	that are attached at load/instantiate time, thus the need for a name.
791		818
792	These calls expect any number of the following handler/hook descriptions:	819	These calls expect any number of the following handler/hook descriptions:
793		820
794	=over 4	821	=over 4
…		…
1085		1112
1086	sub reattach {	1113	sub reattach {
1087	# basically do the same as instantiate, without calling instantiate	1114	# basically do the same as instantiate, without calling instantiate
1088	my ($obj) = @_;	1115	my ($obj) = @_;
1089		1116
		1117	# no longer needed after getting rid of delete_package?
1090	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1118	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091		1119
1092	my $registry = $obj->registry;	1120	my $registry = $obj->registry;
1093		1121
1094	@$registry = ();	1122	@$registry = ();
1095		1123
…		…
1141	utf8::decode (my $decname = $filename);	1169	utf8::decode (my $decname = $filename);
1142	warn sprintf "saving %s (%d,%d)\n",	1170	warn sprintf "saving %s (%d,%d)\n",
1143	$decname, length $$rdata, scalar @$objs;	1171	$decname, length $$rdata, scalar @$objs;
1144		1172
1145	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1173	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146	chmod SAVE_MODE, $fh;	1174	aio_chmod $fh, SAVE_MODE;
1147	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1175	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148	aio_fsync $fh if $cf::USE_FSYNC;	1176	if ($cf::USE_FSYNC) {
		1177	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1178	aio_fsync $fh;
		1179	}
1149	close $fh;	1180	aio_close $fh;
1150		1181
1151	if (@$objs) {	1182	if (@$objs) {
1152	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1183	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153	chmod SAVE_MODE, $fh;	1184	aio_chmod $fh, SAVE_MODE;
1154	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1185	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155	aio_write $fh, 0, (length $data), $data, 0;	1186	aio_write $fh, 0, (length $data), $data, 0;
1156	aio_fsync $fh if $cf::USE_FSYNC;	1187	if ($cf::USE_FSYNC) {
		1188	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1189	aio_fsync $fh;
		1190	}
1157	close $fh;	1191	aio_close $fh;
1158	aio_rename "$filename.pst~", "$filename.pst";	1192	aio_rename "$filename.pst~", "$filename.pst";
1159	}	1193	}
1160	} else {	1194	} else {
1161	aio_unlink "$filename.pst";	1195	aio_unlink "$filename.pst";
1162	}	1196	}
1163		1197
1164	aio_rename "$filename~", $filename;	1198	aio_rename "$filename~", $filename;
		1199
		1200	$filename =~ s%/[^/]+$%%;
		1201	aio_pathsync $filename if $cf::USE_FSYNC;
1165	} else {	1202	} else {
1166	warn "FATAL: $filename~: $!\n";	1203	warn "unable to save objects: $filename~: $!\n";
1167	}	1204	}
1168	} else {	1205	} else {
1169	aio_unlink $filename;	1206	aio_unlink $filename;
1170	aio_unlink "$filename.pst";	1207	aio_unlink "$filename.pst";
1171	}	1208	}
…		…
1262	my ($name, $cb) = @_;	1299	my ($name, $cb) = @_;
1263		1300
1264	$EXTICMD{$name} = $cb;	1301	$EXTICMD{$name} = $cb;
1265	}	1302	}
1266		1303
		1304	use File::Glob ();
		1305
1267	cf::player->attach (	1306	cf::player->attach (
1268	on_command => sub {	1307	on_command => sub {
1269	my ($pl, $name, $params) = @_;	1308	my ($pl, $name, $params) = @_;
1270		1309
1271	my $cb = $COMMAND{$name}	1310	my $cb = $COMMAND{$name}
…		…
1303		1342
1304	cf::override;	1343	cf::override;
1305	},	1344	},
1306	);	1345	);
1307		1346
		1347	# "readahead" all extensions
		1348	sub cache_extensions {
		1349	my $grp = IO::AIO::aio_group;
		1350
		1351	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1352	for (grep /\.ext$/, @{$_[0]}) {
		1353	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1354	}
		1355	};
		1356
		1357	$grp
		1358	}
		1359
1308	sub load_extensions {	1360	sub load_extensions {
1309	cf::sync_job {	1361	cf::sync_job {
1310	my %todo;	1362	my %todo;
1311		1363
1312	for my $path (<$LIBDIR/*.ext>) {	1364	for my $path (<$LIBDIR/*.ext>) {
…		…
1331		1383
1332	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1384	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1385	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334		1386
1335	$ext{source} =	1387	$ext{source} =
1336	"package $pkg; use strict; use utf8;\n"	1388	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337	. "#line 1 \"$path\"\n{\n"	1389	. "#line 1 \"$path\"\n{\n"
1338	. $source	1390	. $source
1339	. "\n};\n1";	1391	. "\n};\n1";
1340		1392
1341	$todo{$base} = \%ext;	1393	$todo{$base} = \%ext;
…		…
1381		1433
1382	=back	1434	=back
1383		1435
1384	=head2 CORE EXTENSIONS	1436	=head2 CORE EXTENSIONS
1385		1437
1386	Functions and methods that extend core crossfire objects.	1438	Functions and methods that extend core deliantra objects.
1387		1439
1388	=cut	1440	=cut
1389		1441
1390	package cf::player;	1442	package cf::player;
1391		1443
…		…
1434		1486
1435	sub exists($) {	1487	sub exists($) {
1436	my ($login) = @_;	1488	my ($login) = @_;
1437		1489
1438	$cf::PLAYER{$login}	1490	$cf::PLAYER{$login}
1439	or cf::sync_job { !aio_stat path $login }	1491	or !aio_stat path $login
1440	}	1492	}
1441		1493
1442	sub find($) {	1494	sub find($) {
1443	return $cf::PLAYER{$_[0]} || do {	1495	return $cf::PLAYER{$_[0]} || do {
1444	my $login = $_[0];	1496	my $login = $_[0];
…		…
1456	my $f = new_from_file cf::object::thawer path $login	1508	my $f = new_from_file cf::object::thawer path $login
1457	or return;	1509	or return;
1458		1510
1459	my $pl = cf::player::load_pl $f	1511	my $pl = cf::player::load_pl $f
1460	or return;	1512	or return;
		1513
1461	local $cf::PLAYER_LOADING{$login} = $pl;	1514	local $cf::PLAYER_LOADING{$login} = $pl;
1462	$f->resolve_delayed_derefs;	1515	$f->resolve_delayed_derefs;
1463	$cf::PLAYER{$login} = $pl	1516	$cf::PLAYER{$login} = $pl
1464	}	1517	}
1465	}	1518	}
…		…
1518	my ($pl) = @_;	1571	my ($pl) = @_;
1519		1572
1520	my $name = $pl->ob->name;	1573	my $name = $pl->ob->name;
1521		1574
1522	$pl->{deny_save} = 1;	1575	$pl->{deny_save} = 1;
1523	$pl->password ("*"); # this should lock out the player until we nuked the dir	1576	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1524		1577
1525	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1578	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526	$pl->deactivate;	1579	$pl->deactivate;
		1580	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1581	$pl->ob->check_score;
1527	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1582	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1528	$pl->ns->destroy if $pl->ns;	1583	$pl->ns->destroy if $pl->ns;
1529		1584
1530	my $path = playerdir $pl;	1585	my $path = playerdir $pl;
1531	my $temp = "$path~$cf::RUNTIME~deleting~";	1586	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1570		1625
1571	for my $login (@$dirs) {	1626	for my $login (@$dirs) {
1572	my $path = path $login;	1627	my $path = path $login;
1573		1628
1574	# a .pst is a dead give-away for a valid player	1629	# a .pst is a dead give-away for a valid player
1575	unless (-e "$path.pst") {	1630	# if no pst file found, open and chekc for blocked users
		1631	if (aio_stat "$path.pst") {
1576	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1632	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577	aio_read $fh, 0, 512, my $buf, 0 or next;	1633	aio_read $fh, 0, 512, my $buf, 0 or next;
1578	$buf !~ /^password -------------$/m or next; # official not-valid tag	1634	$buf !~ /^password -------------$/m or next; # official not-valid tag
1579	}	1635	}
1580		1636
…		…
1611	}	1667	}
1612		1668
1613	\@paths	1669	\@paths
1614	}	1670	}
1615		1671
1616	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1672	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617		1673
1618	Expand crossfire pod fragments into protocol xml.	1674	Expand deliantra pod fragments into protocol xml.
1619
1620	=cut
1621
1622	use re 'eval';
1623
1624	my $group;
1625	my $interior; $interior = qr{
1626	# match a pod interior sequence sans C<< >>
1627	(?:
1628	\ (.*?)\ (?{ $group = $^N })
1629	| < (??{$interior}) >
1630	)
1631	}x;
1632
1633	sub expand_cfpod {
1634	my ($self, $pod) = @_;
1635
1636	my $xml;
1637
1638	while () {
1639	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640	$group = $1;
1641
1642	$group =~ s/&/&amp;/g;
1643	$group =~ s/</&lt;/g;
1644
1645	$xml .= $group;
1646	} elsif ($pod =~ m%\G
1647	([BCGHITU])
1648	<
1649	(?:
1650	([^<>]*) (?{ $group = $^N })
1651	| < $interior >
1652	)
1653	>
1654	%gcsx
1655	) {
1656	my ($code, $data) = ($1, $group);
1657
1658	if ($code eq "B") {
1659	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660	} elsif ($code eq "I") {
1661	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662	} elsif ($code eq "U") {
1663	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664	} elsif ($code eq "C") {
1665	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666	} elsif ($code eq "T") {
1667	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668	} elsif ($code eq "G") {
1669	my ($male, $female) = split /\|/, $data;
1670	$data = $self->gender ? $female : $male;
1671	$xml .= expand_cfpod ($self, $data);
1672	} elsif ($code eq "H") {
1673	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675	"")
1676	[$self->{hintmode}];
1677	} else {
1678	$xml .= "error processing '$code($data)' directive";
1679	}
1680	} else {
1681	if ($pod =~ /\G(.+)/) {
1682	warn "parse error while expanding $pod (at $1)";
1683	}
1684	last;
1685	}
1686	}
1687
1688	for ($xml) {
1689	# create single paragraphs (very hackish)
1690	s/(?<=\S)\n(?=\w)/ /g;
1691
1692	# compress some whitespace
1693	s/\s+\n/\n/g; # ws line-ends
1694	s/\n\n+/\n/g; # double lines
1695	s/^\n+//; # beginning lines
1696	s/\n+$//; # ending lines
1697	}
1698
1699	$xml
1700	}
1701
1702	no re 'eval';
1703
1704	sub hintmode {
1705	$_[0]{hintmode} = $_[1] if @_ > 1;
1706	$_[0]{hintmode}
1707	}
1708		1675
1709	=item $player->ext_reply ($msgid, @msg)	1676	=item $player->ext_reply ($msgid, @msg)
1710		1677
1711	Sends an ext reply to the player.	1678	Sends an ext reply to the player.
1712		1679
…		…
1925		1892
1926	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1893	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927	"$UNIQUEDIR/$path"	1894	"$UNIQUEDIR/$path"
1928	}	1895	}
1929		1896
1930	# and all this just because we cannot iterate over
1931	# all maps in C++...
1932	sub change_all_map_light {
1933	my ($change) = @_;
1934
1935	$_->change_map_light ($change)
1936	for grep $_->outdoor, values %cf::MAP;
1937	}
1938
1939	sub decay_objects {	1897	sub decay_objects {
1940	my ($self) = @_;	1898	my ($self) = @_;
1941		1899
1942	return if $self->{deny_reset};	1900	return if $self->{deny_reset};
1943		1901
…		…
2025	sub find {	1983	sub find {
2026	my ($path, $origin) = @_;	1984	my ($path, $origin) = @_;
2027		1985
2028	$path = normalise $path, $origin && $origin->path;	1986	$path = normalise $path, $origin && $origin->path;
2029		1987
2030	cf::lock_wait "map_data:$path";#d#remove	1988	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031	cf::lock_wait "map_find:$path";	1989	my $guard2 = cf::lock_acquire "map_find:$path";
2032		1990
2033	$cf::MAP{$path} || do {	1991	$cf::MAP{$path} || do {
2034	my $guard1 = cf::lock_acquire "map_find:$path";
2035	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037	my $map = new_from_path cf::map $path	1992	my $map = new_from_path cf::map $path
2038	or return;	1993	or return;
2039		1994
2040	$map->{last_save} = $cf::RUNTIME;	1995	$map->{last_save} = $cf::RUNTIME;
2041		1996
…		…
2043	or return;	1998	or return;
2044		1999
2045	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	2000	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046	# doing this can freeze the server in a sync job, obviously	2001	# doing this can freeze the server in a sync job, obviously
2047	#$cf::WAIT_FOR_TICK->wait;	2002	#$cf::WAIT_FOR_TICK->wait;
		2003	undef $guard2;
2048	undef $guard1;	2004	undef $guard1;
2049	undef $guard2;
2050	$map->reset;	2005	$map->reset;
2051	return find $path;	2006	return find $path;
2052	}	2007	}
2053		2008
2054	$cf::MAP{$path} = $map	2009	$cf::MAP{$path} = $map
…		…
2081	my $f = new_from_file cf::object::thawer $self->{load_path};	2036	my $f = new_from_file cf::object::thawer $self->{load_path};
2082	$f->skip_block;	2037	$f->skip_block;
2083	$self->_load_objects ($f)	2038	$self->_load_objects ($f)
2084	or return;	2039	or return;
2085		2040
2086	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2041	$self->post_load_original
2087	if delete $self->{load_original};	2042	if delete $self->{load_original};
2088		2043
2089	if (my $uniq = $self->uniq_path) {	2044	if (my $uniq = $self->uniq_path) {
2090	utf8::encode $uniq;	2045	utf8::encode $uniq;
2091	unless (aio_stat $uniq) {	2046	unless (aio_stat $uniq) {
…		…
2109	unless ($self->{deny_activate}) {	2064	unless ($self->{deny_activate}) {
2110	$self->decay_objects;	2065	$self->decay_objects;
2111	$self->fix_auto_apply;	2066	$self->fix_auto_apply;
2112	$self->update_buttons;	2067	$self->update_buttons;
2113	cf::cede_to_tick;	2068	cf::cede_to_tick;
2114	$self->set_darkness_map;
2115	cf::cede_to_tick;
2116	$self->activate;	2069	$self->activate;
2117	}	2070	}
2118		2071
2119	$self->{last_save} = $cf::RUNTIME;	2072	$self->{last_save} = $cf::RUNTIME;
2120	$self->last_access ($cf::RUNTIME);	2073	$self->last_access ($cf::RUNTIME);
…		…
2286		2239
2287	my $lock = cf::lock_acquire "map_data:$self->{path}";	2240	my $lock = cf::lock_acquire "map_data:$self->{path}";
2288		2241
2289	return if $self->players;	2242	return if $self->players;
2290		2243
2291	warn "resetting map ", $self->path;	2244	warn "resetting map ", $self->path, "\n";
2292		2245
2293	$self->in_memory (cf::MAP_SWAPPED);	2246	$self->in_memory (cf::MAP_SWAPPED);
2294		2247
2295	# need to save uniques path	2248	# need to save uniques path
2296	unless ($self->{deny_save}) {	2249	unless ($self->{deny_save}) {
…		…
2457	can be C<undef>. Does the right thing when the player is currently in a	2410	can be C<undef>. Does the right thing when the player is currently in a
2458	dialogue with the given NPC character.	2411	dialogue with the given NPC character.
2459		2412
2460	=cut	2413	=cut
2461		2414
		2415	our $SAY_CHANNEL = {
		2416	id => "say",
		2417	title => "Map",
		2418	reply => "say ",
		2419	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
		2420	};
		2421
		2422	our $CHAT_CHANNEL = {
		2423	id => "chat",
		2424	title => "Chat",
		2425	reply => "chat ",
		2426	tooltip => "Player chat and shouts, global to the server.",
		2427	};
		2428
2462	# rough implementation of a future "reply" method that works	2429	# rough implementation of a future "reply" method that works
2463	# with dialog boxes.	2430	# with dialog boxes.
2464	#TODO: the first argument must go, split into a $npc->reply_to ( method	2431	#TODO: the first argument must go, split into a $npc->reply_to ( method
2465	sub cf::object::player::reply($$$;$) {	2432	sub cf::object::player::reply($$$;$) {
2466	my ($self, $npc, $msg, $flags) = @_;	2433	my ($self, $npc, $msg, $flags) = @_;
…		…
2477	my $dialog = $pl->{npc_dialog};	2444	my $dialog = $pl->{npc_dialog};
2478	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2445	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479		2446
2480	} else {	2447	} else {
2481	$msg = $npc->name . " says: $msg" if $npc;	2448	$msg = $npc->name . " says: $msg" if $npc;
2482	$self->message ($msg, $flags);	2449	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483	}	2450	}
2484	}	2451	}
2485	}	2452	}
2486		2453
2487	=item $object->send_msg ($channel, $msg, $color, [extra...])	2454	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2512		2479
2513	=item $player_object->enter_link	2480	=item $player_object->enter_link
2514		2481
2515	Freezes the player and moves him/her to a special map (C<{link}>).	2482	Freezes the player and moves him/her to a special map (C<{link}>).
2516		2483
2517	The player should be reasonably safe there for short amounts of time. You	2484	The player should be reasonably safe there for short amounts of time (e.g.
2518	I<MUST> call C<leave_link> as soon as possible, though.	2485	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2486	though, as the palyer cannot control the character while it is on the link
		2487	map.
2519		2488
2520	Will never block.	2489	Will never block.
2521		2490
2522	=item $player_object->leave_link ($map, $x, $y)	2491	=item $player_object->leave_link ($map, $x, $y)
2523		2492
…		…
2581		2550
2582	$map->load;	2551	$map->load;
2583	$map->load_neighbours;	2552	$map->load_neighbours;
2584		2553
2585	return unless $self->contr->active;	2554	return unless $self->contr->active;
2586	$self->activate_recursive;
2587		2555
2588	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2556	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589	$self->enter_map ($map, $x, $y);	2557	$self->enter_map ($map, $x, $y);
		2558
		2559	# only activate afterwards, to support waiting in hooks
		2560	$self->activate_recursive;
2590	}	2561	}
2591		2562
2592	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2563	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593		2564
2594	Moves the player to the given map-path and coordinates by first freezing	2565	Moves the player to the given map-path and coordinates by first freezing
2595	her, loading and preparing them map, calling the provided $check callback	2566	her, loading and preparing them map, calling the provided $check callback
2596	that has to return the map if sucecssful, and then unfreezes the player on	2567	that has to return the map if sucecssful, and then unfreezes the player on
2597	the new (success) or old (failed) map position. In either case, $done will	2568	the new (success) or old (failed) map position. In either case, $done will
2598	be called at the end of this process.	2569	be called at the end of this process.
		2570
		2571	Note that $check will be called with a potentially non-loaded map, so if
		2572	it needs a loaded map it has to call C<< ->load >>.
2599		2573
2600	=cut	2574	=cut
2601		2575
2602	our $GOTOGEN;	2576	our $GOTOGEN;
2603		2577
…		…
2682	}	2656	}
2683		2657
2684	sub prepare_random_map {	2658	sub prepare_random_map {
2685	my ($exit) = @_;	2659	my ($exit) = @_;
2686		2660
2687	my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689	# all this does is basically replace the /! path by	2661	# all this does is basically replace the /! path by
2690	# a new random map path (?random/...) with a seed	2662	# a new random map path (?random/...) with a seed
2691	# that depends on the exit object	2663	# that depends on the exit object
2692		2664
2693	my $rmp = parse_random_map_params $exit->msg;	2665	my $rmp = parse_random_map_params $exit->msg;
…		…
2695	if ($exit->map) {	2667	if ($exit->map) {
2696	$rmp->{region} = $exit->region->name;	2668	$rmp->{region} = $exit->region->name;
2697	$rmp->{origin_map} = $exit->map->path;	2669	$rmp->{origin_map} = $exit->map->path;
2698	$rmp->{origin_x} = $exit->x;	2670	$rmp->{origin_x} = $exit->x;
2699	$rmp->{origin_y} = $exit->y;	2671	$rmp->{origin_y} = $exit->y;
		2672
		2673	$exit->map->touch;
2700	}	2674	}
2701		2675
2702	$rmp->{random_seed} ||= $exit->random_seed;	2676	$rmp->{random_seed} ||= $exit->random_seed;
2703		2677
2704	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);	2678	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
…		…
2708	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2682	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709	aio_write $fh, 0, (length $data), $data, 0;	2683	aio_write $fh, 0, (length $data), $data, 0;
2710	undef $fh;	2684	undef $fh;
2711	aio_rename "$meta~", $meta;	2685	aio_rename "$meta~", $meta;
2712		2686
		2687	my $slaying = "?random/$md5";
		2688
		2689	if ($exit->valid) {
2713	$exit->slaying ("?random/$md5");	2690	$exit->slaying ("?random/$md5");
2714	$exit->msg (undef);	2691	$exit->msg (undef);
		2692	}
2715	}	2693	}
2716	}	2694	}
2717		2695
2718	sub cf::object::player::enter_exit {	2696	sub cf::object::player::enter_exit {
2719	my ($self, $exit) = @_;	2697	my ($self, $exit) = @_;
2720		2698
2721	return unless $self->type == cf::PLAYER;	2699	return unless $self->type == cf::PLAYER;
2722		2700
2723	if ($exit->slaying eq "/!") {
2724	#TODO: this should de-fi-ni-te-ly not be a sync-job
2725	# the problem is that $exit might not survive long enough
2726	# so it needs to be done right now, right here
2727	cf::sync_job { prepare_random_map $exit };
2728	}
2729
2730	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731	my $hp = $exit->stats->hp;
2732	my $sp = $exit->stats->sp;
2733
2734	$self->enter_link;	2701	$self->enter_link;
2735		2702
2736	# if exit is damned, update players death & WoR home-position
2737	$self->contr->savebed ($slaying, $hp, $sp)
2738	if $exit->flag (FLAG_DAMNED);
2739
2740	(async {	2703	(async {
2741	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2704	$Coro::current->{desc} = "enter_exit";
2742		2705
2743	$self->deactivate_recursive; # just to be sure
2744	unless (eval {	2706	unless (eval {
		2707	$self->deactivate_recursive; # just to be sure
		2708
		2709	# random map handling
		2710	{
		2711	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2712
		2713	prepare_random_map $exit
		2714	if $exit->slaying eq "/!";
		2715	}
		2716
		2717	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2718	my $x = $exit->stats->hp;
		2719	my $y = $exit->stats->sp;
		2720
2745	$self->goto ($slaying, $hp, $sp);	2721	$self->goto ($map, $x, $y);
2746		2722
		2723	# if exit is damned, update players death & WoR home-position
		2724	$self->contr->savebed ($map, $x, $y)
		2725	if $exit->flag (cf::FLAG_DAMNED);
		2726
2747	1;	2727	1
2748	}) {	2728	}) {
2749	$self->message ("Something went wrong deep within the crossfire server. "	2729	$self->message ("Something went wrong deep within the deliantra server. "
2750	. "I'll try to bring you back to the map you were before. "	2730	. "I'll try to bring you back to the map you were before. "
2751	. "Please report this to the dungeon master!",	2731	. "Please report this to the dungeon master!",
2752	cf::NDI_UNIQUE | cf::NDI_RED);	2732	cf::NDI_UNIQUE | cf::NDI_RED);
2753		2733
2754	warn "ERROR in enter_exit: $@";	2734	warn "ERROR in enter_exit: $@";
…		…
2820	id => "infobox",	2800	id => "infobox",
2821	title => "Body Parts",	2801	title => "Body Parts",
2822	reply => undef,	2802	reply => undef,
2823	tooltip => "Shows which body parts you posess and are available",	2803	tooltip => "Shows which body parts you posess and are available",
2824	},	2804	},
		2805	"c/statistics" => {
		2806	id => "infobox",
		2807	title => "Statistics",
		2808	reply => undef,
		2809	tooltip => "Shows your primary statistics",
		2810	},
		2811	"c/skills" => {
		2812	id => "infobox",
		2813	title => "Skills",
		2814	reply => undef,
		2815	tooltip => "Shows your experience per skill and item power",
		2816	},
		2817	"c/shopitems" => {
		2818	id => "infobox",
		2819	title => "Shop Items",
		2820	reply => undef,
		2821	tooltip => "Shows the items currently for sale in this shop",
		2822	},
		2823	"c/resistances" => {
		2824	id => "infobox",
		2825	title => "Resistances",
		2826	reply => undef,
		2827	tooltip => "Shows your resistances",
		2828	},
		2829	"c/pets" => {
		2830	id => "infobox",
		2831	title => "Pets",
		2832	reply => undef,
		2833	tooltip => "Shows information abotu your pets/a specific pet",
		2834	},
		2835	"c/perceiveself" => {
		2836	id => "infobox",
		2837	title => "Perceive Self",
		2838	reply => undef,
		2839	tooltip => "You gained detailed knowledge about yourself",
		2840	},
2825	"c/uptime" => {	2841	"c/uptime" => {
2826	id => "infobox",	2842	id => "infobox",
2827	title => "Uptime",	2843	title => "Uptime",
2828	reply => undef,	2844	reply => undef,
2829	tooltip => "How long the server has been running since last restart",	2845	tooltip => "How long the server has been running since last restart",
…		…
2838	id => "party",	2854	id => "party",
2839	title => "Party",	2855	title => "Party",
2840	reply => "gsay ",	2856	reply => "gsay ",
2841	tooltip => "Messages and chat related to your party",	2857	tooltip => "Messages and chat related to your party",
2842	},	2858	},
		2859	"c/death" => {
		2860	id => "death",
		2861	title => "Death",
		2862	reply => undef,
		2863	tooltip => "Reason for and more info about your most recent death",
		2864	},
		2865	"c/say" => $SAY_CHANNEL,
		2866	"c/chat" => $CHAT_CHANNEL,
2843	);	2867	);
2844		2868
2845	sub cf::client::send_msg {	2869	sub cf::client::send_msg {
2846	my ($self, $channel, $msg, $color, @extra) = @_;	2870	my ($self, $channel, $msg, $color, @extra) = @_;
2847		2871
2848	$msg = $self->pl->expand_cfpod ($msg);	2872	$msg = $self->pl->expand_cfpod ($msg)
		2873	unless $color & cf::NDI_VERBATIM;
2849		2874
2850	$color &= cf::NDI_CLIENT_MASK; # just in case...	2875	$color &= cf::NDI_CLIENT_MASK; # just in case...
2851		2876
2852	# check predefined channels, for the benefit of C	2877	# check predefined channels, for the benefit of C
2853	if ($CHANNEL{$channel}) {	2878	if ($CHANNEL{$channel}) {
2854	$channel = $CHANNEL{$channel};	2879	$channel = $CHANNEL{$channel};
2855		2880
2856	$self->ext_msg (channel_info => $channel)	2881	$self->ext_msg (channel_info => $channel);
2857	if $self->can_msg;
2858
2859	$channel = $channel->{id};	2882	$channel = $channel->{id};
2860		2883
2861	} elsif (ref $channel) {	2884	} elsif (ref $channel) {
2862	# send meta info to client, if not yet sent	2885	# send meta info to client, if not yet sent
2863	unless (exists $self->{channel}{$channel->{id}}) {	2886	unless (exists $self->{channel}{$channel->{id}}) {
2864	$self->{channel}{$channel->{id}} = $channel;	2887	$self->{channel}{$channel->{id}} = $channel;
2865	$self->ext_msg (channel_info => $channel)	2888	$self->ext_msg (channel_info => $channel);
2866	if $self->can_msg;
2867	}	2889	}
2868		2890
2869	$channel = $channel->{id};	2891	$channel = $channel->{id};
2870	}	2892	}
2871		2893
2872	return unless @extra || length $msg;	2894	return unless @extra || length $msg;
2873		2895
2874	if ($self->can_msg) {
2875	# default colour, mask it out	2896	# default colour, mask it out
2876	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2897	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2877	if $color & cf::NDI_DEF;	2898	if $color & cf::NDI_DEF;
2878		2899
2879	$self->send_packet ("msg " . $self->{json_coder}->encode (	2900	my $pkt = "msg "
		2901	. $self->{json_coder}->encode (
2880	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2902	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2881	} else {	2903	);
2882	if ($color >= 0) {
2883	# replace some tags by gcfclient-compatible ones
2884	for ($msg) {
2885	1 while
2886	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2887	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2888	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2889	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2890	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2891	}
2892		2904
2893	$color &= cf::NDI_COLOR_MASK;	2905	# try lzf for large packets
		2906	$pkt = "lzf " . Compress::LZF::compress $pkt
		2907	if 1024 <= length $pkt and $self->{can_lzf};
2894		2908
2895	utf8::encode $msg;	2909	# split very large packets
2896		2910	if (8192 < length $pkt and $self->{can_lzf}) {
2897	if (0 && $msg =~ /\[/) {	2911	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2898	# COMMAND/INFO	2912	$pkt = "frag";
2899	$self->send_packet ("drawextinfo $color 10 8 $msg")
2900	} else {
2901	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2902	$self->send_packet ("drawinfo $color $msg")
2903	}
2904	}
2905	}	2913	}
		2914
		2915	$self->send_packet ($pkt);
2906	}	2916	}
2907		2917
2908	=item $client->ext_msg ($type, @msg)	2918	=item $client->ext_msg ($type, @msg)
2909		2919
2910	Sends an ext event to the client.	2920	Sends an ext event to the client.
…		…
3085	The following functions and methods are available within a safe environment:	3095	The following functions and methods are available within a safe environment:
3086		3096
3087	cf::object	3097	cf::object
3088	contr pay_amount pay_player map x y force_find force_add destroy	3098	contr pay_amount pay_player map x y force_find force_add destroy
3089	insert remove name archname title slaying race decrease split	3099	insert remove name archname title slaying race decrease split
		3100	value
3090		3101
3091	cf::object::player	3102	cf::object::player
3092	player	3103	player
3093		3104
3094	cf::player	3105	cf::player
…		…
3099		3110
3100	=cut	3111	=cut
3101		3112
3102	for (	3113	for (
3103	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3114	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3104	insert remove inv name archname title slaying race	3115	insert remove inv nrof name archname title slaying race
3105	decrease split destroy)],	3116	decrease split destroy change_exp value msg lore send_msg)],
3106	["cf::object::player" => qw(player)],	3117	["cf::object::player" => qw(player)],
3107	["cf::player" => qw(peaceful)],	3118	["cf::player" => qw(peaceful send_msg)],
3108	["cf::map" => qw(trigger)],	3119	["cf::map" => qw(trigger)],
3109	) {	3120	) {
3110	no strict 'refs';	3121	no strict 'refs';
3111	my ($pkg, @funs) = @$_;	3122	my ($pkg, @funs) = @$_;
3112	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3123	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3129	my ($code, %vars) = @_;	3140	my ($code, %vars) = @_;
3130		3141
3131	my $qcode = $code;	3142	my $qcode = $code;
3132	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3143	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3133	$qcode =~ s/\n/\\n/g;	3144	$qcode =~ s/\n/\\n/g;
		3145
		3146	%vars = (_dummy => 0) unless %vars;
3134		3147
3135	local $_;	3148	local $_;
3136	local @safe::cf::_safe_eval_args = values %vars;	3149	local @safe::cf::_safe_eval_args = values %vars;
3137		3150
3138	my $eval =	3151	my $eval =
…		…
3368	reload_treasures;	3381	reload_treasures;
3369		3382
3370	warn "finished reloading resource files\n";	3383	warn "finished reloading resource files\n";
3371	}	3384	}
3372		3385
3373	sub init {
3374	my $guard = freeze_mainloop;
3375
3376	reload_resources;
3377	}
3378
3379	sub reload_config {	3386	sub reload_config {
3380	open my $fh, "<:utf8", "$CONFDIR/config"	3387	open my $fh, "<:utf8", "$CONFDIR/config"
3381	or return;	3388	or return;
3382		3389
3383	local $/;	3390	local $/;
…		…
3395	};	3402	};
3396	warn $@ if $@;	3403	warn $@ if $@;
3397	}	3404	}
3398	}	3405	}
3399		3406
		3407	sub pidfile() {
		3408	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3409	or die "$PIDFILE: $!";
		3410	flock $fh, &Fcntl::LOCK_EX
		3411	or die "$PIDFILE: flock: $!";
		3412	$fh
		3413	}
		3414
		3415	# make sure only one server instance is running at any one time
		3416	sub atomic {
		3417	my $fh = pidfile;
		3418
		3419	my $pid = <$fh>;
		3420	kill 9, $pid if $pid > 0;
		3421
		3422	seek $fh, 0, 0;
		3423	print $fh $$;
		3424	}
		3425
		3426	sub main_loop {
		3427	warn "EV::loop starting\n";
		3428	if (1) {
		3429	EV::loop;
		3430	}
		3431	warn "EV::loop returned\n";
		3432	goto &main_loop unless $REALLY_UNLOOP;
		3433	}
		3434
3400	sub main {	3435	sub main {
		3436	cf::init_globals; # initialise logging
		3437
		3438	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3439	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3440	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3441	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3442
		3443	cf::init_experience;
		3444	cf::init_anim;
		3445	cf::init_attackmess;
		3446	cf::init_dynamic;
		3447
		3448	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3449
3401	# we must not ever block the main coroutine	3450	# we must not ever block the main coroutine
3402	local $Coro::idle = sub {	3451	local $Coro::idle = sub {
3403	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3452	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3404	(async {	3453	(async {
3405	$Coro::current->{desc} = "IDLE BUG HANDLER";	3454	$Coro::current->{desc} = "IDLE BUG HANDLER";
3406	EV::loop EV::LOOP_ONESHOT;	3455	EV::loop EV::LOOP_ONESHOT;
3407	})->prio (Coro::PRIO_MAX);	3456	})->prio (Coro::PRIO_MAX);
3408	};	3457	};
3409		3458
3410	{	3459	evthread_start IO::AIO::poll_fileno;
3411	my $guard = freeze_mainloop;	3460
		3461	cf::sync_job {
		3462	reload_resources;
3412	reload_config;	3463	reload_config;
3413	db_init;	3464	db_init;
		3465
		3466	cf::load_settings;
		3467	cf::load_materials;
		3468	cf::init_uuid;
		3469	cf::init_signals;
		3470	cf::init_commands;
		3471	cf::init_skills;
		3472
		3473	cf::init_beforeplay;
		3474
		3475	atomic;
		3476
3414	load_extensions;	3477	load_extensions;
3415		3478
3416	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3479	utime time, time, $RUNTIMEFILE;
3417	evthread_start IO::AIO::poll_fileno;	3480
		3481	# no (long-running) fork's whatsoever before this point(!)
		3482	use POSIX ();
		3483	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3484
		3485	(pop @POST_INIT)->(0) while @POST_INIT;
3418	}	3486	};
3419		3487
3420	EV::loop;	3488	main_loop;
3421	}	3489	}
3422		3490
3423	#############################################################################	3491	#############################################################################
3424	# initialisation and cleanup	3492	# initialisation and cleanup
3425		3493
…		…
3432	};	3500	};
3433	}	3501	}
3434	}	3502	}
3435		3503
3436	sub write_runtime_sync {	3504	sub write_runtime_sync {
3437	my $runtime = "$LOCALDIR/runtime";
3438
3439	# first touch the runtime file to show we are still running:	3505	# first touch the runtime file to show we are still running:
3440	# the fsync below can take a very very long time.	3506	# the fsync below can take a very very long time.
3441		3507
3442	IO::AIO::aio_utime $runtime, undef, undef;	3508	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3443		3509
3444	my $guard = cf::lock_acquire "write_runtime";	3510	my $guard = cf::lock_acquire "write_runtime";
3445		3511
3446	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3512	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3447	or return;	3513	or return;
3448		3514
3449	my $value = $cf::RUNTIME + 90 + 10;	3515	my $value = $cf::RUNTIME + 90 + 10;
3450	# 10 is the runtime save interval, for a monotonic clock	3516	# 10 is the runtime save interval, for a monotonic clock
3451	# 60 allows for the watchdog to kill the server.	3517	# 60 allows for the watchdog to kill the server.
…		…
3461	aio_utime $fh, undef, undef;	3527	aio_utime $fh, undef, undef;
3462		3528
3463	close $fh	3529	close $fh
3464	or return;	3530	or return;
3465		3531
3466	aio_rename "$runtime~", $runtime	3532	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3467	and return;	3533	and return;
3468		3534
3469	warn "runtime file written.\n";	3535	warn "runtime file written.\n";
3470		3536
3471	1	3537	1
…		…
3483	my $uuid = "$LOCALDIR/uuid";	3549	my $uuid = "$LOCALDIR/uuid";
3484		3550
3485	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644	3551	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486	or return;	3552	or return;
3487		3553
3488	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3554	my $value = uuid_seq uuid_cur;
		3555
		3556	unless ($value) {
		3557	warn "cowardly refusing to write zero uuid value!\n";
		3558	return;
		3559	}
		3560
		3561	my $value = uuid_str $value + $uuid_skip;
3489	$uuid_skip = 0;	3562	$uuid_skip = 0;
3490		3563
3491	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3564	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3492	and return;	3565	and return;
3493		3566
…		…
3515	}	3588	}
3516		3589
3517	sub emergency_save() {	3590	sub emergency_save() {
3518	my $freeze_guard = cf::freeze_mainloop;	3591	my $freeze_guard = cf::freeze_mainloop;
3519		3592
3520	warn "enter emergency perl save\n";	3593	warn "emergency_perl_save: enter\n";
3521		3594
3522	cf::sync_job {	3595	cf::sync_job {
		3596	# this is a trade-off: we want to be very quick here, so
		3597	# save all maps without fsync, and later call a global sync
		3598	# (which in turn might be very very slow)
		3599	local $USE_FSYNC = 0;
		3600
3523	# use a peculiar iteration method to avoid tripping on perl	3601	# use a peculiar iteration method to avoid tripping on perl
3524	# refcount bugs in for. also avoids problems with players	3602	# refcount bugs in for. also avoids problems with players
3525	# and maps saved/destroyed asynchronously.	3603	# and maps saved/destroyed asynchronously.
3526	warn "begin emergency player save\n";	3604	warn "emergency_perl_save: begin player save\n";
3527	for my $login (keys %cf::PLAYER) {	3605	for my $login (keys %cf::PLAYER) {
3528	my $pl = $cf::PLAYER{$login} or next;	3606	my $pl = $cf::PLAYER{$login} or next;
3529	$pl->valid or next;	3607	$pl->valid or next;
3530	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3608	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3531	$pl->save;	3609	$pl->save;
3532	}	3610	}
3533	warn "end emergency player save\n";	3611	warn "emergency_perl_save: end player save\n";
3534		3612
3535	warn "begin emergency map save\n";	3613	warn "emergency_perl_save: begin map save\n";
3536	for my $path (keys %cf::MAP) {	3614	for my $path (keys %cf::MAP) {
3537	my $map = $cf::MAP{$path} or next;	3615	my $map = $cf::MAP{$path} or next;
3538	$map->valid or next;	3616	$map->valid or next;
3539	$map->save;	3617	$map->save;
3540	}	3618	}
3541	warn "end emergency map save\n";	3619	warn "emergency_perl_save: end map save\n";
3542		3620
3543	warn "begin emergency database checkpoint\n";	3621	warn "emergency_perl_save: begin database checkpoint\n";
3544	BDB::db_env_txn_checkpoint $DB_ENV;	3622	BDB::db_env_txn_checkpoint $DB_ENV;
3545	warn "end emergency database checkpoint\n";	3623	warn "emergency_perl_save: end database checkpoint\n";
3546		3624
3547	warn "begin write uuid\n";	3625	warn "emergency_perl_save: begin write uuid\n";
3548	write_uuid_sync 1;	3626	write_uuid_sync 1;
3549	warn "end write uuid\n";	3627	warn "emergency_perl_save: end write uuid\n";
3550	};	3628	};
3551		3629
		3630	warn "emergency_perl_save: starting sync()\n";
		3631	IO::AIO::aio_sync sub {
		3632	warn "emergency_perl_save: finished sync()\n";
		3633	};
		3634
3552	warn "leave emergency perl save\n";	3635	warn "emergency_perl_save: leave\n";
3553	}	3636	}
3554		3637
3555	sub post_cleanup {	3638	sub post_cleanup {
3556	my ($make_core) = @_;	3639	my ($make_core) = @_;
3557		3640
3558	warn Carp::longmess "post_cleanup backtrace"	3641	warn Carp::longmess "post_cleanup backtrace"
3559	if $make_core;	3642	if $make_core;
		3643
		3644	my $fh = pidfile;
		3645	unlink $PIDFILE if <$fh> == $$;
		3646	}
		3647
		3648	# a safer delete_package, copied from Symbol
		3649	sub clear_package($) {
		3650	my $pkg = shift;
		3651
		3652	# expand to full symbol table name if needed
		3653	unless ($pkg =~ /^main::.*::$/) {
		3654	$pkg = "main$pkg" if $pkg =~ /^::/;
		3655	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3656	$pkg .= '::' unless $pkg =~ /::$/;
		3657	}
		3658
		3659	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3660	my $stem_symtab = *{$stem}{HASH};
		3661
		3662	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3663	or return;
		3664
		3665	# clear all symbols
		3666	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3667	for my $name (keys %$leaf_symtab) {
		3668	_gv_clear *{"$pkg$name"};
		3669	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3670	}
		3671	warn "cleared package $pkg\n";#d#
3560	}	3672	}
3561		3673
3562	sub do_reload_perl() {	3674	sub do_reload_perl() {
3563	# can/must only be called in main	3675	# can/must only be called in main
3564	if ($Coro::current != $Coro::main) {	3676	if ($Coro::current != $Coro::main) {
3565	warn "can only reload from main coroutine";	3677	warn "can only reload from main coroutine";
3566	return;	3678	return;
3567	}	3679	}
3568		3680
		3681	return if $RELOAD++;
		3682
		3683	my $t1 = EV::time;
		3684
		3685	while ($RELOAD) {
3569	warn "reloading...";	3686	warn "reloading...";
3570		3687
3571	warn "entering sync_job";	3688	warn "entering sync_job";
3572		3689
3573	cf::sync_job {	3690	cf::sync_job {
3574	cf::write_runtime_sync; # external watchdog should not bark	3691	cf::write_runtime_sync; # external watchdog should not bark
3575	cf::emergency_save;	3692	cf::emergency_save;
3576	cf::write_runtime_sync; # external watchdog should not bark	3693	cf::write_runtime_sync; # external watchdog should not bark
3577		3694
3578	warn "syncing database to disk";	3695	warn "syncing database to disk";
3579	BDB::db_env_txn_checkpoint $DB_ENV;	3696	BDB::db_env_txn_checkpoint $DB_ENV;
3580		3697
3581	# if anything goes wrong in here, we should simply crash as we already saved	3698	# if anything goes wrong in here, we should simply crash as we already saved
3582		3699
3583	warn "flushing outstanding aio requests";	3700	warn "flushing outstanding aio requests";
3584	for (;;) {
3585	BDB::flush;
3586	IO::AIO::flush;
3587	Coro::cede_notself;
3588	last unless IO::AIO::nreqs || BDB::nreqs;	3701	while (IO::AIO::nreqs || BDB::nreqs) {
3589	warn "iterate...";	3702	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3590	}
3591
3592	++$RELOAD;
3593
3594	warn "cancelling all extension coros";
3595	$_->cancel for values %EXT_CORO;
3596	%EXT_CORO = ();
3597
3598	warn "removing commands";
3599	%COMMAND = ();
3600
3601	warn "removing ext/exti commands";
3602	%EXTCMD = ();
3603	%EXTICMD = ();
3604
3605	warn "unloading/nuking all extensions";
3606	for my $pkg (@EXTS) {
3607	warn "... unloading $pkg";
3608
3609	if (my $cb = $pkg->can ("unload")) {
3610	eval {
3611	$cb->($pkg);
3612	1
3613	} or warn "$pkg unloaded, but with errors: $@";
3614	}	3703	}
3615		3704
3616	warn "... nuking $pkg";	3705	warn "cancelling all extension coros";
3617	Symbol::delete_package $pkg;	3706	$_->cancel for values %EXT_CORO;
3618	}	3707	%EXT_CORO = ();
3619		3708
3620	warn "unloading all perl modules loaded from $LIBDIR";	3709	warn "removing commands";
3621	while (my ($k, $v) = each %INC) {	3710	%COMMAND = ();
3622	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3623		3711
		3712	warn "removing ext/exti commands";
		3713	%EXTCMD = ();
		3714	%EXTICMD = ();
		3715
		3716	warn "unloading/nuking all extensions";
		3717	for my $pkg (@EXTS) {
3624	warn "... unloading $k";	3718	warn "... unloading $pkg";
3625	delete $INC{$k};
3626		3719
3627	$k =~ s/\.pm$//;
3628	$k =~ s/\//::/g;
3629
3630	if (my $cb = $k->can ("unload_module")) {	3720	if (my $cb = $pkg->can ("unload")) {
		3721	eval {
3631	$cb->();	3722	$cb->($pkg);
		3723	1
		3724	} or warn "$pkg unloaded, but with errors: $@";
		3725	}
		3726
		3727	warn "... clearing $pkg";
		3728	clear_package $pkg;
3632	}	3729	}
3633		3730
3634	Symbol::delete_package $k;	3731	warn "unloading all perl modules loaded from $LIBDIR";
		3732	while (my ($k, $v) = each %INC) {
		3733	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3734
		3735	warn "... unloading $k";
		3736	delete $INC{$k};
		3737
		3738	$k =~ s/\.pm$//;
		3739	$k =~ s/\//::/g;
		3740
		3741	if (my $cb = $k->can ("unload_module")) {
		3742	$cb->();
		3743	}
		3744
		3745	clear_package $k;
3635	}	3746	}
3636		3747
3637	warn "getting rid of safe::, as good as possible";	3748	warn "getting rid of safe::, as good as possible";
3638	Symbol::delete_package "safe::$_"	3749	clear_package "safe::$_"
3639	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3750	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3640		3751
3641	warn "unloading cf.pm \"a bit\"";	3752	warn "unloading cf.pm \"a bit\"";
3642	delete $INC{"cf.pm"};	3753	delete $INC{"cf.pm"};
3643	delete $INC{"cf/pod.pm"};	3754	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3644		3755
3645	# don't, removes xs symbols, too,	3756	# don't, removes xs symbols, too,
3646	# and global variables created in xs	3757	# and global variables created in xs
3647	#Symbol::delete_package __PACKAGE__;	3758	#clear_package __PACKAGE__;
3648		3759
3649	warn "unload completed, starting to reload now";	3760	warn "unload completed, starting to reload now";
3650		3761
3651	warn "reloading cf.pm";	3762	warn "reloading cf.pm";
3652	require cf;	3763	require cf;
3653	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3764	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3654		3765
3655	warn "loading config and database again";	3766	warn "loading config and database again";
3656	cf::reload_config;	3767	cf::reload_config;
3657		3768
3658	warn "loading extensions";	3769	warn "loading extensions";
3659	cf::load_extensions;	3770	cf::load_extensions;
3660		3771
		3772	if ($REATTACH_ON_RELOAD) {
3661	warn "reattaching attachments to objects/players";	3773	warn "reattaching attachments to objects/players";
3662	_global_reattach; # objects, sockets	3774	_global_reattach; # objects, sockets
3663	warn "reattaching attachments to maps";	3775	warn "reattaching attachments to maps";
3664	reattach $_ for values %MAP;	3776	reattach $_ for values %MAP;
3665	warn "reattaching attachments to players";	3777	warn "reattaching attachments to players";
3666	reattach $_ for values %PLAYER;	3778	reattach $_ for values %PLAYER;
		3779	}
3667		3780
		3781	warn "running post_init jobs";
		3782	(pop @POST_INIT)->(1) while @POST_INIT;
		3783
3668	warn "leaving sync_job";	3784	warn "leaving sync_job";
3669		3785
3670	1	3786	1
3671	} or do {	3787	} or do {
3672	warn $@;	3788	warn $@;
3673	cf::cleanup "error while reloading, exiting.";	3789	cf::cleanup "error while reloading, exiting.";
3674	};	3790	};
3675		3791
3676	warn "reloaded";	3792	warn "reloaded";
		3793	--$RELOAD;
		3794	}
		3795
		3796	$t1 = EV::time - $t1;
		3797	warn "reload completed in ${t1}s\n";
3677	};	3798	};
3678		3799
3679	our $RELOAD_WATCHER; # used only during reload	3800	our $RELOAD_WATCHER; # used only during reload
3680		3801
3681	sub reload_perl() {	3802	sub reload_perl() {
3682	# doing reload synchronously and two reloads happen back-to-back,	3803	# doing reload synchronously and two reloads happen back-to-back,
3683	# coro crashes during coro_state_free->destroy here.	3804	# coro crashes during coro_state_free->destroy here.
3684		3805
		3806	$RELOAD_WATCHER ||= cf::async {
		3807	Coro::AIO::aio_wait cache_extensions;
		3808
3685	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3809	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3686	do_reload_perl;	3810	do_reload_perl;
3687	undef $RELOAD_WATCHER;	3811	undef $RELOAD_WATCHER;
		3812	};
3688	};	3813	};
3689	}	3814	}
3690		3815
3691	register_command "reload" => sub {	3816	register_command "reload" => sub {
3692	my ($who, $arg) = @_;	3817	my ($who, $arg) = @_;
…		…
3763	{	3888	{
3764	# configure BDB	3889	# configure BDB
3765		3890
3766	BDB::min_parallel 8;	3891	BDB::min_parallel 8;
3767	BDB::max_poll_reqs $TICK * 0.1;	3892	BDB::max_poll_reqs $TICK * 0.1;
3768	$Coro::BDB::WATCHER->priority (1);	3893	$AnyEvent::BDB::WATCHER->priority (1);
3769		3894
3770	unless ($DB_ENV) {	3895	unless ($DB_ENV) {
3771	$DB_ENV = BDB::db_env_create;	3896	$DB_ENV = BDB::db_env_create;
3772	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3897	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3773	| BDB::LOG_AUTOREMOVE, 1);	3898	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3899	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3774	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3900	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3901	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3776		3902
3777	cf::sync_job {	3903	cf::sync_job {
3778	eval {	3904	eval {
…		…
3804	{	3930	{
3805	# configure IO::AIO	3931	# configure IO::AIO
3806		3932
3807	IO::AIO::min_parallel 8;	3933	IO::AIO::min_parallel 8;
3808	IO::AIO::max_poll_time $TICK * 0.1;	3934	IO::AIO::max_poll_time $TICK * 0.1;
3809	$Coro::AIO::WATCHER->priority (1);	3935	undef $AnyEvent::AIO::WATCHER;
3810	}	3936	}
3811		3937
3812	my $_log_backtrace;	3938	my $_log_backtrace;
3813		3939
3814	sub _log_backtrace {	3940	sub _log_backtrace {
…		…
3817	$msg =~ s/\n//;	3943	$msg =~ s/\n//;
3818		3944
3819	# limit the # of concurrent backtraces	3945	# limit the # of concurrent backtraces
3820	if ($_log_backtrace < 2) {	3946	if ($_log_backtrace < 2) {
3821	++$_log_backtrace;	3947	++$_log_backtrace;
		3948	my $perl_bt = Carp::longmess $msg;
3822	async {	3949	async {
3823	$Coro::current->{desc} = "abt $msg";	3950	$Coro::current->{desc} = "abt $msg";
3824		3951
3825	my @bt = fork_call {	3952	my @bt = fork_call {
3826	@addr = map { sprintf "%x", $_ } @addr;	3953	@addr = map { sprintf "%x", $_ } @addr;
…		…
3837	}	3964	}
3838		3965
3839	@funcs	3966	@funcs
3840	};	3967	};
3841		3968
3842	LOG llevInfo, "[ABT] $msg\n";	3969	LOG llevInfo, "[ABT] $perl_bt\n";
		3970	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3843	LOG llevInfo, "[ABT] $_\n" for @bt;	3971	LOG llevInfo, "[ABT] $_\n" for @bt;
3844	--$_log_backtrace;	3972	--$_log_backtrace;
3845	};	3973	};
3846	} else {	3974	} else {
3847	LOG llevInfo, "[ABT] $msg\n";	3975	LOG llevInfo, "[ABT] $msg\n";
3848	LOG llevInfo, "[ABT] [suppressed]\n";	3976	LOG llevInfo, "[ABT] [suppressed]\n";
3849	}	3977	}
3850	}	3978	}
3851		3979
3852	# load additional modules	3980	# load additional modules
3853	use cf::pod;	3981	require "cf/$_.pm" for @EXTRA_MODULES;
3854		3982
3855	END { cf::emergency_save }	3983	END { cf::emergency_save }
3856		3984
3857	1	3985	1
3858		3986

Diff Legend

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