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.420 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 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
65	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66		76
67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	77	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68		78
69	our %COMMAND = ();	79	our %COMMAND = ();
70	our %COMMAND_TIME = ();	80	our %COMMAND_TIME = ();
…		…
73	our %EXTCMD = ();	83	our %EXTCMD = ();
74	our %EXTICMD = ();	84	our %EXTICMD = ();
75	our %EXT_CORO = (); # coroutines bound to extensions	85	our %EXT_CORO = (); # coroutines bound to extensions
76	our %EXT_MAP = (); # pluggable maps	86	our %EXT_MAP = (); # pluggable maps
77		87
78	our $RELOAD; # number of reloads so far	88	our $RELOAD; # number of reloads so far, non-zero while in reload
79	our @EVENT;	89	our @EVENT;
80		90
81	our $CONFDIR = confdir;	91	our $CONFDIR = confdir;
82	our $DATADIR = datadir;	92	our $DATADIR = datadir;
83	our $LIBDIR = "$DATADIR/ext";	93	our $LIBDIR = "$DATADIR/ext";
84	our $PODDIR = "$DATADIR/pod";	94	our $PODDIR = "$DATADIR/pod";
85	our $MAPDIR = "$DATADIR/" . mapdir;	95	our $MAPDIR = "$DATADIR/" . mapdir;
86	our $LOCALDIR = localdir;	96	our $LOCALDIR = localdir;
87	our $TMPDIR = "$LOCALDIR/" . tmpdir;	97	our $TMPDIR = "$LOCALDIR/" . tmpdir;
88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	98	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	99	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90	our $RANDOMDIR = "$LOCALDIR/random";	100	our $RANDOMDIR = "$LOCALDIR/random";
91	our $BDBDIR = "$LOCALDIR/db";	101	our $BDBDIR = "$LOCALDIR/db";
		102	our $PIDFILE = "$LOCALDIR/pid";
		103	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		104
92	our %RESOURCE;	105	our %RESOURCE;
93		106
94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	107	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	108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97	our $NEXT_TICK;	109	our $NEXT_TICK;
98	our $USE_FSYNC = 1; # use fsync to write maps - default off	110	our $USE_FSYNC = 1; # use fsync to write maps - default off
99		111
100	our $BDB_POLL_WATCHER;
101	our $BDB_DEADLOCK_WATCHER;	112	our $BDB_DEADLOCK_WATCHER;
102	our $BDB_CHECKPOINT_WATCHER;	113	our $BDB_CHECKPOINT_WATCHER;
103	our $BDB_TRICKLE_WATCHER;	114	our $BDB_TRICKLE_WATCHER;
104	our $DB_ENV;	115	our $DB_ENV;
105		116
		117	our @EXTRA_MODULES = qw(pod mapscript);
		118
106	our %CFG;	119	our %CFG;
107		120
108	our $UPTIME; $UPTIME ||= time;	121	our $UPTIME; $UPTIME ||= time;
109	our $RUNTIME;	122	our $RUNTIME;
110	our $NOW;	123	our $NOW;
…		…
119	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	132	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120	our $LOADAVG; # same thing, but with alpha-smoothing	133	our $LOADAVG; # same thing, but with alpha-smoothing
121	our $JITTER; # average jitter	134	our $JITTER; # average jitter
122	our $TICK_START; # for load detecting purposes	135	our $TICK_START; # for load detecting purposes
123		136
		137	our @POST_INIT;
		138
		139	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
		140
124	binmode STDOUT;	141	binmode STDOUT;
125	binmode STDERR;	142	binmode STDERR;
126		143
127	# read virtual server time, if available	144	# read virtual server time, if available
128	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	145	unless ($RUNTIME || !-e $RUNTIMEFILE) {
129	open my $fh, "<", "$LOCALDIR/runtime"	146	open my $fh, "<", $RUNTIMEFILE
130	or die "unable to read runtime file: $!";	147	or die "unable to read $RUNTIMEFILE file: $!";
131	$RUNTIME = <$fh> + 0.;	148	$RUNTIME = <$fh> + 0.;
132	}	149	}
133		150
134	mkdir $_	151	mkdir $_
135	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	152	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
…		…
242	for my $pkg (qw(	259	for my $pkg (qw(
243	cf::global cf::attachable	260	cf::global cf::attachable
244	cf::object cf::object::player	261	cf::object cf::object::player
245	cf::client cf::player	262	cf::client cf::player
246	cf::arch cf::living	263	cf::arch cf::living
		264	cf::map cf::mapspace
247	cf::map cf::party cf::region	265	cf::party cf::region
248	)) {	266	)) {
249	no strict 'refs';
250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	267	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251	}	268	}
252		269
253	$EV::DIED = sub {	270	$EV::DIED = sub {
254	warn "error in event callback: @_";	271	warn "error in event callback: @_";
…		…
296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	313	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297		314
298	sub encode_json($) { $json_coder->encode ($_[0]) }	315	sub encode_json($) { $json_coder->encode ($_[0]) }
299	sub decode_json($) { $json_coder->decode ($_[0]) }	316	sub decode_json($) { $json_coder->decode ($_[0]) }
300		317
		318	=item cf::post_init { BLOCK }
		319
		320	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		321	but I<before> the server starts ticking again.
		322
		323	The cdoeblock will have a single boolean argument to indicate whether this
		324	is a reload or not.
		325
		326	=cut
		327
		328	sub post_init(&) {
		329	push @POST_INIT, shift;
		330	}
		331
301	=item cf::lock_wait $string	332	=item cf::lock_wait $string
302		333
303	Wait until the given lock is available. See cf::lock_acquire.	334	Wait until the given lock is available. See cf::lock_acquire.
304		335
305	=item my $lock = cf::lock_acquire $string	336	=item my $lock = cf::lock_acquire $string
306		337
307	Wait until the given lock is available and then acquires it and returns	338	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,	339	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	340	for example when the coroutine gets canceled), the lock is automatically
310	returned.	341	returned.
311		342
312	Locks are *not* recursive, locking from the same coro twice results in a	343	Locks are *not* recursive, locking from the same coro twice results in a
313	deadlocked coro.	344	deadlocked coro.
…		…
319		350
320	Return true if the lock is currently active, i.e. somebody has locked it.	351	Return true if the lock is currently active, i.e. somebody has locked it.
321		352
322	=cut	353	=cut
323		354
324	our %LOCK;	355	our $LOCKS = new Coro::SemaphoreSet;
325	our %LOCKER;#d#
326		356
327	sub lock_wait($) {	357	sub lock_wait($) {
328	my ($key) = @_;	358	$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	}	359	}
341		360
342	sub lock_acquire($) {	361	sub lock_acquire($) {
343	my ($key) = @_;	362	$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	}	363	}
357		364
358	sub lock_active($) {	365	sub lock_active($) {
359	my ($key) = @_;	366	$LOCKS->count ($_[0]) < 1
360
361	! ! $LOCK{$key}
362	}	367	}
363		368
364	sub freeze_mainloop {	369	sub freeze_mainloop {
365	tick_inhibit_inc;	370	tick_inhibit_inc;
366		371
367	Coro::guard \&tick_inhibit_dec;	372	&Guard::guard (\&tick_inhibit_dec);
368	}	373	}
369		374
370	=item cf::periodic $interval, $cb	375	=item cf::periodic $interval, $cb
371		376
372	Like EV::periodic, but randomly selects a starting point so that the actions	377	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
427	}	432	}
428	}	433	}
429	};	434	};
430		435
431	sub get_slot($;$$) {	436	sub get_slot($;$$) {
432	return if tick_inhibit;	437	return if tick_inhibit || $Coro::current == $Coro::main;
433		438
434	my ($time, $pri, $name) = @_;	439	my ($time, $pri, $name) = @_;
435		440
436	$time = $TICK * .6 if $time > $TICK * .6;	441	$time = $TICK * .6 if $time > $TICK * .6;
437	my $sig = new Coro::Signal;	442	my $sig = new Coro::Signal;
…		…
724		729
725	#############################################################################	730	#############################################################################
726		731
727	=head2 ATTACHABLE OBJECTS	732	=head2 ATTACHABLE OBJECTS
728		733
729	Many objects in crossfire are so-called attachable objects. That means you can	734	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")	735	attach callbacks/event handlers (a collection of which is called an "attachment")
731	to it. All such attachable objects support the following methods.	736	to it. All such attachable objects support the following methods.
732		737
733	In the following description, CLASS can be any of C<global>, C<object>	738	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	739	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
784	=item cf::CLASS::attachment $name, ...	789	=item cf::CLASS::attachment $name, ...
785		790
786	Register an attachment by C<$name> through which attachable objects of the	791	Register an attachment by C<$name> through which attachable objects of the
787	given CLASS can refer to this attachment.	792	given CLASS can refer to this attachment.
788		793
789	Some classes such as crossfire maps and objects can specify attachments	794	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.	795	that are attached at load/instantiate time, thus the need for a name.
791		796
792	These calls expect any number of the following handler/hook descriptions:	797	These calls expect any number of the following handler/hook descriptions:
793		798
794	=over 4	799	=over 4
…		…
1085		1090
1086	sub reattach {	1091	sub reattach {
1087	# basically do the same as instantiate, without calling instantiate	1092	# basically do the same as instantiate, without calling instantiate
1088	my ($obj) = @_;	1093	my ($obj) = @_;
1089		1094
		1095	# no longer needed after getting rid of delete_package?
1090	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1096	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091		1097
1092	my $registry = $obj->registry;	1098	my $registry = $obj->registry;
1093		1099
1094	@$registry = ();	1100	@$registry = ();
1095		1101
…		…
1141	utf8::decode (my $decname = $filename);	1147	utf8::decode (my $decname = $filename);
1142	warn sprintf "saving %s (%d,%d)\n",	1148	warn sprintf "saving %s (%d,%d)\n",
1143	$decname, length $$rdata, scalar @$objs;	1149	$decname, length $$rdata, scalar @$objs;
1144		1150
1145	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1151	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146	chmod SAVE_MODE, $fh;	1152	aio_chmod $fh, SAVE_MODE;
1147	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1153	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148	aio_fsync $fh if $cf::USE_FSYNC;	1154	aio_fsync $fh if $cf::USE_FSYNC;
1149	close $fh;	1155	aio_close $fh;
1150		1156
1151	if (@$objs) {	1157	if (@$objs) {
1152	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1158	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153	chmod SAVE_MODE, $fh;	1159	aio_chmod $fh, SAVE_MODE;
1154	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1160	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155	aio_write $fh, 0, (length $data), $data, 0;	1161	aio_write $fh, 0, (length $data), $data, 0;
1156	aio_fsync $fh if $cf::USE_FSYNC;	1162	aio_fsync $fh if $cf::USE_FSYNC;
1157	close $fh;	1163	aio_close $fh;
1158	aio_rename "$filename.pst~", "$filename.pst";	1164	aio_rename "$filename.pst~", "$filename.pst";
1159	}	1165	}
1160	} else {	1166	} else {
1161	aio_unlink "$filename.pst";	1167	aio_unlink "$filename.pst";
1162	}	1168	}
1163		1169
1164	aio_rename "$filename~", $filename;	1170	aio_rename "$filename~", $filename;
		1171
		1172	$filename =~ s%/[^/]+$%%;
		1173	aio_pathsync $filename if $cf::USE_FSYNC;
1165	} else {	1174	} else {
1166	warn "FATAL: $filename~: $!\n";	1175	warn "unable to save objects: $filename~: $!\n";
1167	}	1176	}
1168	} else {	1177	} else {
1169	aio_unlink $filename;	1178	aio_unlink $filename;
1170	aio_unlink "$filename.pst";	1179	aio_unlink "$filename.pst";
1171	}	1180	}
…		…
1262	my ($name, $cb) = @_;	1271	my ($name, $cb) = @_;
1263		1272
1264	$EXTICMD{$name} = $cb;	1273	$EXTICMD{$name} = $cb;
1265	}	1274	}
1266		1275
		1276	use File::Glob ();
		1277
1267	cf::player->attach (	1278	cf::player->attach (
1268	on_command => sub {	1279	on_command => sub {
1269	my ($pl, $name, $params) = @_;	1280	my ($pl, $name, $params) = @_;
1270		1281
1271	my $cb = $COMMAND{$name}	1282	my $cb = $COMMAND{$name}
…		…
1303		1314
1304	cf::override;	1315	cf::override;
1305	},	1316	},
1306	);	1317	);
1307		1318
		1319	# "readahead" all extensions
		1320	sub cache_extensions {
		1321	my $grp = IO::AIO::aio_group;
		1322
		1323	add $grp IO::AIO::aio_readdir $LIBDIR, sub {
		1324	for (grep /\.ext$/, @{$_[0]}) {
		1325	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1326	}
		1327	};
		1328
		1329	$grp
		1330	}
		1331
1308	sub load_extensions {	1332	sub load_extensions {
1309	cf::sync_job {	1333	cf::sync_job {
1310	my %todo;	1334	my %todo;
1311		1335
1312	for my $path (<$LIBDIR/*.ext>) {	1336	for my $path (<$LIBDIR/*.ext>) {
…		…
1331		1355
1332	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1356	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1357	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334		1358
1335	$ext{source} =	1359	$ext{source} =
1336	"package $pkg; use strict; use utf8;\n"	1360	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337	. "#line 1 \"$path\"\n{\n"	1361	. "#line 1 \"$path\"\n{\n"
1338	. $source	1362	. $source
1339	. "\n};\n1";	1363	. "\n};\n1";
1340		1364
1341	$todo{$base} = \%ext;	1365	$todo{$base} = \%ext;
…		…
1381		1405
1382	=back	1406	=back
1383		1407
1384	=head2 CORE EXTENSIONS	1408	=head2 CORE EXTENSIONS
1385		1409
1386	Functions and methods that extend core crossfire objects.	1410	Functions and methods that extend core deliantra objects.
1387		1411
1388	=cut	1412	=cut
1389		1413
1390	package cf::player;	1414	package cf::player;
1391		1415
…		…
1434		1458
1435	sub exists($) {	1459	sub exists($) {
1436	my ($login) = @_;	1460	my ($login) = @_;
1437		1461
1438	$cf::PLAYER{$login}	1462	$cf::PLAYER{$login}
1439	or cf::sync_job { !aio_stat path $login }	1463	or !aio_stat path $login
1440	}	1464	}
1441		1465
1442	sub find($) {	1466	sub find($) {
1443	return $cf::PLAYER{$_[0]} || do {	1467	return $cf::PLAYER{$_[0]} || do {
1444	my $login = $_[0];	1468	my $login = $_[0];
…		…
1456	my $f = new_from_file cf::object::thawer path $login	1480	my $f = new_from_file cf::object::thawer path $login
1457	or return;	1481	or return;
1458		1482
1459	my $pl = cf::player::load_pl $f	1483	my $pl = cf::player::load_pl $f
1460	or return;	1484	or return;
		1485
1461	local $cf::PLAYER_LOADING{$login} = $pl;	1486	local $cf::PLAYER_LOADING{$login} = $pl;
1462	$f->resolve_delayed_derefs;	1487	$f->resolve_delayed_derefs;
1463	$cf::PLAYER{$login} = $pl	1488	$cf::PLAYER{$login} = $pl
1464	}	1489	}
1465	}	1490	}
…		…
1518	my ($pl) = @_;	1543	my ($pl) = @_;
1519		1544
1520	my $name = $pl->ob->name;	1545	my $name = $pl->ob->name;
1521		1546
1522	$pl->{deny_save} = 1;	1547	$pl->{deny_save} = 1;
1523	$pl->password ("*"); # this should lock out the player until we nuked the dir	1548	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1524		1549
1525	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1550	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526	$pl->deactivate;	1551	$pl->deactivate;
		1552	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1553	$pl->ob->check_score;
1527	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1554	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1528	$pl->ns->destroy if $pl->ns;	1555	$pl->ns->destroy if $pl->ns;
1529		1556
1530	my $path = playerdir $pl;	1557	my $path = playerdir $pl;
1531	my $temp = "$path~$cf::RUNTIME~deleting~";	1558	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1570		1597
1571	for my $login (@$dirs) {	1598	for my $login (@$dirs) {
1572	my $path = path $login;	1599	my $path = path $login;
1573		1600
1574	# a .pst is a dead give-away for a valid player	1601	# a .pst is a dead give-away for a valid player
1575	unless (-e "$path.pst") {	1602	# if no pst file found, open and chekc for blocked users
		1603	if (aio_stat "$path.pst") {
1576	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1604	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577	aio_read $fh, 0, 512, my $buf, 0 or next;	1605	aio_read $fh, 0, 512, my $buf, 0 or next;
1578	$buf !~ /^password -------------$/m or next; # official not-valid tag	1606	$buf !~ /^password -------------$/m or next; # official not-valid tag
1579	}	1607	}
1580		1608
…		…
1611	}	1639	}
1612		1640
1613	\@paths	1641	\@paths
1614	}	1642	}
1615		1643
1616	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1644	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617		1645
1618	Expand crossfire pod fragments into protocol xml.	1646	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		1647
1709	=item $player->ext_reply ($msgid, @msg)	1648	=item $player->ext_reply ($msgid, @msg)
1710		1649
1711	Sends an ext reply to the player.	1650	Sends an ext reply to the player.
1712		1651
…		…
1925		1864
1926	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1865	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927	"$UNIQUEDIR/$path"	1866	"$UNIQUEDIR/$path"
1928	}	1867	}
1929		1868
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 {	1869	sub decay_objects {
1940	my ($self) = @_;	1870	my ($self) = @_;
1941		1871
1942	return if $self->{deny_reset};	1872	return if $self->{deny_reset};
1943		1873
…		…
2025	sub find {	1955	sub find {
2026	my ($path, $origin) = @_;	1956	my ($path, $origin) = @_;
2027		1957
2028	$path = normalise $path, $origin && $origin->path;	1958	$path = normalise $path, $origin && $origin->path;
2029		1959
2030	cf::lock_wait "map_data:$path";#d#remove	1960	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031	cf::lock_wait "map_find:$path";	1961	my $guard2 = cf::lock_acquire "map_find:$path";
2032		1962
2033	$cf::MAP{$path} || do {	1963	$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	1964	my $map = new_from_path cf::map $path
2038	or return;	1965	or return;
2039		1966
2040	$map->{last_save} = $cf::RUNTIME;	1967	$map->{last_save} = $cf::RUNTIME;
2041		1968
…		…
2043	or return;	1970	or return;
2044		1971
2045	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1972	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046	# doing this can freeze the server in a sync job, obviously	1973	# doing this can freeze the server in a sync job, obviously
2047	#$cf::WAIT_FOR_TICK->wait;	1974	#$cf::WAIT_FOR_TICK->wait;
		1975	undef $guard2;
2048	undef $guard1;	1976	undef $guard1;
2049	undef $guard2;
2050	$map->reset;	1977	$map->reset;
2051	return find $path;	1978	return find $path;
2052	}	1979	}
2053		1980
2054	$cf::MAP{$path} = $map	1981	$cf::MAP{$path} = $map
…		…
2081	my $f = new_from_file cf::object::thawer $self->{load_path};	2008	my $f = new_from_file cf::object::thawer $self->{load_path};
2082	$f->skip_block;	2009	$f->skip_block;
2083	$self->_load_objects ($f)	2010	$self->_load_objects ($f)
2084	or return;	2011	or return;
2085		2012
2086	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2013	$self->post_load_original
2087	if delete $self->{load_original};	2014	if delete $self->{load_original};
2088		2015
2089	if (my $uniq = $self->uniq_path) {	2016	if (my $uniq = $self->uniq_path) {
2090	utf8::encode $uniq;	2017	utf8::encode $uniq;
2091	unless (aio_stat $uniq) {	2018	unless (aio_stat $uniq) {
…		…
2108		2035
2109	unless ($self->{deny_activate}) {	2036	unless ($self->{deny_activate}) {
2110	$self->decay_objects;	2037	$self->decay_objects;
2111	$self->fix_auto_apply;	2038	$self->fix_auto_apply;
2112	$self->update_buttons;	2039	$self->update_buttons;
2113	cf::cede_to_tick;
2114	$self->set_darkness_map;
2115	cf::cede_to_tick;	2040	cf::cede_to_tick;
2116	$self->activate;	2041	$self->activate;
2117	}	2042	}
2118		2043
2119	$self->{last_save} = $cf::RUNTIME;	2044	$self->{last_save} = $cf::RUNTIME;
…		…
2457	can be C<undef>. Does the right thing when the player is currently in a	2382	can be C<undef>. Does the right thing when the player is currently in a
2458	dialogue with the given NPC character.	2383	dialogue with the given NPC character.
2459		2384
2460	=cut	2385	=cut
2461		2386
		2387	our $SAY_CHANNEL = {
		2388	id => "say",
		2389	title => "Map",
		2390	reply => "say ",
		2391	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
		2392	};
		2393
		2394	our $CHAT_CHANNEL = {
		2395	id => "chat",
		2396	title => "Chat",
		2397	reply => "chat ",
		2398	tooltip => "Player chat and shouts, global to the server.",
		2399	};
		2400
2462	# rough implementation of a future "reply" method that works	2401	# rough implementation of a future "reply" method that works
2463	# with dialog boxes.	2402	# with dialog boxes.
2464	#TODO: the first argument must go, split into a $npc->reply_to ( method	2403	#TODO: the first argument must go, split into a $npc->reply_to ( method
2465	sub cf::object::player::reply($$$;$) {	2404	sub cf::object::player::reply($$$;$) {
2466	my ($self, $npc, $msg, $flags) = @_;	2405	my ($self, $npc, $msg, $flags) = @_;
…		…
2477	my $dialog = $pl->{npc_dialog};	2416	my $dialog = $pl->{npc_dialog};
2478	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2417	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479		2418
2480	} else {	2419	} else {
2481	$msg = $npc->name . " says: $msg" if $npc;	2420	$msg = $npc->name . " says: $msg" if $npc;
2482	$self->message ($msg, $flags);	2421	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483	}	2422	}
2484	}	2423	}
2485	}	2424	}
2486		2425
2487	=item $object->send_msg ($channel, $msg, $color, [extra...])	2426	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2512		2451
2513	=item $player_object->enter_link	2452	=item $player_object->enter_link
2514		2453
2515	Freezes the player and moves him/her to a special map (C<{link}>).	2454	Freezes the player and moves him/her to a special map (C<{link}>).
2516		2455
2517	The player should be reasonably safe there for short amounts of time. You	2456	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.	2457	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2458	though, as the palyer cannot control the character while it is on the link
		2459	map.
2519		2460
2520	Will never block.	2461	Will never block.
2521		2462
2522	=item $player_object->leave_link ($map, $x, $y)	2463	=item $player_object->leave_link ($map, $x, $y)
2523		2464
…		…
2581		2522
2582	$map->load;	2523	$map->load;
2583	$map->load_neighbours;	2524	$map->load_neighbours;
2584		2525
2585	return unless $self->contr->active;	2526	return unless $self->contr->active;
		2527	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586	$self->activate_recursive;	2528	$self->activate_recursive;
2587		2529
2588	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2530	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589	$self->enter_map ($map, $x, $y);	2531	$self->enter_map ($map, $x, $y);
2590	}	2532	}
…		…
2594	Moves the player to the given map-path and coordinates by first freezing	2536	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	2537	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	2538	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	2539	the new (success) or old (failed) map position. In either case, $done will
2598	be called at the end of this process.	2540	be called at the end of this process.
		2541
		2542	Note that $check will be called with a potentially non-loaded map, so if
		2543	it needs a loaded map it has to call C<< ->load >>.
2599		2544
2600	=cut	2545	=cut
2601		2546
2602	our $GOTOGEN;	2547	our $GOTOGEN;
2603		2548
…		…
2682	}	2627	}
2683		2628
2684	sub prepare_random_map {	2629	sub prepare_random_map {
2685	my ($exit) = @_;	2630	my ($exit) = @_;
2686		2631
2687	my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689	# all this does is basically replace the /! path by	2632	# all this does is basically replace the /! path by
2690	# a new random map path (?random/...) with a seed	2633	# a new random map path (?random/...) with a seed
2691	# that depends on the exit object	2634	# that depends on the exit object
2692		2635
2693	my $rmp = parse_random_map_params $exit->msg;	2636	my $rmp = parse_random_map_params $exit->msg;
…		…
2695	if ($exit->map) {	2638	if ($exit->map) {
2696	$rmp->{region} = $exit->region->name;	2639	$rmp->{region} = $exit->region->name;
2697	$rmp->{origin_map} = $exit->map->path;	2640	$rmp->{origin_map} = $exit->map->path;
2698	$rmp->{origin_x} = $exit->x;	2641	$rmp->{origin_x} = $exit->x;
2699	$rmp->{origin_y} = $exit->y;	2642	$rmp->{origin_y} = $exit->y;
		2643
		2644	$exit->map->touch;
2700	}	2645	}
2701		2646
2702	$rmp->{random_seed} ||= $exit->random_seed;	2647	$rmp->{random_seed} ||= $exit->random_seed;
2703		2648
2704	my $data = cf::encode_json $rmp;	2649	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705	my $md5 = Digest::MD5::md5_hex $data;	2650	my $md5 = Digest::MD5::md5_hex $data;
2706	my $meta = "$RANDOMDIR/$md5.meta";	2651	my $meta = "$RANDOMDIR/$md5.meta";
2707		2652
2708	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2653	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709	aio_write $fh, 0, (length $data), $data, 0;	2654	aio_write $fh, 0, (length $data), $data, 0;
2710	undef $fh;	2655	undef $fh;
2711	aio_rename "$meta~", $meta;	2656	aio_rename "$meta~", $meta;
2712		2657
		2658	my $slaying = "?random/$md5";
		2659
		2660	if ($exit->valid) {
2713	$exit->slaying ("?random/$md5");	2661	$exit->slaying ("?random/$md5");
2714	$exit->msg (undef);	2662	$exit->msg (undef);
		2663	}
2715	}	2664	}
2716	}	2665	}
2717		2666
2718	sub cf::object::player::enter_exit {	2667	sub cf::object::player::enter_exit {
2719	my ($self, $exit) = @_;	2668	my ($self, $exit) = @_;
2720		2669
2721	return unless $self->type == cf::PLAYER;	2670	return unless $self->type == cf::PLAYER;
2722		2671
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;	2672	$self->enter_link;
2735		2673
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 {	2674	(async {
2741	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2675	$Coro::current->{desc} = "enter_exit";
2742		2676
2743	$self->deactivate_recursive; # just to be sure
2744	unless (eval {	2677	unless (eval {
		2678	$self->deactivate_recursive; # just to be sure
		2679
		2680	# random map handling
		2681	{
		2682	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2683
		2684	prepare_random_map $exit
		2685	if $exit->slaying eq "/!";
		2686	}
		2687
		2688	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2689	my $x = $exit->stats->hp;
		2690	my $y = $exit->stats->sp;
		2691
2745	$self->goto ($slaying, $hp, $sp);	2692	$self->goto ($map, $x, $y);
2746		2693
		2694	# if exit is damned, update players death & WoR home-position
		2695	$self->contr->savebed ($map, $x, $y)
		2696	if $exit->flag (cf::FLAG_DAMNED);
		2697
2747	1;	2698	1
2748	}) {	2699	}) {
2749	$self->message ("Something went wrong deep within the crossfire server. "	2700	$self->message ("Something went wrong deep within the deliantra server. "
2750	. "I'll try to bring you back to the map you were before. "	2701	. "I'll try to bring you back to the map you were before. "
2751	. "Please report this to the dungeon master!",	2702	. "Please report this to the dungeon master!",
2752	cf::NDI_UNIQUE | cf::NDI_RED);	2703	cf::NDI_UNIQUE | cf::NDI_RED);
2753		2704
2754	warn "ERROR in enter_exit: $@";	2705	warn "ERROR in enter_exit: $@";
…		…
2820	id => "infobox",	2771	id => "infobox",
2821	title => "Body Parts",	2772	title => "Body Parts",
2822	reply => undef,	2773	reply => undef,
2823	tooltip => "Shows which body parts you posess and are available",	2774	tooltip => "Shows which body parts you posess and are available",
2824	},	2775	},
		2776	"c/statistics" => {
		2777	id => "infobox",
		2778	title => "Statistics",
		2779	reply => undef,
		2780	tooltip => "Shows your primary statistics",
		2781	},
		2782	"c/skills" => {
		2783	id => "infobox",
		2784	title => "Skills",
		2785	reply => undef,
		2786	tooltip => "Shows your experience per skill and item power",
		2787	},
		2788	"c/resistances" => {
		2789	id => "infobox",
		2790	title => "Resistances",
		2791	reply => undef,
		2792	tooltip => "Shows your resistances",
		2793	},
		2794	"c/pets" => {
		2795	id => "infobox",
		2796	title => "Pets",
		2797	reply => undef,
		2798	tooltip => "Shows information abotu your pets/a specific pet",
		2799	},
2825	"c/uptime" => {	2800	"c/uptime" => {
2826	id => "infobox",	2801	id => "infobox",
2827	title => "Uptime",	2802	title => "Uptime",
2828	reply => undef,	2803	reply => undef,
2829	tooltip => "How long the server has been running since last restart",	2804	tooltip => "How long the server has been running since last restart",
…		…
2832	id => "infobox",	2807	id => "infobox",
2833	title => "Map Info",	2808	title => "Map Info",
2834	reply => undef,	2809	reply => undef,
2835	tooltip => "Information related to the maps",	2810	tooltip => "Information related to the maps",
2836	},	2811	},
		2812	"c/party" => {
		2813	id => "party",
		2814	title => "Party",
		2815	reply => "gsay ",
		2816	tooltip => "Messages and chat related to your party",
		2817	},
		2818	"c/death" => {
		2819	id => "death",
		2820	title => "Death",
		2821	reply => undef,
		2822	tooltip => "Reason for and more info about your most recent death",
		2823	},
		2824	"c/say" => $SAY_CHANNEL,
		2825	"c/chat" => $CHAT_CHANNEL,
2837	);	2826	);
2838		2827
2839	sub cf::client::send_msg {	2828	sub cf::client::send_msg {
2840	my ($self, $channel, $msg, $color, @extra) = @_;	2829	my ($self, $channel, $msg, $color, @extra) = @_;
2841		2830
2842	$msg = $self->pl->expand_cfpod ($msg);	2831	$msg = $self->pl->expand_cfpod ($msg)
		2832	unless $color & cf::NDI_VERBATIM;
2843		2833
2844	$color &= cf::NDI_CLIENT_MASK; # just in case...	2834	$color &= cf::NDI_CLIENT_MASK; # just in case...
2845		2835
2846	# check predefined channels, for the benefit of C	2836	# check predefined channels, for the benefit of C
2847	if ($CHANNEL{$channel}) {	2837	if ($CHANNEL{$channel}) {
2848	$channel = $CHANNEL{$channel};	2838	$channel = $CHANNEL{$channel};
2849		2839
2850	$self->ext_msg (channel_info => $channel)	2840	$self->ext_msg (channel_info => $channel);
2851	if $self->can_msg;
2852
2853	$channel = $channel->{id};	2841	$channel = $channel->{id};
2854		2842
2855	} elsif (ref $channel) {	2843	} elsif (ref $channel) {
2856	# send meta info to client, if not yet sent	2844	# send meta info to client, if not yet sent
2857	unless (exists $self->{channel}{$channel->{id}}) {	2845	unless (exists $self->{channel}{$channel->{id}}) {
2858	$self->{channel}{$channel->{id}} = $channel;	2846	$self->{channel}{$channel->{id}} = $channel;
2859	$self->ext_msg (channel_info => $channel)	2847	$self->ext_msg (channel_info => $channel);
2860	if $self->can_msg;
2861	}	2848	}
2862		2849
2863	$channel = $channel->{id};	2850	$channel = $channel->{id};
2864	}	2851	}
2865		2852
2866	return unless @extra || length $msg;	2853	return unless @extra || length $msg;
2867		2854
2868	if ($self->can_msg) {
2869	# default colour, mask it out	2855	# default colour, mask it out
2870	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2856	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871	if $color & cf::NDI_DEF;	2857	if $color & cf::NDI_DEF;
2872		2858
2873	$self->send_packet ("msg " . $self->{json_coder}->encode (	2859	my $pkt = "msg "
		2860	. $self->{json_coder}->encode (
2874	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2861	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875	} else {	2862	);
2876	if ($color >= 0) {
2877	# replace some tags by gcfclient-compatible ones
2878	for ($msg) {
2879	1 while
2880	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885	}
2886		2863
2887	$color &= cf::NDI_COLOR_MASK;	2864	# try lzf for large packets
		2865	$pkt = "lzf " . Compress::LZF::compress $pkt
		2866	if 1024 <= length $pkt and $self->{can_lzf};
2888		2867
2889	utf8::encode $msg;	2868	# split very large packets
2890		2869	if (8192 < length $pkt and $self->{can_lzf}) {
2891	if (0 && $msg =~ /\[/) {	2870	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892	# COMMAND/INFO	2871	$pkt = "frag";
2893	$self->send_packet ("drawextinfo $color 10 8 $msg")
2894	} else {
2895	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896	$self->send_packet ("drawinfo $color $msg")
2897	}
2898	}
2899	}	2872	}
		2873
		2874	$self->send_packet ($pkt);
2900	}	2875	}
2901		2876
2902	=item $client->ext_msg ($type, @msg)	2877	=item $client->ext_msg ($type, @msg)
2903		2878
2904	Sends an ext event to the client.	2879	Sends an ext event to the client.
…		…
3078		3053
3079	The following functions and methods are available within a safe environment:	3054	The following functions and methods are available within a safe environment:
3080		3055
3081	cf::object	3056	cf::object
3082	contr pay_amount pay_player map x y force_find force_add destroy	3057	contr pay_amount pay_player map x y force_find force_add destroy
3083	insert remove name archname title slaying race decrease_ob_nr	3058	insert remove name archname title slaying race decrease split
		3059	value
3084		3060
3085	cf::object::player	3061	cf::object::player
3086	player	3062	player
3087		3063
3088	cf::player	3064	cf::player
…		…
3093		3069
3094	=cut	3070	=cut
3095		3071
3096	for (	3072	for (
3097	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3073	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098	insert remove inv name archname title slaying race	3074	insert remove inv nrof name archname title slaying race
3099	decrease_ob_nr destroy)],	3075	decrease split destroy change_exp value msg lore send_msg)],
3100	["cf::object::player" => qw(player)],	3076	["cf::object::player" => qw(player)],
3101	["cf::player" => qw(peaceful)],	3077	["cf::player" => qw(peaceful send_msg)],
3102	["cf::map" => qw(trigger)],	3078	["cf::map" => qw(trigger)],
3103	) {	3079	) {
3104	no strict 'refs';	3080	no strict 'refs';
3105	my ($pkg, @funs) = @$_;	3081	my ($pkg, @funs) = @$_;
3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3082	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3123	my ($code, %vars) = @_;	3099	my ($code, %vars) = @_;
3124		3100
3125	my $qcode = $code;	3101	my $qcode = $code;
3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3102	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3127	$qcode =~ s/\n/\\n/g;	3103	$qcode =~ s/\n/\\n/g;
		3104
		3105	%vars = (_dummy => 0) unless %vars;
3128		3106
3129	local $_;	3107	local $_;
3130	local @safe::cf::_safe_eval_args = values %vars;	3108	local @safe::cf::_safe_eval_args = values %vars;
3131		3109
3132	my $eval =	3110	my $eval =
…		…
3312	while (my ($k, $v) = each %$want) {	3290	while (my ($k, $v) = each %$want) {
3313	$ns->fx_want ($k, $v);	3291	$ns->fx_want ($k, $v);
3314	}	3292	}
3315	};	3293	};
3316		3294
		3295	sub load_resource_file($) {
		3296	my $guard = lock_acquire "load_resource_file";
		3297
		3298	my $status = load_resource_file_ $_[0];
		3299	get_slot 0.1, 100;
		3300	cf::arch::commit_load;
		3301
		3302	$status
		3303	}
		3304
3317	sub reload_regions {	3305	sub reload_regions {
3318	# HACK to clear player env face cache, we need some signal framework	3306	# HACK to clear player env face cache, we need some signal framework
3319	# for this (global event?)	3307	# for this (global event?)
3320	%ext::player_env::MUSIC_FACE_CACHE = ();	3308	%ext::player_env::MUSIC_FACE_CACHE = ();
3321		3309
…		…
3334	}	3322	}
3335		3323
3336	sub reload_archetypes {	3324	sub reload_archetypes {
3337	load_resource_file "$DATADIR/archetypes"	3325	load_resource_file "$DATADIR/archetypes"
3338	or die "unable to load archetypes\n";	3326	or die "unable to load archetypes\n";
3339	#d# NEED to laod twice to resolve forward references
3340	# this really needs to be done in an extra post-pass
3341	# (which needs to be synchronous, so solve it differently)
3342	load_resource_file "$DATADIR/archetypes"
3343	or die "unable to load archetypes\n";
3344	}	3327	}
3345		3328
3346	sub reload_treasures {	3329	sub reload_treasures {
3347	load_resource_file "$DATADIR/treasures"	3330	load_resource_file "$DATADIR/treasures"
3348	or die "unable to load treasurelists\n";	3331	or die "unable to load treasurelists\n";
3349	}	3332	}
3350		3333
3351	sub reload_resources {	3334	sub reload_resources {
3352	warn "reloading resource files...\n";	3335	warn "reloading resource files...\n";
3353		3336
		3337	reload_facedata;
		3338	reload_archetypes;
3354	reload_regions;	3339	reload_regions;
3355	reload_facedata;
3356	#reload_archetypes;#d#
3357	reload_archetypes;
3358	reload_treasures;	3340	reload_treasures;
3359		3341
3360	warn "finished reloading resource files\n";	3342	warn "finished reloading resource files\n";
3361	}
3362
3363	sub init {
3364	reload_resources;
3365	}	3343	}
3366		3344
3367	sub reload_config {	3345	sub reload_config {
3368	open my $fh, "<:utf8", "$CONFDIR/config"	3346	open my $fh, "<:utf8", "$CONFDIR/config"
3369	or return;	3347	or return;
…		…
3383	};	3361	};
3384	warn $@ if $@;	3362	warn $@ if $@;
3385	}	3363	}
3386	}	3364	}
3387		3365
		3366	sub pidfile() {
		3367	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3368	or die "$PIDFILE: $!";
		3369	flock $fh, &Fcntl::LOCK_EX
		3370	or die "$PIDFILE: flock: $!";
		3371	$fh
		3372	}
		3373
		3374	# make sure only one server instance is running at any one time
		3375	sub atomic {
		3376	my $fh = pidfile;
		3377
		3378	my $pid = <$fh>;
		3379	kill 9, $pid if $pid > 0;
		3380
		3381	seek $fh, 0, 0;
		3382	print $fh $$;
		3383	}
		3384
3388	sub main {	3385	sub main {
		3386	cf::init_globals; # initialise logging
		3387
		3388	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3389	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3390	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3391	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3392
		3393	cf::init_experience;
		3394	cf::init_anim;
		3395	cf::init_attackmess;
		3396	cf::init_dynamic;
		3397
		3398	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3399
3389	# we must not ever block the main coroutine	3400	# we must not ever block the main coroutine
3390	local $Coro::idle = sub {	3401	local $Coro::idle = sub {
3391	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3402	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392	(async {	3403	(async {
3393	$Coro::current->{desc} = "IDLE BUG HANDLER";	3404	$Coro::current->{desc} = "IDLE BUG HANDLER";
3394	EV::loop EV::LOOP_ONESHOT;	3405	EV::loop EV::LOOP_ONESHOT;
3395	})->prio (Coro::PRIO_MAX);	3406	})->prio (Coro::PRIO_MAX);
3396	};	3407	};
3397		3408
3398	reload_config;
3399	db_init;
3400	load_extensions;
3401
3402	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403	evthread_start IO::AIO::poll_fileno;	3409	evthread_start IO::AIO::poll_fileno;
		3410
		3411	cf::sync_job {
		3412	reload_resources;
		3413	reload_config;
		3414	db_init;
		3415
		3416	cf::load_settings;
		3417	cf::load_materials;
		3418	cf::init_uuid;
		3419	cf::init_signals;
		3420	cf::init_commands;
		3421	cf::init_skills;
		3422
		3423	cf::init_beforeplay;
		3424
		3425	atomic;
		3426
		3427	load_extensions;
		3428
		3429	utime time, time, $RUNTIMEFILE;
		3430
		3431	# no (long-running) fork's whatsoever before this point(!)
		3432	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3433
		3434	(pop @POST_INIT)->(0) while @POST_INIT;
		3435	};
		3436
3404	EV::loop;	3437	EV::loop;
3405	}	3438	}
3406		3439
3407	#############################################################################	3440	#############################################################################
3408	# initialisation and cleanup	3441	# initialisation and cleanup
…		…
3416	};	3449	};
3417	}	3450	}
3418	}	3451	}
3419		3452
3420	sub write_runtime_sync {	3453	sub write_runtime_sync {
3421	my $runtime = "$LOCALDIR/runtime";
3422
3423	# first touch the runtime file to show we are still running:	3454	# first touch the runtime file to show we are still running:
3424	# the fsync below can take a very very long time.	3455	# the fsync below can take a very very long time.
3425		3456
3426	IO::AIO::aio_utime $runtime, undef, undef;	3457	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427		3458
3428	my $guard = cf::lock_acquire "write_runtime";	3459	my $guard = cf::lock_acquire "write_runtime";
3429		3460
3430	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3461	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431	or return;	3462	or return;
3432		3463
3433	my $value = $cf::RUNTIME + 90 + 10;	3464	my $value = $cf::RUNTIME + 90 + 10;
3434	# 10 is the runtime save interval, for a monotonic clock	3465	# 10 is the runtime save interval, for a monotonic clock
3435	# 60 allows for the watchdog to kill the server.	3466	# 60 allows for the watchdog to kill the server.
…		…
3445	aio_utime $fh, undef, undef;	3476	aio_utime $fh, undef, undef;
3446		3477
3447	close $fh	3478	close $fh
3448	or return;	3479	or return;
3449		3480
3450	aio_rename "$runtime~", $runtime	3481	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451	and return;	3482	and return;
3452		3483
3453	warn "runtime file written.\n";	3484	warn "runtime file written.\n";
3454		3485
3455	1	3486	1
…		…
3467	my $uuid = "$LOCALDIR/uuid";	3498	my $uuid = "$LOCALDIR/uuid";
3468		3499
3469	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644	3500	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470	or return;	3501	or return;
3471		3502
3472	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3503	my $value = uuid_seq uuid_cur;
		3504
		3505	unless ($value) {
		3506	warn "cowardly refusing to write zero uuid value!\n";
		3507	return;
		3508	}
		3509
		3510	my $value = uuid_str $value + $uuid_skip;
3473	$uuid_skip = 0;	3511	$uuid_skip = 0;
3474		3512
3475	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3513	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3476	and return;	3514	and return;
3477		3515
…		…
3499	}	3537	}
3500		3538
3501	sub emergency_save() {	3539	sub emergency_save() {
3502	my $freeze_guard = cf::freeze_mainloop;	3540	my $freeze_guard = cf::freeze_mainloop;
3503		3541
3504	warn "enter emergency perl save\n";	3542	warn "emergency_perl_save: enter\n";
3505		3543
3506	cf::sync_job {	3544	cf::sync_job {
		3545	# this is a trade-off: we want to be very quick here, so
		3546	# save all maps without fsync, and later call a global sync
		3547	# (which in turn might be very very slow)
		3548	local $USE_FSYNC = 0;
		3549
3507	# use a peculiar iteration method to avoid tripping on perl	3550	# use a peculiar iteration method to avoid tripping on perl
3508	# refcount bugs in for. also avoids problems with players	3551	# refcount bugs in for. also avoids problems with players
3509	# and maps saved/destroyed asynchronously.	3552	# and maps saved/destroyed asynchronously.
3510	warn "begin emergency player save\n";	3553	warn "emergency_perl_save: begin player save\n";
3511	for my $login (keys %cf::PLAYER) {	3554	for my $login (keys %cf::PLAYER) {
3512	my $pl = $cf::PLAYER{$login} or next;	3555	my $pl = $cf::PLAYER{$login} or next;
3513	$pl->valid or next;	3556	$pl->valid or next;
3514	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3557	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515	$pl->save;	3558	$pl->save;
3516	}	3559	}
3517	warn "end emergency player save\n";	3560	warn "emergency_perl_save: end player save\n";
3518		3561
3519	warn "begin emergency map save\n";	3562	warn "emergency_perl_save: begin map save\n";
3520	for my $path (keys %cf::MAP) {	3563	for my $path (keys %cf::MAP) {
3521	my $map = $cf::MAP{$path} or next;	3564	my $map = $cf::MAP{$path} or next;
3522	$map->valid or next;	3565	$map->valid or next;
3523	$map->save;	3566	$map->save;
3524	}	3567	}
3525	warn "end emergency map save\n";	3568	warn "emergency_perl_save: end map save\n";
3526		3569
3527	warn "begin emergency database checkpoint\n";	3570	warn "emergency_perl_save: begin database checkpoint\n";
3528	BDB::db_env_txn_checkpoint $DB_ENV;	3571	BDB::db_env_txn_checkpoint $DB_ENV;
3529	warn "end emergency database checkpoint\n";	3572	warn "emergency_perl_save: end database checkpoint\n";
3530		3573
3531	warn "begin write uuid\n";	3574	warn "emergency_perl_save: begin write uuid\n";
3532	write_uuid_sync 1;	3575	write_uuid_sync 1;
3533	warn "end write uuid\n";	3576	warn "emergency_perl_save: end write uuid\n";
3534	};	3577	};
3535		3578
		3579	warn "emergency_perl_save: starting sync()\n";
		3580	IO::AIO::aio_sync sub {
		3581	warn "emergency_perl_save: finished sync()\n";
		3582	};
		3583
3536	warn "leave emergency perl save\n";	3584	warn "emergency_perl_save: leave\n";
3537	}	3585	}
3538		3586
3539	sub post_cleanup {	3587	sub post_cleanup {
3540	my ($make_core) = @_;	3588	my ($make_core) = @_;
3541		3589
3542	warn Carp::longmess "post_cleanup backtrace"	3590	warn Carp::longmess "post_cleanup backtrace"
3543	if $make_core;	3591	if $make_core;
		3592
		3593	my $fh = pidfile;
		3594	unlink $PIDFILE if <$fh> == $$;
		3595	}
		3596
		3597	# a safer delete_package, copied from Symbol
		3598	sub clear_package($) {
		3599	my $pkg = shift;
		3600
		3601	# expand to full symbol table name if needed
		3602	unless ($pkg =~ /^main::.*::$/) {
		3603	$pkg = "main$pkg" if $pkg =~ /^::/;
		3604	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3605	$pkg .= '::' unless $pkg =~ /::$/;
		3606	}
		3607
		3608	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3609	my $stem_symtab = *{$stem}{HASH};
		3610
		3611	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3612	or return;
		3613
		3614	# clear all symbols
		3615	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3616	for my $name (keys %$leaf_symtab) {
		3617	_gv_clear *{"$pkg$name"};
		3618	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3619	}
		3620	warn "cleared package $pkg\n";#d#
3544	}	3621	}
3545		3622
3546	sub do_reload_perl() {	3623	sub do_reload_perl() {
3547	# can/must only be called in main	3624	# can/must only be called in main
3548	if ($Coro::current != $Coro::main) {	3625	if ($Coro::current != $Coro::main) {
3549	warn "can only reload from main coroutine";	3626	warn "can only reload from main coroutine";
3550	return;	3627	return;
3551	}	3628	}
3552		3629
		3630	return if $RELOAD++;
		3631
		3632	my $t1 = EV::time;
		3633
		3634	while ($RELOAD) {
3553	warn "reloading...";	3635	warn "reloading...";
3554		3636
3555	warn "entering sync_job";	3637	warn "entering sync_job";
3556		3638
3557	cf::sync_job {	3639	cf::sync_job {
3558	cf::write_runtime_sync; # external watchdog should not bark	3640	cf::write_runtime_sync; # external watchdog should not bark
3559	cf::emergency_save;	3641	cf::emergency_save;
3560	cf::write_runtime_sync; # external watchdog should not bark	3642	cf::write_runtime_sync; # external watchdog should not bark
3561		3643
3562	warn "syncing database to disk";	3644	warn "syncing database to disk";
3563	BDB::db_env_txn_checkpoint $DB_ENV;	3645	BDB::db_env_txn_checkpoint $DB_ENV;
3564		3646
3565	# if anything goes wrong in here, we should simply crash as we already saved	3647	# if anything goes wrong in here, we should simply crash as we already saved
3566		3648
3567	warn "flushing outstanding aio requests";	3649	warn "flushing outstanding aio requests";
3568	for (;;) {
3569	BDB::flush;
3570	IO::AIO::flush;
3571	Coro::cede_notself;
3572	last unless IO::AIO::nreqs || BDB::nreqs;	3650	while (IO::AIO::nreqs || BDB::nreqs) {
3573	warn "iterate...";	3651	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574	}
3575
3576	++$RELOAD;
3577
3578	warn "cancelling all extension coros";
3579	$_->cancel for values %EXT_CORO;
3580	%EXT_CORO = ();
3581
3582	warn "removing commands";
3583	%COMMAND = ();
3584
3585	warn "removing ext/exti commands";
3586	%EXTCMD = ();
3587	%EXTICMD = ();
3588
3589	warn "unloading/nuking all extensions";
3590	for my $pkg (@EXTS) {
3591	warn "... unloading $pkg";
3592
3593	if (my $cb = $pkg->can ("unload")) {
3594	eval {
3595	$cb->($pkg);
3596	1
3597	} or warn "$pkg unloaded, but with errors: $@";
3598	}	3652	}
3599		3653
3600	warn "... nuking $pkg";	3654	warn "cancelling all extension coros";
3601	Symbol::delete_package $pkg;	3655	$_->cancel for values %EXT_CORO;
3602	}	3656	%EXT_CORO = ();
3603		3657
3604	warn "unloading all perl modules loaded from $LIBDIR";	3658	warn "removing commands";
3605	while (my ($k, $v) = each %INC) {	3659	%COMMAND = ();
3606	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607		3660
		3661	warn "removing ext/exti commands";
		3662	%EXTCMD = ();
		3663	%EXTICMD = ();
		3664
		3665	warn "unloading/nuking all extensions";
		3666	for my $pkg (@EXTS) {
3608	warn "... unloading $k";	3667	warn "... unloading $pkg";
3609	delete $INC{$k};
3610		3668
3611	$k =~ s/\.pm$//;
3612	$k =~ s/\//::/g;
3613
3614	if (my $cb = $k->can ("unload_module")) {	3669	if (my $cb = $pkg->can ("unload")) {
		3670	eval {
3615	$cb->();	3671	$cb->($pkg);
		3672	1
		3673	} or warn "$pkg unloaded, but with errors: $@";
		3674	}
		3675
		3676	warn "... clearing $pkg";
		3677	clear_package $pkg;
3616	}	3678	}
3617		3679
3618	Symbol::delete_package $k;	3680	warn "unloading all perl modules loaded from $LIBDIR";
		3681	while (my ($k, $v) = each %INC) {
		3682	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3683
		3684	warn "... unloading $k";
		3685	delete $INC{$k};
		3686
		3687	$k =~ s/\.pm$//;
		3688	$k =~ s/\//::/g;
		3689
		3690	if (my $cb = $k->can ("unload_module")) {
		3691	$cb->();
		3692	}
		3693
		3694	clear_package $k;
3619	}	3695	}
3620		3696
3621	warn "getting rid of safe::, as good as possible";	3697	warn "getting rid of safe::, as good as possible";
3622	Symbol::delete_package "safe::$_"	3698	clear_package "safe::$_"
3623	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3699	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624		3700
3625	warn "unloading cf.pm \"a bit\"";	3701	warn "unloading cf.pm \"a bit\"";
3626	delete $INC{"cf.pm"};	3702	delete $INC{"cf.pm"};
3627	delete $INC{"cf/pod.pm"};	3703	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628		3704
3629	# don't, removes xs symbols, too,	3705	# don't, removes xs symbols, too,
3630	# and global variables created in xs	3706	# and global variables created in xs
3631	#Symbol::delete_package __PACKAGE__;	3707	#clear_package __PACKAGE__;
3632		3708
3633	warn "unload completed, starting to reload now";	3709	warn "unload completed, starting to reload now";
3634		3710
3635	warn "reloading cf.pm";	3711	warn "reloading cf.pm";
3636	require cf;	3712	require cf;
3637	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3713	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638		3714
3639	warn "loading config and database again";	3715	warn "loading config and database again";
3640	cf::reload_config;	3716	cf::reload_config;
3641		3717
3642	warn "loading extensions";	3718	warn "loading extensions";
3643	cf::load_extensions;	3719	cf::load_extensions;
3644		3720
		3721	if ($REATTACH_ON_RELOAD) {
3645	warn "reattaching attachments to objects/players";	3722	warn "reattaching attachments to objects/players";
3646	_global_reattach; # objects, sockets	3723	_global_reattach; # objects, sockets
3647	warn "reattaching attachments to maps";	3724	warn "reattaching attachments to maps";
3648	reattach $_ for values %MAP;	3725	reattach $_ for values %MAP;
3649	warn "reattaching attachments to players";	3726	warn "reattaching attachments to players";
3650	reattach $_ for values %PLAYER;	3727	reattach $_ for values %PLAYER;
		3728	}
3651		3729
		3730	warn "running post_init jobs";
		3731	(pop @POST_INIT)->(1) while @POST_INIT;
		3732
3652	warn "leaving sync_job";	3733	warn "leaving sync_job";
3653		3734
3654	1	3735	1
3655	} or do {	3736	} or do {
3656	warn $@;	3737	warn $@;
3657	cf::cleanup "error while reloading, exiting.";	3738	cf::cleanup "error while reloading, exiting.";
3658	};	3739	};
3659		3740
3660	warn "reloaded";	3741	warn "reloaded";
		3742	--$RELOAD;
		3743	}
		3744
		3745	$t1 = EV::time - $t1;
		3746	warn "reload completed in ${t1}s\n";
3661	};	3747	};
3662		3748
3663	our $RELOAD_WATCHER; # used only during reload	3749	our $RELOAD_WATCHER; # used only during reload
3664		3750
3665	sub reload_perl() {	3751	sub reload_perl() {
3666	# doing reload synchronously and two reloads happen back-to-back,	3752	# doing reload synchronously and two reloads happen back-to-back,
3667	# coro crashes during coro_state_free->destroy here.	3753	# coro crashes during coro_state_free->destroy here.
3668		3754
		3755	$RELOAD_WATCHER ||= cf::async {
		3756	Coro::AIO::aio_wait cache_extensions;
		3757
3669	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3758	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670	do_reload_perl;	3759	do_reload_perl;
3671	undef $RELOAD_WATCHER;	3760	undef $RELOAD_WATCHER;
		3761	};
3672	};	3762	};
3673	}	3763	}
3674		3764
3675	register_command "reload" => sub {	3765	register_command "reload" => sub {
3676	my ($who, $arg) = @_;	3766	my ($who, $arg) = @_;
…		…
3690		3780
3691	our @WAIT_FOR_TICK;	3781	our @WAIT_FOR_TICK;
3692	our @WAIT_FOR_TICK_BEGIN;	3782	our @WAIT_FOR_TICK_BEGIN;
3693		3783
3694	sub wait_for_tick {	3784	sub wait_for_tick {
3695	return if tick_inhibit;
3696	return if $Coro::current == $Coro::main;	3785	return if tick_inhibit || $Coro::current == $Coro::main;
3697		3786
3698	my $signal = new Coro::Signal;	3787	my $signal = new Coro::Signal;
3699	push @WAIT_FOR_TICK, $signal;	3788	push @WAIT_FOR_TICK, $signal;
3700	$signal->wait;	3789	$signal->wait;
3701	}	3790	}
3702		3791
3703	sub wait_for_tick_begin {	3792	sub wait_for_tick_begin {
3704	return if tick_inhibit;
3705	return if $Coro::current == $Coro::main;	3793	return if tick_inhibit || $Coro::current == $Coro::main;
3706		3794
3707	my $signal = new Coro::Signal;	3795	my $signal = new Coro::Signal;
3708	push @WAIT_FOR_TICK_BEGIN, $signal;	3796	push @WAIT_FOR_TICK_BEGIN, $signal;
3709	$signal->wait;	3797	$signal->wait;
3710	}	3798	}
…		…
3749	{	3837	{
3750	# configure BDB	3838	# configure BDB
3751		3839
3752	BDB::min_parallel 8;	3840	BDB::min_parallel 8;
3753	BDB::max_poll_reqs $TICK * 0.1;	3841	BDB::max_poll_reqs $TICK * 0.1;
3754	$Coro::BDB::WATCHER->priority (1);	3842	$AnyEvent::BDB::WATCHER->priority (1);
3755		3843
3756	unless ($DB_ENV) {	3844	unless ($DB_ENV) {
3757	$DB_ENV = BDB::db_env_create;	3845	$DB_ENV = BDB::db_env_create;
3758	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3846	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759	| BDB::LOG_AUTOREMOVE, 1);	3847	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3848	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3849	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3850	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762		3851
3763	cf::sync_job {	3852	cf::sync_job {
3764	eval {	3853	eval {
…		…
3790	{	3879	{
3791	# configure IO::AIO	3880	# configure IO::AIO
3792		3881
3793	IO::AIO::min_parallel 8;	3882	IO::AIO::min_parallel 8;
3794	IO::AIO::max_poll_time $TICK * 0.1;	3883	IO::AIO::max_poll_time $TICK * 0.1;
3795	$Coro::AIO::WATCHER->priority (1);	3884	undef $AnyEvent::AIO::WATCHER;
3796	}	3885	}
3797		3886
3798	my $_log_backtrace;	3887	my $_log_backtrace;
3799		3888
3800	sub _log_backtrace {	3889	sub _log_backtrace {
…		…
3803	$msg =~ s/\n//;	3892	$msg =~ s/\n//;
3804		3893
3805	# limit the # of concurrent backtraces	3894	# limit the # of concurrent backtraces
3806	if ($_log_backtrace < 2) {	3895	if ($_log_backtrace < 2) {
3807	++$_log_backtrace;	3896	++$_log_backtrace;
		3897	my $perl_bt = Carp::longmess $msg;
3808	async {	3898	async {
3809	$Coro::current->{desc} = "abt $msg";	3899	$Coro::current->{desc} = "abt $msg";
3810		3900
3811	my @bt = fork_call {	3901	my @bt = fork_call {
3812	@addr = map { sprintf "%x", $_ } @addr;	3902	@addr = map { sprintf "%x", $_ } @addr;
…		…
3823	}	3913	}
3824		3914
3825	@funcs	3915	@funcs
3826	};	3916	};
3827		3917
3828	LOG llevInfo, "[ABT] $msg\n";	3918	LOG llevInfo, "[ABT] $perl_bt\n";
		3919	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829	LOG llevInfo, "[ABT] $_\n" for @bt;	3920	LOG llevInfo, "[ABT] $_\n" for @bt;
3830	--$_log_backtrace;	3921	--$_log_backtrace;
3831	};	3922	};
3832	} else {	3923	} else {
3833	LOG llevInfo, "[ABT] $msg\n";	3924	LOG llevInfo, "[ABT] $msg\n";
3834	LOG llevInfo, "[ABT] [suppressed]\n";	3925	LOG llevInfo, "[ABT] [suppressed]\n";
3835	}	3926	}
3836	}	3927	}
3837		3928
3838	# load additional modules	3929	# load additional modules
3839	use cf::pod;	3930	eval "use cf::$_" for @EXTRA_MODULES;
3840		3931
3841	END { cf::emergency_save }	3932	END { cf::emergency_save }
3842		3933
3843	1	3934	1
3844		3935

Diff Legend

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