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.326 by root, Tue Jul 31 17:33:15 2007 UTC vs.
Revision 1.397 by root, Mon Nov 19 15:47:14 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;	9	use EV;
10	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::EV;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
34	use Digest::MD5 ();	35	use Digest::MD5 ();
35		36
36	# configure various modules to our taste	37	# configure various modules to our taste
37	#	38	#
38	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42	$Event::Eval = 1; # no idea why this is required, but it is
43		42
44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	43	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45	$YAML::Syck::ImplicitUnicode = 1;	44	$YAML::Syck::ImplicitUnicode = 1;
46		45
47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	46	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
…		…
79	our $NEXT_TICK;	78	our $NEXT_TICK;
80	our $NOW;	79	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	80	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		81
83	our $BDB_POLL_WATCHER;	82	our $BDB_POLL_WATCHER;
		83	our $BDB_DEADLOCK_WATCHER;
		84	our $BDB_CHECKPOINT_WATCHER;
		85	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	86	our $DB_ENV;
85		87
86	our %CFG;	88	our %CFG;
87		89
88	our $UPTIME; $UPTIME ||= time;	90	our $UPTIME; $UPTIME ||= time;
89	our $RUNTIME;	91	our $RUNTIME;
90		92
91	our %PLAYER; # all users	93	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	94	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	95	our $LINK_MAP; # the special {link} map, which is always available
94		96
95	# used to convert map paths into valid unix filenames by replacing / by ∕	97	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	98	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		99
…		…
158		160
159	The raw value load value from the last tick.	161	The raw value load value from the last tick.
160		162
161	=item %cf::CFG	163	=item %cf::CFG
162		164
163	Configuration for the server, loaded from C</etc/crossfire/config>, or	165	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164	from wherever your confdir points to.	166	from wherever your confdir points to.
165		167
166	=item cf::wait_for_tick, cf::wait_for_tick_begin	168	=item cf::wait_for_tick, cf::wait_for_tick_begin
167		169
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	170	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
186	$msg .= "\n"	188	$msg .= "\n"
187	unless $msg =~ /\n$/;	189	unless $msg =~ /\n$/;
188		190
189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	191	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190		192
191	utf8::encode $msg;
192	LOG llevError, $msg;	193	LOG llevError, $msg;
193	};	194	};
194	}	195	}
195		196
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
212	)) {	213	)) {
213	no strict 'refs';	214	no strict 'refs';
214	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215	}	216	}
216		217
217	$Event::DIED = sub {	218	$EV::DIED = sub {
218	warn "error in event callback: @_";	219	warn "error in event callback: @_";
219	};	220	};
220		221
221	#############################################################################	222	#############################################################################
222		223
…		…
271	Wait until the given lock is available and then acquires it and returns	272	Wait until the given lock is available and then acquires it and returns
272	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	273	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
274	returned.	275	returned.
275		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
276	Lock names should begin with a unique identifier (for example, cf::map::find	280	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
278		282
279	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
280		284
281	Return true if the lock is currently active, i.e. somebody has locked it.	285	Return true if the lock is currently active, i.e. somebody has locked it.
282		286
283	=cut	287	=cut
284		288
285	our %LOCK;	289	our %LOCK;
		290	our %LOCKER;#d#
286		291
287	sub lock_wait($) {	292	sub lock_wait($) {
288	my ($key) = @_;	293	my ($key) = @_;
		294
		295	if ($LOCKER{$key} == $Coro::current) {#d#
		296	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		297	return;#d#
		298	}#d#
289		299
290	# wait for lock, if any	300	# wait for lock, if any
291	while ($LOCK{$key}) {	301	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	302	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	303	Coro::schedule;
…		…
299		309
300	# wait, to be sure we are not locked	310	# wait, to be sure we are not locked
301	lock_wait $key;	311	lock_wait $key;
302		312
303	$LOCK{$key} = [];	313	$LOCK{$key} = [];
		314	$LOCKER{$key} = $Coro::current;#d#
304		315
305	Coro::guard {	316	Coro::guard {
		317	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	318	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	319	$_->ready for @{ delete $LOCK{$key} };
308	}	320	}
309	}	321	}
310		322
…		…
322	};	334	};
323	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
324	$guard	336	$guard
325	}	337	}
326		338
		339	=item cf::periodic $interval, $cb
		340
		341	Like EV::periodic, but randomly selects a starting point so that the actions
		342	get spread over timer.
		343
		344	=cut
		345
		346	sub periodic($$) {
		347	my ($interval, $cb) = @_;
		348
		349	my $start = rand List::Util::min 180, $interval;
		350
		351	EV::periodic $start, $interval, 0, $cb
		352	}
		353
327	=item cf::get_slot $time[, $priority[, $name]]	354	=item cf::get_slot $time[, $priority[, $name]]
328		355
329	Allocate $time seconds of blocking CPU time at priority C<$priority>:	356	Allocate $time seconds of blocking CPU time at priority C<$priority>:
330	This call blocks and returns only when you have at least C<$time> seconds	357	This call blocks and returns only when you have at least C<$time> seconds
331	of cpu time till the next tick. The slot is only valid till the next cede.	358	of cpu time till the next tick. The slot is only valid till the next cede.
…		…
340	our @SLOT_QUEUE;	367	our @SLOT_QUEUE;
341	our $SLOT_QUEUE;	368	our $SLOT_QUEUE;
342		369
343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	370	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344	$SLOT_QUEUE = Coro::async {	371	$SLOT_QUEUE = Coro::async {
		372	$Coro::current->desc ("timeslot manager");
		373
345	my $signal = new Coro::Signal;	374	my $signal = new Coro::Signal;
346		375
347	while () {	376	while () {
348	next_job:	377	next_job:
349	my $avail = cf::till_tick;	378	my $avail = cf::till_tick;
…		…
357	}	386	}
358	}	387	}
359	}	388	}
360		389
361	if (@SLOT_QUEUE) {	390	if (@SLOT_QUEUE) {
362	# we do not use wait_For_tick() as it returns immediately when tick is inactive	391	# we do not use wait_for_tick() as it returns immediately when tick is inactive
363	push @cf::WAIT_FOR_TICK, $signal;	392	push @cf::WAIT_FOR_TICK, $signal;
364	$signal->wait;	393	$signal->wait;
365	} else {	394	} else {
366	Coro::schedule;	395	Coro::schedule;
367	}	396	}
…		…
390		419
391	BEGIN { *async = \&Coro::async_pool }	420	BEGIN { *async = \&Coro::async_pool }
392		421
393	=item cf::sync_job { BLOCK }	422	=item cf::sync_job { BLOCK }
394		423
395	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	424	The design of Deliantra requires that the main coroutine ($Coro::main)
396	is always able to handle events or runnable, as Crossfire TRT is only	425	is always able to handle events or runnable, as Deliantra is only
397	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	426	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398	acceptable.	427	acceptable.
399		428
400	If it must be done, put the blocking parts into C<sync_job>. This will run	429	If it must be done, put the blocking parts into C<sync_job>. This will run
401	the given BLOCK in another coroutine while waiting for the result. The	430	the given BLOCK in another coroutine while waiting for the result. The
…		…
406		435
407	sub sync_job(&) {	436	sub sync_job(&) {
408	my ($job) = @_;	437	my ($job) = @_;
409		438
410	if ($Coro::current == $Coro::main) {	439	if ($Coro::current == $Coro::main) {
411	my $time = Event::time;	440	my $time = EV::time;
412		441
413	# this is the main coro, too bad, we have to block	442	# this is the main coro, too bad, we have to block
414	# till the operation succeeds, freezing the server :/	443	# till the operation succeeds, freezing the server :/
415		444
		445	LOG llevError, Carp::longmess "sync job";#d#
		446
416	# TODO: use suspend/resume instead	447	# TODO: use suspend/resume instead
417	# (but this is cancel-safe)	448	# (but this is cancel-safe)
418	my $freeze_guard = freeze_mainloop;	449	my $freeze_guard = freeze_mainloop;
419		450
420	my $busy = 1;	451	my $busy = 1;
421	my @res;	452	my @res;
422		453
423	(async {	454	(async {
		455	$Coro::current->desc ("sync job coro");
424	@res = eval { $job->() };	456	@res = eval { $job->() };
425	warn $@ if $@;	457	warn $@ if $@;
426	undef $busy;	458	undef $busy;
427	})->prio (Coro::PRIO_MAX);	459	})->prio (Coro::PRIO_MAX);
428		460
429	while ($busy) {	461	while ($busy) {
430	Coro::cede or Event::one_event;	462	if (Coro::nready) {
		463	Coro::cede_notself;
		464	} else {
		465	EV::loop EV::LOOP_ONESHOT;
431	}	466	}
		467	}
432		468
433	$time = Event::time - $time;	469	$time = EV::time - $time;
434		470
435	LOG llevError | logBacktrace, Carp::longmess "long sync job"	471	LOG llevError | logBacktrace, Carp::longmess "long sync job"
436	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	472	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437		473
438	$tick_start += $time; # do not account sync jobs to server load	474	$tick_start += $time; # do not account sync jobs to server load
…		…
468	=item fork_call { }, $args	504	=item fork_call { }, $args
469		505
470	Executes the given code block with the given arguments in a seperate	506	Executes the given code block with the given arguments in a seperate
471	process, returning the results. Everything must be serialisable with	507	process, returning the results. Everything must be serialisable with
472	Coro::Storable. May, of course, block. Note that the executed sub may	508	Coro::Storable. May, of course, block. Note that the executed sub may
473	never block itself or use any form of Event handling.	509	never block itself or use any form of event handling.
474		510
475	=cut	511	=cut
476
477	sub _store_scalar {
478	open my $fh, ">", \my $buf
479	or die "fork_call: cannot open fh-to-buf in child : $!";
480	Storable::store_fd $_[0], $fh;
481	close $fh;
482
483	$buf
484	}
485		512
486	sub fork_call(&@) {	513	sub fork_call(&@) {
487	my ($cb, @args) = @_;	514	my ($cb, @args) = @_;
488		515
489	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	516	# we seemingly have to make a local copy of the whole thing,
490	# or die "socketpair: $!";	517	# otherwise perl prematurely frees the stuff :/
491	pipe my $fh1, my $fh2	518	# TODO: investigate and fix (likely this will be rather laborious)
492	or die "pipe: $!";
493		519
494	if (my $pid = fork) {	520	my @res = Coro::Util::fork_eval {
495	close $fh2;
496
497	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498	warn "pst<$res>" unless $res =~ /^pst/;
499	$res = Coro::Storable::thaw $res;
500
501	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503	Carp::confess $$res unless "ARRAY" eq ref $res;
504
505	return wantarray ? @$res : $res->[-1];
506	} else {
507	reset_signals;	521	reset_signals;
508	local $SIG{__WARN__};	522	&$cb
509	local $SIG{__DIE__};	523	}, @args;
510	# just in case, this hack effectively disables event
511	# in the child. cleaner and slower would be canceling all watchers,
512	# but this works for the time being.
513	local $Coro::idle;
514	$Coro::current->prio (Coro::PRIO_MAX);
515		524
516	eval {	525	wantarray ? @res : $res[-1]
517	close $fh1;
518
519	my @res = eval { $cb->(@args) };
520
521	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522	close $fh2;
523	};
524
525	warn $@ if $@;
526	_exit 0;
527	}
528	}	526	}
529		527
530	=item $value = cf::db_get $family => $key	528	=item $value = cf::db_get $family => $key
531		529
532	Returns a single value from the environment database.	530	Returns a single value from the environment database.
…		…
534	=item cf::db_put $family => $key => $value	532	=item cf::db_put $family => $key => $value
535		533
536	Stores the given C<$value> in the family. It can currently store binary	534	Stores the given C<$value> in the family. It can currently store binary
537	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	535	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538		536
		537	=item $db = cf::db_table "name"
		538
		539	Create and/or open a new database table. The string must not be "db" and must be unique
		540	within each server.
		541
539	=cut	542	=cut
		543
		544	sub db_table($) {
		545	my ($name) = @_;
		546	my $db = BDB::db_create $DB_ENV;
		547
		548	eval {
		549	$db->set_flags (BDB::CHKSUM);
		550
		551	utf8::encode $name;
		552	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		553	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		554	cf::cleanup "db_open(db): $!" if $!;
		555	};
		556	cf::cleanup "db_open(db): $@" if $@;
		557
		558	$db
		559	}
540		560
541	our $DB;	561	our $DB;
542		562
543	sub db_init {	563	sub db_init {
544	unless ($DB) {
545	$DB = BDB::db_create $DB_ENV;
546
547	cf::sync_job {	564	cf::sync_job {
548	eval {	565	$DB ||= db_table "db";
549	$DB->set_flags (BDB::CHKSUM);
550
551	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553	cf::cleanup "db_open(db): $!" if $!;
554	};
555	cf::cleanup "db_open(db): $@" if $@;
556	};
557	}	566	};
558	}	567	}
559		568
560	sub db_get($$) {	569	sub db_get($$) {
561	my $key = "$_[0]/$_[1]";	570	my $key = "$_[0]/$_[1]";
562		571
…		…
612	if (1) {	621	if (1) {
613	$md5 =	622	$md5 =
614	join "\x00",	623	join "\x00",
615	$processversion,	624	$processversion,
616	map {	625	map {
617	Coro::cede;	626	cf::cede_to_tick;
618	($src->[$_], Digest::MD5::md5_hex $data[$_])	627	($src->[$_], Digest::MD5::md5_hex $data[$_])
619	} 0.. $#$src;	628	} 0.. $#$src;
620		629
621		630
622	my $dbmd5 = db_get cache => "$id/md5";	631	my $dbmd5 = db_get cache => "$id/md5";
…		…
666	attach callbacks/event handlers (a collection of which is called an "attachment")	675	attach callbacks/event handlers (a collection of which is called an "attachment")
667	to it. All such attachable objects support the following methods.	676	to it. All such attachable objects support the following methods.
668		677
669	In the following description, CLASS can be any of C<global>, C<object>	678	In the following description, CLASS can be any of C<global>, C<object>
670	C<player>, C<client> or C<map> (i.e. the attachable objects in	679	C<player>, C<client> or C<map> (i.e. the attachable objects in
671	Crossfire TRT).	680	Deliantra).
672		681
673	=over 4	682	=over 4
674		683
675	=item $attachable->attach ($attachment, key => $value...)	684	=item $attachable->attach ($attachment, key => $value...)
676		685
…		…
974		983
975	=cut	984	=cut
976		985
977	#############################################################################	986	#############################################################################
978	# object support	987	# object support
979	#
980		988
		989	sub _object_equal($$);
		990	sub _object_equal($$) {
		991	my ($a, $b) = @_;
		992
		993	return 0 unless (ref $a) eq (ref $b);
		994
		995	if ("HASH" eq ref $a) {
		996	my @ka = keys %$a;
		997	my @kb = keys %$b;
		998
		999	return 0 if @ka != @kb;
		1000
		1001	for (0 .. $#ka) {
		1002	return 0 unless $ka[$_] eq $kb[$_];
		1003	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1004	}
		1005
		1006	} elsif ("ARRAY" eq ref $a) {
		1007
		1008	return 0 if @$a != @$b;
		1009
		1010	for (0 .. $#$a) {
		1011	return 0 unless _object_equal $a->[$_], $b->[$_];
		1012	}
		1013
		1014	} elsif ($a ne $b) {
		1015	return 0;
		1016	}
		1017
		1018	1
		1019	}
		1020
		1021	our $SLOW_MERGES;#d#
981	sub _can_merge {	1022	sub _can_merge {
982	my ($ob1, $ob2) = @_;	1023	my ($ob1, $ob2) = @_;
983		1024
984	local $Storable::canonical = 1;	1025	++$SLOW_MERGES;#d#
985	my $fob1 = Storable::freeze $ob1;
986	my $fob2 = Storable::freeze $ob2;
987		1026
988	$fob1 eq $fob2	1027	# we do the slow way here
		1028	return _object_equal $ob1, $ob2
989	}	1029	}
990		1030
991	sub reattach {	1031	sub reattach {
992	# basically do the same as instantiate, without calling instantiate	1032	# basically do the same as instantiate, without calling instantiate
993	my ($obj) = @_;	1033	my ($obj) = @_;
…		…
1041	sub object_freezer_save {	1081	sub object_freezer_save {
1042	my ($filename, $rdata, $objs) = @_;	1082	my ($filename, $rdata, $objs) = @_;
1043		1083
1044	sync_job {	1084	sync_job {
1045	if (length $$rdata) {	1085	if (length $$rdata) {
		1086	utf8::decode (my $decname = $filename);
1046	warn sprintf "saving %s (%d,%d)\n",	1087	warn sprintf "saving %s (%d,%d)\n",
1047	$filename, length $$rdata, scalar @$objs;	1088	$decname, length $$rdata, scalar @$objs;
1048		1089
1049	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1090	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050	chmod SAVE_MODE, $fh;	1091	chmod SAVE_MODE, $fh;
1051	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1092	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052	aio_fsync $fh if $cf::USE_FSYNC;	1093	aio_fsync $fh if $cf::USE_FSYNC;
1053	close $fh;	1094	close $fh;
1054		1095
1055	if (@$objs) {	1096	if (@$objs) {
1056	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1097	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057	chmod SAVE_MODE, $fh;	1098	chmod SAVE_MODE, $fh;
1058	my $data = Storable::nfreeze { version => 1, objs => $objs };	1099	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059	aio_write $fh, 0, (length $data), $data, 0;	1100	aio_write $fh, 0, (length $data), $data, 0;
1060	aio_fsync $fh if $cf::USE_FSYNC;	1101	aio_fsync $fh if $cf::USE_FSYNC;
1061	close $fh;	1102	close $fh;
1062	aio_rename "$filename.pst~", "$filename.pst";	1103	aio_rename "$filename.pst~", "$filename.pst";
1063	}	1104	}
…		…
1071	}	1112	}
1072	} else {	1113	} else {
1073	aio_unlink $filename;	1114	aio_unlink $filename;
1074	aio_unlink "$filename.pst";	1115	aio_unlink "$filename.pst";
1075	}	1116	}
1076	}	1117	};
1077	}	1118	}
1078		1119
1079	sub object_freezer_as_string {	1120	sub object_freezer_as_string {
1080	my ($rdata, $objs) = @_;	1121	my ($rdata, $objs) = @_;
1081		1122
…		…
1093	or return;	1134	or return;
1094		1135
1095	unless (aio_stat "$filename.pst") {	1136	unless (aio_stat "$filename.pst") {
1096	(aio_load "$filename.pst", $av) >= 0	1137	(aio_load "$filename.pst", $av) >= 0
1097	or return;	1138	or return;
		1139
1098	$av = eval { (Storable::thaw $av)->{objs} };	1140	my $st = eval { Coro::Storable::thaw $av };
		1141	$av = $st->{objs};
1099	}	1142	}
1100		1143
		1144	utf8::decode (my $decname = $filename);
1101	warn sprintf "loading %s (%d)\n",	1145	warn sprintf "loading %s (%d,%d)\n",
1102	$filename, length $data, scalar @{$av || []};	1146	$decname, length $data, scalar @{$av || []};
		1147
1103	return ($data, $av);	1148	($data, $av)
1104	}	1149	}
1105		1150
1106	=head2 COMMAND CALLBACKS	1151	=head2 COMMAND CALLBACKS
1107		1152
1108	=over 4	1153	=over 4
…		…
1186	my ($type, $reply, @payload) =	1231	my ($type, $reply, @payload) =
1187	"ARRAY" eq ref $msg	1232	"ARRAY" eq ref $msg
1188	? @$msg	1233	? @$msg
1189	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	1234	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190		1235
		1236	my @reply;
		1237
1191	if (my $cb = $EXTCMD{$type}) {	1238	if (my $cb = $EXTCMD{$type}) {
1192	my @reply = $cb->($pl, @payload);	1239	@reply = $cb->($pl, @payload);
1193
1194	$pl->ext_reply ($reply, @reply)
1195	if $reply;
1196	}	1240	}
		1241
		1242	$pl->ext_reply ($reply, @reply)
		1243	if $reply;
		1244
1197	} else {	1245	} else {
1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1246	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199	}	1247	}
1200		1248
1201	cf::override;	1249	cf::override;
…		…
1291		1339
1292	=head3 cf::player	1340	=head3 cf::player
1293		1341
1294	=over 4	1342	=over 4
1295		1343
		1344	=item cf::player::num_playing
		1345
		1346	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1347
		1348	=cut
		1349
		1350	sub num_playing {
		1351	scalar grep
		1352	$_->ob->map
		1353	&& !$_->hidden
		1354	&& !$_->ob->flag (cf::FLAG_WIZ),
		1355	cf::player::list
		1356	}
		1357
1296	=item cf::player::find $login	1358	=item cf::player::find $login
1297		1359
1298	Returns the given player object, loading it if necessary (might block).	1360	Returns the given player object, loading it if necessary (might block).
1299		1361
1300	=cut	1362	=cut
…		…
1335	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1397	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1398	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1399	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338	aio_unlink +(playerdir $login) . "/$login.pl";	1400	aio_unlink +(playerdir $login) . "/$login.pl";
1339		1401
1340	my $pl = load_pl path $login	1402	my $f = new_from_file cf::object::thawer path $login
1341	or return;	1403	or return;
		1404
		1405	my $pl = cf::player::load_pl $f
		1406	or return;
		1407	local $cf::PLAYER_LOADING{$login} = $pl;
		1408	$f->resolve_delayed_derefs;
1342	$cf::PLAYER{$login} = $pl	1409	$cf::PLAYER{$login} = $pl
1343	}	1410	}
1344	}	1411	}
1345	}	1412	}
1346		1413
…		…
1356		1423
1357	aio_mkdir playerdir $pl, 0770;	1424	aio_mkdir playerdir $pl, 0770;
1358	$pl->{last_save} = $cf::RUNTIME;	1425	$pl->{last_save} = $cf::RUNTIME;
1359		1426
1360	$pl->save_pl ($path);	1427	$pl->save_pl ($path);
1361	Coro::cede;	1428	cf::cede_to_tick;
1362	}	1429	}
1363		1430
1364	sub new($) {	1431	sub new($) {
1365	my ($login) = @_;	1432	my ($login) = @_;
1366		1433
…		…
1370	$self->{deny_save} = 1;	1437	$self->{deny_save} = 1;
1371		1438
1372	$cf::PLAYER{$login} = $self;	1439	$cf::PLAYER{$login} = $self;
1373		1440
1374	$self	1441	$self
		1442	}
		1443
		1444	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1445
		1446	=cut
		1447
		1448	sub send_msg {
		1449	my $ns = shift->ns
		1450	or return;
		1451	$ns->send_msg (@_);
1375	}	1452	}
1376		1453
1377	=item $pl->quit_character	1454	=item $pl->quit_character
1378		1455
1379	Nukes the player without looking back. If logged in, the connection will	1456	Nukes the player without looking back. If logged in, the connection will
…		…
1434	or return [];	1511	or return [];
1435		1512
1436	my @logins;	1513	my @logins;
1437		1514
1438	for my $login (@$dirs) {	1515	for my $login (@$dirs) {
		1516	my $path = path $login;
		1517
		1518	# a .pst is a dead give-away for a valid player
		1519	unless (-e "$path.pst") {
1439	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1520	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440	aio_read $fh, 0, 512, my $buf, 0 or next;	1521	aio_read $fh, 0, 512, my $buf, 0 or next;
1441	$buf !~ /^password -------------$/m or next; # official not-valid tag	1522	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1523	}
1442		1524
1443	utf8::decode $login;	1525	utf8::decode $login;
1444	push @logins, $login;	1526	push @logins, $login;
1445	}	1527	}
1446		1528
…		…
1479		1561
1480	Expand crossfire pod fragments into protocol xml.	1562	Expand crossfire pod fragments into protocol xml.
1481		1563
1482	=cut	1564	=cut
1483		1565
		1566	use re 'eval';
		1567
		1568	my $group;
		1569	my $interior; $interior = qr{
		1570	# match a pod interior sequence sans C<< >>
		1571	(?:
		1572	\ (.*?)\ (?{ $group = $^N })
		1573	| < (??{$interior}) >
		1574	)
		1575	}x;
		1576
1484	sub expand_cfpod {	1577	sub expand_cfpod {
1485	((my $self), (local $_)) = @_;	1578	my ($self, $pod) = @_;
1486		1579
1487	# escape & and <	1580	my $xml;
1488	s/&/&amp;/g;
1489	s/(?<![BIUGH])</&lt;/g;
1490		1581
1491	# this is buggy, it needs to properly take care of nested <'s	1582	while () {
		1583	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1584	$group = $1;
1492		1585
1493	1 while	1586	$group =~ s/&/&amp;/g;
1494	# replace B<>, I<>, U<> etc.	1587	$group =~ s/</&lt;/g;
1495	s/B<([^\>]*)>/<b>$1<\/b>/	1588
1496	|| s/I<([^\>]*)>/<i>$1<\/i>/	1589	$xml .= $group;
1497	|| s/U<([^\>]*)>/<u>$1<\/u>/	1590	} elsif ($pod =~ m%\G
1498	# replace G<male|female> tags	1591	([BCGHITU])
1499	|| s{G<([^>|]*)\|([^>]*)>}{	1592	<
1500	$self->gender ? $2 : $1	1593	(?:
1501	}ge	1594	([^<>]*) (?{ $group = $^N })
1502	# replace H<hint text>	1595	| < $interior >
1503	|| s{H<([^\>]*)>}	1596	)
		1597	>
		1598	%gcsx
1504	{	1599	) {
		1600	my ($code, $data) = ($1, $group);
		1601
		1602	if ($code eq "B") {
		1603	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1604	} elsif ($code eq "I") {
		1605	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1606	} elsif ($code eq "U") {
		1607	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1608	} elsif ($code eq "C") {
		1609	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1610	} elsif ($code eq "T") {
		1611	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1612	} elsif ($code eq "G") {
		1613	my ($male, $female) = split /\|/, $data;
		1614	$data = $self->gender ? $female : $male;
		1615	$xml .= expand_cfpod ($self, $data);
		1616	} elsif ($code eq "H") {
1505	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1617	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1618	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507	"")	1619	"")
1508	[$self->{hintmode}]	1620	[$self->{hintmode}];
		1621	} else {
		1622	$xml .= "error processing '$code($data)' directive";
1509	}ge;	1623	}
		1624	} else {
		1625	if ($pod =~ /\G(.+)/) {
		1626	warn "parse error while expanding $pod (at $1)";
		1627	}
		1628	last;
		1629	}
		1630	}
1510		1631
		1632	for ($xml) {
1511	# create single paragraphs (very hackish)	1633	# create single paragraphs (very hackish)
1512	s/(?<=\S)\n(?=\w)/ /g;	1634	s/(?<=\S)\n(?=\w)/ /g;
1513		1635
1514	# compress some whitespace	1636	# compress some whitespace
1515	s/\s+\n/\n/g; # ws line-ends	1637	s/\s+\n/\n/g; # ws line-ends
1516	s/\n\n+/\n/g; # double lines	1638	s/\n\n+/\n/g; # double lines
1517	s/^\n+//; # beginning lines	1639	s/^\n+//; # beginning lines
1518	s/\n+$//; # ending lines	1640	s/\n+$//; # ending lines
		1641	}
1519		1642
1520	$_	1643	$xml
1521	}	1644	}
		1645
		1646	no re 'eval';
1522		1647
1523	sub hintmode {	1648	sub hintmode {
1524	$_[0]{hintmode} = $_[1] if @_ > 1;	1649	$_[0]{hintmode} = $_[1] if @_ > 1;
1525	$_[0]{hintmode}	1650	$_[0]{hintmode}
1526	}	1651	}
…		…
1532	=cut	1657	=cut
1533		1658
1534	sub ext_reply($$@) {	1659	sub ext_reply($$@) {
1535	my ($self, $id, @msg) = @_;	1660	my ($self, $id, @msg) = @_;
1536		1661
1537	if ($self->ns->extcmd == 2) {	1662	$self->ns->ext_reply ($id, @msg)
1538	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539	} elsif ($self->ns->extcmd == 1) {
1540	#TODO: version 1, remove
1541	unshift @msg, msgtype => "reply", msgid => $id;
1542	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543	}
1544	}	1663	}
1545		1664
1546	=item $player->ext_msg ($type, @msg)	1665	=item $player->ext_msg ($type, @msg)
1547		1666
1548	Sends an ext event to the client.	1667	Sends an ext event to the client.
…		…
1776		1895
1777	sub load_header_from($) {	1896	sub load_header_from($) {
1778	my ($self, $path) = @_;	1897	my ($self, $path) = @_;
1779		1898
1780	utf8::encode $path;	1899	utf8::encode $path;
1781	#aio_open $path, O_RDONLY, 0	1900	my $f = new_from_file cf::object::thawer $path
1782	# or return;
1783
1784	$self->_load_header ($path)
1785	or return;	1901	or return;
		1902
		1903	$self->_load_header ($f)
		1904	or return;
		1905
		1906	local $MAP_LOADING{$self->{path}} = $self;
		1907	$f->resolve_delayed_derefs;
1786		1908
1787	$self->{load_path} = $path;	1909	$self->{load_path} = $path;
1788		1910
1789	1	1911	1
1790	}	1912	}
…		…
1844	sub find {	1966	sub find {
1845	my ($path, $origin) = @_;	1967	my ($path, $origin) = @_;
1846		1968
1847	$path = normalise $path, $origin && $origin->path;	1969	$path = normalise $path, $origin && $origin->path;
1848		1970
		1971	cf::lock_wait "map_data:$path";#d#remove
1849	cf::lock_wait "map_find:$path";	1972	cf::lock_wait "map_find:$path";
1850		1973
1851	$cf::MAP{$path} || do {	1974	$cf::MAP{$path} || do {
1852	my $guard = cf::lock_acquire "map_find:$path";	1975	my $guard1 = cf::lock_acquire "map_find:$path";
		1976	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1977
1853	my $map = new_from_path cf::map $path	1978	my $map = new_from_path cf::map $path
1854	or return;	1979	or return;
1855		1980
1856	$map->{last_save} = $cf::RUNTIME;	1981	$map->{last_save} = $cf::RUNTIME;
1857		1982
…		…
1859	or return;	1984	or return;
1860		1985
1861	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1986	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862	# doing this can freeze the server in a sync job, obviously	1987	# doing this can freeze the server in a sync job, obviously
1863	#$cf::WAIT_FOR_TICK->wait;	1988	#$cf::WAIT_FOR_TICK->wait;
		1989	undef $guard1;
		1990	undef $guard2;
1864	$map->reset;	1991	$map->reset;
1865	undef $guard;
1866	return find $path;	1992	return find $path;
1867	}	1993	}
1868		1994
1869	$cf::MAP{$path} = $map	1995	$cf::MAP{$path} = $map
1870	}	1996	}
…		…
1879	local $self->{deny_reset} = 1; # loading can take a long time	2005	local $self->{deny_reset} = 1; # loading can take a long time
1880		2006
1881	my $path = $self->{path};	2007	my $path = $self->{path};
1882		2008
1883	{	2009	{
1884	my $guard = cf::lock_acquire "map_load:$path";	2010	my $guard = cf::lock_acquire "map_data:$path";
1885		2011
		2012	return unless $self->valid;
1886	return if $self->in_memory != cf::MAP_SWAPPED;	2013	return unless $self->in_memory == cf::MAP_SWAPPED;
1887		2014
1888	$self->in_memory (cf::MAP_LOADING);	2015	$self->in_memory (cf::MAP_LOADING);
1889		2016
1890	$self->alloc;	2017	$self->alloc;
1891		2018
1892	$self->pre_load;	2019	$self->pre_load;
1893	Coro::cede;	2020	cf::cede_to_tick;
1894		2021
		2022	my $f = new_from_file cf::object::thawer $self->{load_path};
		2023	$f->skip_block;
1895	$self->_load_objects ($self->{load_path}, 1)	2024	$self->_load_objects ($f)
1896	or return;	2025	or return;
1897		2026
1898	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2027	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899	if delete $self->{load_original};	2028	if delete $self->{load_original};
1900		2029
1901	if (my $uniq = $self->uniq_path) {	2030	if (my $uniq = $self->uniq_path) {
1902	utf8::encode $uniq;	2031	utf8::encode $uniq;
1903	if (aio_open $uniq, O_RDONLY, 0) {	2032	unless (aio_stat $uniq) {
		2033	if (my $f = new_from_file cf::object::thawer $uniq) {
1904	$self->clear_unique_items;	2034	$self->clear_unique_items;
1905	$self->_load_objects ($uniq, 0);	2035	$self->_load_objects ($f);
		2036	$f->resolve_delayed_derefs;
		2037	}
1906	}	2038	}
1907	}	2039	}
1908		2040
1909	Coro::cede;	2041	$f->resolve_delayed_derefs;
		2042
		2043	cf::cede_to_tick;
1910	# now do the right thing for maps	2044	# now do the right thing for maps
1911	$self->link_multipart_objects;	2045	$self->link_multipart_objects;
1912	$self->difficulty ($self->estimate_difficulty)	2046	$self->difficulty ($self->estimate_difficulty)
1913	unless $self->difficulty;	2047	unless $self->difficulty;
1914	Coro::cede;	2048	cf::cede_to_tick;
1915		2049
1916	unless ($self->{deny_activate}) {	2050	unless ($self->{deny_activate}) {
1917	$self->decay_objects;	2051	$self->decay_objects;
1918	$self->fix_auto_apply;	2052	$self->fix_auto_apply;
1919	$self->update_buttons;	2053	$self->update_buttons;
1920	Coro::cede;	2054	cf::cede_to_tick;
1921	$self->set_darkness_map;	2055	$self->set_darkness_map;
1922	Coro::cede;	2056	cf::cede_to_tick;
1923	$self->activate;	2057	$self->activate;
1924	}	2058	}
1925		2059
1926	$self->{last_save} = $cf::RUNTIME;	2060	$self->{last_save} = $cf::RUNTIME;
1927	$self->last_access ($cf::RUNTIME);	2061	$self->last_access ($cf::RUNTIME);
…		…
1943		2077
1944	$self	2078	$self
1945	}	2079	}
1946		2080
1947	# find and load all maps in the 3x3 area around a map	2081	# find and load all maps in the 3x3 area around a map
1948	sub load_diag {	2082	sub load_neighbours {
1949	my ($map) = @_;	2083	my ($map) = @_;
1950		2084
1951	my @diag; # diagonal neighbours	2085	my @neigh; # diagonal neighbours
1952		2086
1953	for (0 .. 3) {	2087	for (0 .. 3) {
1954	my $neigh = $map->tile_path ($_)	2088	my $neigh = $map->tile_path ($_)
1955	or next;	2089	or next;
1956	$neigh = find $neigh, $map	2090	$neigh = find $neigh, $map
1957	or next;	2091	or next;
1958	$neigh->load;	2092	$neigh->load;
1959		2093
		2094	push @neigh,
1960	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2095	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1961	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2096	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1962	}	2097	}
1963		2098
1964	for (@diag) {	2099	for (grep defined $_->[0], @neigh) {
		2100	my ($path, $origin) = @$_;
1965	my $neigh = find @$_	2101	my $neigh = find $path, $origin
1966	or next;	2102	or next;
1967	$neigh->load;	2103	$neigh->load;
1968	}	2104	}
1969	}	2105	}
1970		2106
…		…
1975	}	2111	}
1976		2112
1977	sub do_load_sync {	2113	sub do_load_sync {
1978	my ($map) = @_;	2114	my ($map) = @_;
1979		2115
		2116	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2117	if $Coro::current == $Coro::main;
		2118
1980	cf::sync_job { $map->load };	2119	cf::sync_job { $map->load };
1981	}	2120	}
1982		2121
1983	our %MAP_PREFETCH;	2122	our %MAP_PREFETCH;
1984	our $MAP_PREFETCHER = undef;	2123	our $MAP_PREFETCHER = undef;
1985		2124
1986	sub find_async {	2125	sub find_async {
1987	my ($path, $origin) = @_;	2126	my ($path, $origin, $load) = @_;
1988		2127
1989	$path = normalise $path, $origin && $origin->{path};	2128	$path = normalise $path, $origin && $origin->{path};
1990		2129
1991	if (my $map = $cf::MAP{$path}) {	2130	if (my $map = $cf::MAP{$path}) {
1992	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2131	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993	}	2132	}
1994		2133
1995	undef $MAP_PREFETCH{$path};	2134	$MAP_PREFETCH{$path} |= $load;
		2135
1996	$MAP_PREFETCHER ||= cf::async {	2136	$MAP_PREFETCHER ||= cf::async {
		2137	$Coro::current->{desc} = "map prefetcher";
		2138
1997	while (%MAP_PREFETCH) {	2139	while (%MAP_PREFETCH) {
1998	for my $path (keys %MAP_PREFETCH) {	2140	while (my ($k, $v) = each %MAP_PREFETCH) {
1999	if (my $map = find $path) {	2141	if (my $map = find $k) {
2000	$map->load;	2142	$map->load if $v;
2001	}	2143	}
2002		2144
2003	delete $MAP_PREFETCH{$path};	2145	delete $MAP_PREFETCH{$k};
2004	}	2146	}
2005	}	2147	}
2006	undef $MAP_PREFETCHER;	2148	undef $MAP_PREFETCHER;
2007	};	2149	};
2008	$MAP_PREFETCHER->prio (6);	2150	$MAP_PREFETCHER->prio (6);
…		…
2011	}	2153	}
2012		2154
2013	sub save {	2155	sub save {
2014	my ($self) = @_;	2156	my ($self) = @_;
2015		2157
2016	my $lock = cf::lock_acquire "map_data:" . $self->path;	2158	my $lock = cf::lock_acquire "map_data:$self->{path}";
2017		2159
2018	$self->{last_save} = $cf::RUNTIME;	2160	$self->{last_save} = $cf::RUNTIME;
2019		2161
2020	return unless $self->dirty;	2162	return unless $self->dirty;
2021		2163
…		…
2027	return if $self->{deny_save};	2169	return if $self->{deny_save};
2028		2170
2029	local $self->{last_access} = $self->last_access;#d#	2171	local $self->{last_access} = $self->last_access;#d#
2030		2172
2031	cf::async {	2173	cf::async {
		2174	$Coro::current->{desc} = "map player save";
2032	$_->contr->save for $self->players;	2175	$_->contr->save for $self->players;
2033	};	2176	};
2034		2177
2035	if ($uniq) {	2178	if ($uniq) {
2036	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2179	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2044	my ($self) = @_;	2187	my ($self) = @_;
2045		2188
2046	# save first because save cedes	2189	# save first because save cedes
2047	$self->save;	2190	$self->save;
2048		2191
2049	my $lock = cf::lock_acquire "map_data:" . $self->path;	2192	my $lock = cf::lock_acquire "map_data:$self->{path}";
2050		2193
2051	return if $self->players;	2194	return if $self->players;
2052	return if $self->in_memory != cf::MAP_IN_MEMORY;	2195	return if $self->in_memory != cf::MAP_IN_MEMORY;
2053	return if $self->{deny_save};	2196	return if $self->{deny_save};
2054		2197
		2198	$self->in_memory (cf::MAP_SWAPPED);
		2199
		2200	$self->deactivate;
		2201	$_->clear_links_to ($self) for values %cf::MAP;
2055	$self->clear;	2202	$self->clear;
2056	$self->in_memory (cf::MAP_SWAPPED);
2057	}	2203	}
2058		2204
2059	sub reset_at {	2205	sub reset_at {
2060	my ($self) = @_;	2206	my ($self) = @_;
2061		2207
…		…
2093	if $uniq;	2239	if $uniq;
2094	}	2240	}
2095		2241
2096	delete $cf::MAP{$self->path};	2242	delete $cf::MAP{$self->path};
2097		2243
		2244	$self->deactivate;
		2245	$_->clear_links_to ($self) for values %cf::MAP;
2098	$self->clear;	2246	$self->clear;
2099
2100	$_->clear_links_to ($self) for values %cf::MAP;
2101		2247
2102	$self->unlink_save;	2248	$self->unlink_save;
2103	$self->destroy;	2249	$self->destroy;
2104	}	2250	}
2105		2251
2106	my $nuke_counter = "aaaa";	2252	my $nuke_counter = "aaaa";
2107		2253
2108	sub nuke {	2254	sub nuke {
2109	my ($self) = @_;	2255	my ($self) = @_;
2110		2256
		2257	{
		2258	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2259
2111	delete $cf::MAP{$self->path};	2260	delete $cf::MAP{$self->path};
2112		2261
2113	$self->unlink_save;	2262	$self->unlink_save;
2114		2263
2115	bless $self, "cf::map";	2264	bless $self, "cf::map";
2116	delete $self->{deny_reset};	2265	delete $self->{deny_reset};
2117	$self->{deny_save} = 1;	2266	$self->{deny_save} = 1;
2118	$self->reset_timeout (1);	2267	$self->reset_timeout (1);
2119	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2268	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120		2269
2121	$cf::MAP{$self->path} = $self;	2270	$cf::MAP{$self->path} = $self;
		2271	}
2122		2272
2123	$self->reset; # polite request, might not happen	2273	$self->reset; # polite request, might not happen
2124	}	2274	}
2125		2275
2126	=item $maps = cf::map::tmp_maps	2276	=item $maps = cf::map::tmp_maps
…		…
2202		2352
2203	sub inv_recursive {	2353	sub inv_recursive {
2204	inv_recursive_ inv $_[0]	2354	inv_recursive_ inv $_[0]
2205	}	2355	}
2206		2356
		2357	=item $ref = $ob->ref
		2358
		2359	creates and returns a persistent reference to an objetc that can be stored as a string.
		2360
		2361	=item $ob = cf::object::deref ($refstring)
		2362
		2363	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2364	even if the object actually exists. May block.
		2365
		2366	=cut
		2367
		2368	sub deref {
		2369	my ($ref) = @_;
		2370
		2371	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2372	my ($uuid, $name) = ($1, $2);
		2373	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2374	or return;
		2375	$pl->ob->uuid eq $uuid
		2376	or return;
		2377
		2378	$pl->ob
		2379	} else {
		2380	warn "$ref: cannot resolve object reference\n";
		2381	undef
		2382	}
		2383	}
		2384
2207	package cf;	2385	package cf;
2208		2386
2209	=back	2387	=back
2210		2388
2211	=head3 cf::object::player	2389	=head3 cf::object::player
…		…
2243	$self->message ($msg, $flags);	2421	$self->message ($msg, $flags);
2244	}	2422	}
2245	}	2423	}
2246	}	2424	}
2247		2425
		2426	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2427
		2428	=cut
		2429
		2430	sub cf::object::send_msg {
		2431	my $pl = shift->contr
		2432	or return;
		2433	$pl->send_msg (@_);
		2434	}
		2435
2248	=item $player_object->may ("access")	2436	=item $player_object->may ("access")
2249		2437
2250	Returns wether the given player is authorized to access resource "access"	2438	Returns wether the given player is authorized to access resource "access"
2251	(e.g. "command_wizcast").	2439	(e.g. "command_wizcast").
2252		2440
…		…
2329	# use -1 or undef as default coordinates, not 0, 0	2517	# use -1 or undef as default coordinates, not 0, 0
2330	($x, $y) = ($map->enter_x, $map->enter_y)	2518	($x, $y) = ($map->enter_x, $map->enter_y)
2331	if $x <=0 && $y <= 0;	2519	if $x <=0 && $y <= 0;
2332		2520
2333	$map->load;	2521	$map->load;
2334	$map->load_diag;	2522	$map->load_neighbours;
2335		2523
2336	return unless $self->contr->active;	2524	return unless $self->contr->active;
2337	$self->activate_recursive;	2525	$self->activate_recursive;
2338		2526
2339	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2527	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2359	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2547	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360		2548
2361	$self->enter_link;	2549	$self->enter_link;
2362		2550
2363	(async {	2551	(async {
		2552	$Coro::current->{desc} = "player::goto $path $x $y";
		2553
		2554	# *tag paths override both path and x|y
		2555	if ($path =~ /^\*(.*)$/) {
		2556	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2557	my $ob = $obs[rand @obs];
		2558
		2559	# see if we actually can go there
		2560	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2561	$ob = $obs[rand @obs];
		2562	} else {
		2563	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2564	}
		2565	# else put us there anyways for now #d#
		2566
		2567	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2568	} else {
		2569	($path, $x, $y) = (undef, undef, undef);
		2570	}
		2571	}
		2572
2364	my $map = eval {	2573	my $map = eval {
2365	my $map = cf::map::find $path;	2574	my $map = defined $path ? cf::map::find $path : undef;
2366		2575
2367	if ($map) {	2576	if ($map) {
2368	$map = $map->customise_for ($self);	2577	$map = $map->customise_for ($self);
2369	$map = $check->($map) if $check && $map;	2578	$map = $check->($map) if $check && $map;
2370	} else {	2579	} else {
2371	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2580	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372	}	2581	}
2373		2582
2374	$map	2583	$map
2375	};	2584	};
2376		2585
…		…
2466	# if exit is damned, update players death & WoR home-position	2675	# if exit is damned, update players death & WoR home-position
2467	$self->contr->savebed ($slaying, $hp, $sp)	2676	$self->contr->savebed ($slaying, $hp, $sp)
2468	if $exit->flag (FLAG_DAMNED);	2677	if $exit->flag (FLAG_DAMNED);
2469		2678
2470	(async {	2679	(async {
		2680	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2681
2471	$self->deactivate_recursive; # just to be sure	2682	$self->deactivate_recursive; # just to be sure
2472	unless (eval {	2683	unless (eval {
2473	$self->goto ($slaying, $hp, $sp);	2684	$self->goto ($slaying, $hp, $sp);
2474		2685
2475	1;	2686	1;
…		…
2510	the message, with C<log> being the default. If C<$color> is negative, suppress	2721	the message, with C<log> being the default. If C<$color> is negative, suppress
2511	the message unless the client supports the msg packet.	2722	the message unless the client supports the msg packet.
2512		2723
2513	=cut	2724	=cut
2514		2725
		2726	# non-persistent channels (usually the info channel)
		2727	our %CHANNEL = (
		2728	"c/identify" => {
		2729	id => "infobox",
		2730	title => "Identify",
		2731	reply => undef,
		2732	tooltip => "Items recently identified",
		2733	},
		2734	"c/examine" => {
		2735	id => "infobox",
		2736	title => "Examine",
		2737	reply => undef,
		2738	tooltip => "Signs and other items you examined",
		2739	},
		2740	"c/book" => {
		2741	id => "infobox",
		2742	title => "Book",
		2743	reply => undef,
		2744	tooltip => "The contents of a note or book",
		2745	},
		2746	"c/lookat" => {
		2747	id => "infobox",
		2748	title => "Look",
		2749	reply => undef,
		2750	tooltip => "What you saw there",
		2751	},
		2752	"c/who" => {
		2753	id => "infobox",
		2754	title => "Players",
		2755	reply => undef,
		2756	tooltip => "Shows players who are currently online",
		2757	},
		2758	"c/body" => {
		2759	id => "infobox",
		2760	title => "Body Parts",
		2761	reply => undef,
		2762	tooltip => "Shows which body parts you posess and are available",
		2763	},
		2764	"c/uptime" => {
		2765	id => "infobox",
		2766	title => "Uptime",
		2767	reply => undef,
		2768	tooltip => "How long the server has been running since last restart",
		2769	},
		2770	"c/mapinfo" => {
		2771	id => "infobox",
		2772	title => "Map Info",
		2773	reply => undef,
		2774	tooltip => "Information related to the maps",
		2775	},
		2776	);
		2777
2515	sub cf::client::send_msg {	2778	sub cf::client::send_msg {
2516	my ($self, $channel, $msg, $color, @extra) = @_;	2779	my ($self, $channel, $msg, $color, @extra) = @_;
2517		2780
2518	$msg = $self->pl->expand_cfpod ($msg);	2781	$msg = $self->pl->expand_cfpod ($msg);
2519		2782
2520	$color &= cf::NDI_CLIENT_MASK; # just in case...	2783	$color &= cf::NDI_CLIENT_MASK; # just in case...
2521		2784
		2785	# check predefined channels, for the benefit of C
		2786	if ($CHANNEL{$channel}) {
		2787	$channel = $CHANNEL{$channel};
		2788
		2789	$self->ext_msg (channel_info => $channel)
		2790	if $self->can_msg;
		2791
		2792	$channel = $channel->{id};
		2793
2522	if (ref $channel) {	2794	} elsif (ref $channel) {
2523	# send meta info to client, if not yet sent	2795	# send meta info to client, if not yet sent
2524	unless (exists $self->{channel}{$channel->{id}}) {	2796	unless (exists $self->{channel}{$channel->{id}}) {
2525	$self->{channel}{$channel->{id}} = $channel;	2797	$self->{channel}{$channel->{id}} = $channel;
2526	$self->ext_msg (channel_info => $channel);	2798	$self->ext_msg (channel_info => $channel)
		2799	if $self->can_msg;
2527	}	2800	}
2528		2801
2529	$channel = $channel->{id};	2802	$channel = $channel->{id};
2530	}	2803	}
2531		2804
…		…
2550	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;	2823	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551	}	2824	}
2552		2825
2553	$color &= cf::NDI_COLOR_MASK;	2826	$color &= cf::NDI_COLOR_MASK;
2554		2827
		2828	utf8::encode $msg;
		2829
2555	if (0 && $msg =~ /\[/) {	2830	if (0 && $msg =~ /\[/) {
		2831	# COMMAND/INFO
2556	$self->send_packet ("drawextinfo $color 4 0 $msg")	2832	$self->send_packet ("drawextinfo $color 10 8 $msg")
2557	} else {	2833	} else {
2558	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2834	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559	$self->send_packet ("drawinfo $color $msg")	2835	$self->send_packet ("drawinfo $color $msg")
2560	}	2836	}
2561	}	2837	}
…		…
2569	=cut	2845	=cut
2570		2846
2571	sub cf::client::ext_msg($$@) {	2847	sub cf::client::ext_msg($$@) {
2572	my ($self, $type, @msg) = @_;	2848	my ($self, $type, @msg) = @_;
2573		2849
2574	my $extcmd = $self->extcmd;
2575
2576	if ($extcmd == 2) {	2850	if ($self->extcmd == 2) {
2577	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2851	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578	} elsif ($extcmd == 1) { # TODO: remove	2852	} elsif ($self->extcmd == 1) { # TODO: remove
2579	push @msg, msgtype => "event_$type";	2853	push @msg, msgtype => "event_$type";
		2854	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2855	}
		2856	}
		2857
		2858	=item $client->ext_reply ($msgid, @msg)
		2859
		2860	Sends an ext reply to the client.
		2861
		2862	=cut
		2863
		2864	sub cf::client::ext_reply($$@) {
		2865	my ($self, $id, @msg) = @_;
		2866
		2867	if ($self->extcmd == 2) {
		2868	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2869	} elsif ($self->extcmd == 1) {
		2870	#TODO: version 1, remove
		2871	unshift @msg, msgtype => "reply", msgid => $id;
2580	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2872	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581	}	2873	}
2582	}	2874	}
2583		2875
2584	=item $success = $client->query ($flags, "text", \&cb)	2876	=item $success = $client->query ($flags, "text", \&cb)
…		…
2646	my ($type, $reply, @payload) =	2938	my ($type, $reply, @payload) =
2647	"ARRAY" eq ref $msg	2939	"ARRAY" eq ref $msg
2648	? @$msg	2940	? @$msg
2649	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	2941	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650		2942
		2943	my @reply;
		2944
2651	if (my $cb = $EXTICMD{$type}) {	2945	if (my $cb = $EXTICMD{$type}) {
2652	my @reply = $cb->($ns, @payload);	2946	@reply = $cb->($ns, @payload);
2653
2654	$ns->ext_reply ($reply, @reply)
2655	if $reply;
2656	}	2947	}
		2948
		2949	$ns->ext_reply ($reply, @reply)
		2950	if $reply;
		2951
2657	} else {	2952	} else {
2658	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2953	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659	}	2954	}
2660		2955
2661	cf::override;	2956	cf::override;
…		…
2708	our $safe = new Safe "safe";	3003	our $safe = new Safe "safe";
2709	our $safe_hole = new Safe::Hole;	3004	our $safe_hole = new Safe::Hole;
2710		3005
2711	$SIG{FPE} = 'IGNORE';	3006	$SIG{FPE} = 'IGNORE';
2712		3007
2713	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	3008	$safe->permit_only (Opcode::opset qw(
		3009	:base_core :base_mem :base_orig :base_math
		3010	grepstart grepwhile mapstart mapwhile
		3011	sort time
		3012	));
2714		3013
2715	# here we export the classes and methods available to script code	3014	# here we export the classes and methods available to script code
2716		3015
2717	=pod	3016	=pod
2718		3017
2719	The following functions and methods are available within a safe environment:	3018	The following functions and methods are available within a safe environment:
2720		3019
2721	cf::object	3020	cf::object
2722	contr pay_amount pay_player map x y force_find force_add	3021	contr pay_amount pay_player map x y force_find force_add destroy
2723	insert remove	3022	insert remove name archname title slaying race decrease_ob_nr
2724		3023
2725	cf::object::player	3024	cf::object::player
2726	player	3025	player
2727		3026
2728	cf::player	3027	cf::player
…		…
2733		3032
2734	=cut	3033	=cut
2735		3034
2736	for (	3035	for (
2737	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3036	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3037	insert remove inv name archname title slaying race
2738	insert remove)],	3038	decrease_ob_nr destroy)],
2739	["cf::object::player" => qw(player)],	3039	["cf::object::player" => qw(player)],
2740	["cf::player" => qw(peaceful)],	3040	["cf::player" => qw(peaceful)],
2741	["cf::map" => qw(trigger)],	3041	["cf::map" => qw(trigger)],
2742	) {	3042	) {
2743	no strict 'refs';	3043	no strict 'refs';
…		…
2819	# the server's init and main functions	3119	# the server's init and main functions
2820		3120
2821	sub load_facedata($) {	3121	sub load_facedata($) {
2822	my ($path) = @_;	3122	my ($path) = @_;
2823		3123
		3124	# HACK to clear player env face cache, we need some signal framework
		3125	# for this (global event?)
		3126	%ext::player_env::MUSIC_FACE_CACHE = ();
		3127
		3128	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3129
2824	warn "loading facedata from $path\n";	3130	warn "loading facedata from $path\n";
2825		3131
2826	my $facedata;	3132	my $facedata;
2827	0 < aio_load $path, $facedata	3133	0 < aio_load $path, $facedata
2828	or die "$path: $!";	3134	or die "$path: $!";
2829		3135
2830	$facedata = Coro::Storable::thaw $facedata;	3136	$facedata = Coro::Storable::thaw $facedata;
2831		3137
2832	$facedata->{version} == 2	3138	$facedata->{version} == 2
2833	or cf::cleanup "$path: version mismatch, cannot proceed.";	3139	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3140
		3141	# patch in the exptable
		3142	$facedata->{resource}{"res/exp_table"} = {
		3143	type => FT_RSRC,
		3144	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3145	};
		3146	cf::cede_to_tick;
2834		3147
2835	{	3148	{
2836	my $faces = $facedata->{faceinfo};	3149	my $faces = $facedata->{faceinfo};
2837		3150
2838	while (my ($face, $info) = each %$faces) {	3151	while (my ($face, $info) = each %$faces) {
2839	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3152	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2840	cf::face::set_visibility $idx, $info->{visibility};	3153	cf::face::set_visibility $idx, $info->{visibility};
2841	cf::face::set_magicmap $idx, $info->{magicmap};	3154	cf::face::set_magicmap $idx, $info->{magicmap};
2842	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3155	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3156	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844		3157
2845	cf::cede_to_tick;	3158	cf::cede_to_tick;
2846	}	3159	}
2847		3160
2848	while (my ($face, $info) = each %$faces) {	3161	while (my ($face, $info) = each %$faces) {
…		…
2873		3186
2874	{	3187	{
2875	# TODO: for gcfclient pleasure, we should give resources	3188	# TODO: for gcfclient pleasure, we should give resources
2876	# that gcfclient doesn't grok a >10000 face index.	3189	# that gcfclient doesn't grok a >10000 face index.
2877	my $res = $facedata->{resource};	3190	my $res = $facedata->{resource};
2878	my $enc = JSON::XS->new->utf8->canonical;
2879		3191
2880	my $soundconf = delete $res->{"res/sound.conf"};	3192	my $soundconf = delete $res->{"res/sound.conf"};
2881		3193
2882	while (my ($name, $info) = each %$res) {	3194	while (my ($name, $info) = each %$res) {
2883	my $meta = $enc->encode ({
2884	name => $name,
2885	%{ $info->{meta} || {} },
2886	});
2887
2888	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3195	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3196	my $data;
2889		3197
2890	if ($info->{type} & 1) {	3198	if ($info->{type} & 1) {
2891	# prepend meta info	3199	# prepend meta info
2892		3200
		3201	my $meta = $enc->encode ({
		3202	name => $name,
		3203	%{ $info->{meta} || {} },
		3204	});
		3205
2893	my $data = pack "(w/a*)*", $meta, $info->{data};	3206	$data = pack "(w/a*)*", $meta, $info->{data};
2894	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896	cf::face::set_data $idx, 0, $data, $chk;
2897	} else {	3207	} else {
2898	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};	3208	$data = $info->{data};
2899	}	3209	}
2900		3210
		3211	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2901	cf::face::set_type $idx, $info->{type};	3212	cf::face::set_type $idx, $info->{type};
2902		3213
2903	cf::cede_to_tick;	3214	cf::cede_to_tick;
2904	}	3215	}
2905		3216
…		…
2932	$ns->fx_want ($k, $v);	3243	$ns->fx_want ($k, $v);
2933	}	3244	}
2934	};	3245	};
2935		3246
2936	sub reload_regions {	3247	sub reload_regions {
		3248	# HACK to clear player env face cache, we need some signal framework
		3249	# for this (global event?)
		3250	%ext::player_env::MUSIC_FACE_CACHE = ();
		3251
2937	load_resource_file "$MAPDIR/regions"	3252	load_resource_file "$MAPDIR/regions"
2938	or die "unable to load regions file\n";	3253	or die "unable to load regions file\n";
2939		3254
2940	for (cf::region::list) {	3255	for (cf::region::list) {
2941	$_->{match} = qr/$_->{match}/	3256	$_->{match} = qr/$_->{match}/
…		…
2977		3292
2978	sub init {	3293	sub init {
2979	reload_resources;	3294	reload_resources;
2980	}	3295	}
2981		3296
2982	sub cfg_load {	3297	sub reload_config {
2983	open my $fh, "<:utf8", "$CONFDIR/config"	3298	open my $fh, "<:utf8", "$CONFDIR/config"
2984	or return;	3299	or return;
2985		3300
2986	local $/;	3301	local $/;
2987	*CFG = YAML::Syck::Load <$fh>;	3302	*CFG = YAML::Syck::Load <$fh>;
…		…
3003	sub main {	3318	sub main {
3004	# we must not ever block the main coroutine	3319	# we must not ever block the main coroutine
3005	local $Coro::idle = sub {	3320	local $Coro::idle = sub {
3006	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3321	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3007	(async {	3322	(async {
3008	Event::one_event;	3323	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3324	EV::loop EV::LOOP_ONESHOT;
3009	})->prio (Coro::PRIO_MAX);	3325	})->prio (Coro::PRIO_MAX);
3010	};	3326	};
3011		3327
3012	cfg_load;	3328	reload_config;
3013	db_init;	3329	db_init;
3014	load_extensions;	3330	load_extensions;
3015		3331
3016	$TICK_WATCHER->start;	3332	$TICK_WATCHER->start;
		3333	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3017	Event::loop;	3334	EV::loop;
3018	}	3335	}
3019		3336
3020	#############################################################################	3337	#############################################################################
3021	# initialisation and cleanup	3338	# initialisation and cleanup
3022		3339
3023	# install some emergency cleanup handlers	3340	# install some emergency cleanup handlers
3024	BEGIN {	3341	BEGIN {
		3342	our %SIGWATCHER = ();
3025	for my $signal (qw(INT HUP TERM)) {	3343	for my $signal (qw(INT HUP TERM)) {
3026	Event->signal (	3344	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3027	reentrant => 0,
3028	data => WF_AUTOCANCEL,
3029	signal => $signal,
3030	prio => 0,
3031	cb => sub {
3032	cf::cleanup "SIG$signal";	3345	cf::cleanup "SIG$signal";
3033	},
3034	);	3346	};
3035	}	3347	}
3036	}	3348	}
3037		3349
3038	sub write_runtime {	3350	sub write_runtime {
3039	my $runtime = "$LOCALDIR/runtime";	3351	my $runtime = "$LOCALDIR/runtime";
…		…
3084	# and maps saved/destroyed asynchronously.	3396	# and maps saved/destroyed asynchronously.
3085	warn "begin emergency player save\n";	3397	warn "begin emergency player save\n";
3086	for my $login (keys %cf::PLAYER) {	3398	for my $login (keys %cf::PLAYER) {
3087	my $pl = $cf::PLAYER{$login} or next;	3399	my $pl = $cf::PLAYER{$login} or next;
3088	$pl->valid or next;	3400	$pl->valid or next;
		3401	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3089	$pl->save;	3402	$pl->save;
3090	}	3403	}
3091	warn "end emergency player save\n";	3404	warn "end emergency player save\n";
3092		3405
3093	warn "begin emergency map save\n";	3406	warn "begin emergency map save\n";
…		…
3132	warn "syncing database to disk";	3445	warn "syncing database to disk";
3133	BDB::db_env_txn_checkpoint $DB_ENV;	3446	BDB::db_env_txn_checkpoint $DB_ENV;
3134		3447
3135	# if anything goes wrong in here, we should simply crash as we already saved	3448	# if anything goes wrong in here, we should simply crash as we already saved
3136		3449
3137	warn "cancelling all WF_AUTOCANCEL watchers";
3138	for (Event::all_watchers) {
3139	$_->cancel if $_->data & WF_AUTOCANCEL;
3140	}
3141
3142	warn "flushing outstanding aio requests";	3450	warn "flushing outstanding aio requests";
3143	for (;;) {	3451	for (;;) {
3144	BDB::flush;	3452	BDB::flush;
3145	IO::AIO::flush;	3453	IO::AIO::flush;
3146	Coro::cede;	3454	Coro::cede_notself;
3147	last unless IO::AIO::nreqs || BDB::nreqs;	3455	last unless IO::AIO::nreqs || BDB::nreqs;
3148	warn "iterate...";	3456	warn "iterate...";
3149	}	3457	}
3150		3458
3151	++$RELOAD;	3459	++$RELOAD;
…		…
3210	warn "reloading cf.pm";	3518	warn "reloading cf.pm";
3211	require cf;	3519	require cf;
3212	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3520	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3213		3521
3214	warn "loading config and database again";	3522	warn "loading config and database again";
3215	cf::cfg_load;	3523	cf::reload_config;
3216		3524
3217	warn "loading extensions";	3525	warn "loading extensions";
3218	cf::load_extensions;	3526	cf::load_extensions;
3219		3527
3220	warn "reattaching attachments to objects/players";	3528	warn "reattaching attachments to objects/players";
…		…
3240		3548
3241	sub reload_perl() {	3549	sub reload_perl() {
3242	# doing reload synchronously and two reloads happen back-to-back,	3550	# doing reload synchronously and two reloads happen back-to-back,
3243	# coro crashes during coro_state_free->destroy here.	3551	# coro crashes during coro_state_free->destroy here.
3244		3552
3245	$RELOAD_WATCHER ||= Event->timer (	3553	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3246	reentrant => 0,
3247	after => 0,
3248	data => WF_AUTOCANCEL,
3249	cb => sub {
3250	do_reload_perl;
3251	undef $RELOAD_WATCHER;	3554	undef $RELOAD_WATCHER;
3252	},	3555	do_reload_perl;
3253	);	3556	};
3254	}	3557	}
3255		3558
3256	register_command "reload" => sub {	3559	register_command "reload" => sub {
3257	my ($who, $arg) = @_;	3560	my ($who, $arg) = @_;
3258		3561
3259	if ($who->flag (FLAG_WIZ)) {	3562	if ($who->flag (FLAG_WIZ)) {
3260	$who->message ("reloading server.");	3563	$who->message ("reloading server.");
		3564	async {
		3565	$Coro::current->{desc} = "perl_reload";
3261	async { reload_perl };	3566	reload_perl;
		3567	};
3262	}	3568	}
3263	};	3569	};
3264		3570
3265	unshift @INC, $LIBDIR;	3571	unshift @INC, $LIBDIR;
3266		3572
…		…
3285	my $signal = new Coro::Signal;	3591	my $signal = new Coro::Signal;
3286	push @WAIT_FOR_TICK_BEGIN, $signal;	3592	push @WAIT_FOR_TICK_BEGIN, $signal;
3287	$signal->wait;	3593	$signal->wait;
3288	}	3594	}
3289		3595
3290	my $min = 1e6;#d#	3596	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3291	my $avg = 10;
3292	$TICK_WATCHER = Event->timer (
3293	reentrant => 0,
3294	parked => 1,
3295	prio => 0,
3296	at => $NEXT_TICK || $TICK,
3297	data => WF_AUTOCANCEL,
3298	cb => sub {
3299	if ($Coro::current != $Coro::main) {	3597	if ($Coro::current != $Coro::main) {
3300	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3598	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3301	unless ++$bug_warning > 10;	3599	unless ++$bug_warning > 10;
3302	return;	3600	return;
3303	}	3601	}
3304		3602
3305	$NOW = $tick_start = Event::time;	3603	$NOW = $tick_start = EV::now;
3306		3604
3307	cf::server_tick; # one server iteration	3605	cf::server_tick; # one server iteration
3308		3606
3309	0 && sync_job {#d#	3607	$RUNTIME += $TICK;
3310	for(1..10) {	3608	$NEXT_TICK += $TICK;
3311	my $t = Event::time;
3312	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3313	or die;
3314		3609
3315	$map->width (50);	3610	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3316	$map->height (50);	3611	$NEXT_RUNTIME_WRITE = $NOW + 10;
3317	$map->alloc;	3612	Coro::async_pool {
3318	$map->_load_objects ("/tmp/x.map", 1);	3613	$Coro::current->{desc} = "runtime saver";
3319	my $t = Event::time - $t;	3614	write_runtime
3320		3615	or warn "ERROR: unable to write runtime file: $!";
3321	#next unless $t < 0.0013;#d#
3322	if ($t < $min) {
3323	$min = $t;
3324	}
3325	$avg = $avg * 0.99 + $t * 0.01;
3326	}
3327	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3328	exit 0;
3329	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3330	};	3616	};
		3617	}
3331		3618
3332	$RUNTIME += $TICK;
3333	$NEXT_TICK += $TICK;
3334
3335	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336	$NEXT_RUNTIME_WRITE = $NOW + 10;
3337	Coro::async_pool {
3338	write_runtime
3339	or warn "ERROR: unable to write runtime file: $!";
3340	};
3341	}
3342
3343	# my $AFTER = Event::time;
3344	# warn $AFTER - $NOW;#d#
3345
3346	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3619	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3347	$sig->send;	3620	$sig->send;
3348	}	3621	}
3349	while (my $sig = shift @WAIT_FOR_TICK) {	3622	while (my $sig = shift @WAIT_FOR_TICK) {
3350	$sig->send;	3623	$sig->send;
3351	}	3624	}
3352		3625
3353	$NOW = Event::time;
3354
3355	# if we are delayed by four ticks or more, skip them all
3356	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3357
3358	$TICK_WATCHER->at ($NEXT_TICK);
3359	$TICK_WATCHER->start;
3360
3361	$LOAD = ($NOW - $tick_start) / $TICK;	3626	$LOAD = ($NOW - $tick_start) / $TICK;
3362	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3627	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3363		3628
3364	_post_tick;	3629	_post_tick;
3365		3630	};
3366		3631	$TICK_WATCHER->priority (EV::MAXPRI);
3367	},
3368	);
3369		3632
3370	{	3633	{
		3634	BDB::min_parallel 8;
3371	BDB::max_poll_time $TICK * 0.1;	3635	BDB::max_poll_time $TICK * 0.1;
3372	$BDB_POLL_WATCHER = Event->io (	3636	$BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3373	reentrant => 0,
3374	fd => BDB::poll_fileno,
3375	poll => 'r',
3376	prio => 0,
3377	data => WF_AUTOCANCEL,
3378	cb => \&BDB::poll_cb,
3379	);
3380	BDB::min_parallel 8;
3381		3637
3382	BDB::set_sync_prepare {	3638	BDB::set_sync_prepare {
3383	my $status;	3639	my $status;
3384	my $current = $Coro::current;	3640	my $current = $Coro::current;
3385	(	3641	(
…		…
3394	)	3650	)
3395	};	3651	};
3396		3652
3397	unless ($DB_ENV) {	3653	unless ($DB_ENV) {
3398	$DB_ENV = BDB::db_env_create;	3654	$DB_ENV = BDB::db_env_create;
		3655	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3656	| BDB::LOG_AUTOREMOVE, 1);
		3657	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3658	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3399		3659
3400	cf::sync_job {	3660	cf::sync_job {
3401	eval {	3661	eval {
3402	BDB::db_env_open	3662	BDB::db_env_open
3403	$DB_ENV,	3663	$DB_ENV,
…		…
3405	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3665	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3406	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3666	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3407	0666;	3667	0666;
3408		3668
3409	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3669	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3410
3411	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3412	$DB_ENV->set_lk_detect;
3413	};	3670	};
3414		3671
3415	cf::cleanup "db_env_open(db): $@" if $@;	3672	cf::cleanup "db_env_open(db): $@" if $@;
3416	};	3673	};
3417	}	3674	}
		3675
		3676	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3677	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3678	};
		3679	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3680	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3681	};
		3682	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3683	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3684	};
3418	}	3685	}
3419		3686
3420	{	3687	{
3421	IO::AIO::min_parallel 8;	3688	IO::AIO::min_parallel 8;
3422		3689
3423	undef $Coro::AIO::WATCHER;	3690	undef $Coro::AIO::WATCHER;
3424	IO::AIO::max_poll_time $TICK * 0.1;	3691	IO::AIO::max_poll_time $TICK * 0.1;
3425	$AIO_POLL_WATCHER = Event->io (	3692	$AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3426	reentrant => 0,
3427	data => WF_AUTOCANCEL,
3428	fd => IO::AIO::poll_fileno,
3429	poll => 'r',
3430	prio => 6,
3431	cb => \&IO::AIO::poll_cb,
3432	);
3433	}	3693	}
3434		3694
3435	my $_log_backtrace;	3695	my $_log_backtrace;
3436		3696
3437	sub _log_backtrace {	3697	sub _log_backtrace {
…		…
3441		3701
3442	# limit the # of concurrent backtraces	3702	# limit the # of concurrent backtraces
3443	if ($_log_backtrace < 2) {	3703	if ($_log_backtrace < 2) {
3444	++$_log_backtrace;	3704	++$_log_backtrace;
3445	async {	3705	async {
		3706	$Coro::current->{desc} = "abt $msg";
		3707
3446	my @bt = fork_call {	3708	my @bt = fork_call {
3447	@addr = map { sprintf "%x", $_ } @addr;	3709	@addr = map { sprintf "%x", $_ } @addr;
3448	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3710	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3449	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3711	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3450	or die "addr2line: $!";	3712	or die "addr2line: $!";

Diff Legend

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