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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 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.64 ();	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	use Coro::Util ();
25		25
26	use JSON::XS 1.4 ();	26	use JSON::XS 2.01 ();
27	use BDB ();	27	use BDB ();
28	use Data::Dumper;	28	use Data::Dumper;
29	use Digest::MD5;	29	use Digest::MD5;
30	use Fcntl;	30	use Fcntl;
31	use YAML::Syck ();	31	use YAML::Syck ();
32	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
33	use Time::HiRes;	33	use Time::HiRes;
34	use Compress::LZF;	34	use Compress::LZF;
35	use Digest::MD5 ();	35	use Digest::MD5 ();
36		36
37	# configure various modules to our taste	37	# configure various modules to our taste
38	#	38	#
39	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
40	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
41	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
42
43	$Event::Eval = 1; # no idea why this is required, but it is
44		42
45	# 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?
46	$YAML::Syck::ImplicitUnicode = 1;	44	$YAML::Syck::ImplicitUnicode = 1;
47		45
48	$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
…		…
80	our $NEXT_TICK;	78	our $NEXT_TICK;
81	our $NOW;	79	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	80	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		81
84	our $BDB_POLL_WATCHER;	82	our $BDB_POLL_WATCHER;
		83	our $BDB_DEADLOCK_WATCHER;
		84	our $BDB_CHECKPOINT_WATCHER;
		85	our $BDB_TRICKLE_WATCHER;
85	our $DB_ENV;	86	our $DB_ENV;
86		87
87	our %CFG;	88	our %CFG;
88		89
89	our $UPTIME; $UPTIME ||= time;	90	our $UPTIME; $UPTIME ||= time;
90	our $RUNTIME;	91	our $RUNTIME;
91		92
92	our %PLAYER; # all users	93	our (%PLAYER, %PLAYER_LOADING); # all users
93	our %MAP; # all maps	94	our (%MAP, %MAP_LOADING ); # all maps
94	our $LINK_MAP; # the special {link} map, which is always available	95	our $LINK_MAP; # the special {link} map, which is always available
95		96
96	# 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 ∕
97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	98	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98		99
…		…
159		160
160	The raw value load value from the last tick.	161	The raw value load value from the last tick.
161		162
162	=item %cf::CFG	163	=item %cf::CFG
163		164
164	Configuration for the server, loaded from C</etc/crossfire/config>, or	165	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165	from wherever your confdir points to.	166	from wherever your confdir points to.
166		167
167	=item cf::wait_for_tick, cf::wait_for_tick_begin	168	=item cf::wait_for_tick, cf::wait_for_tick_begin
168		169
169	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
…		…
187	$msg .= "\n"	188	$msg .= "\n"
188	unless $msg =~ /\n$/;	189	unless $msg =~ /\n$/;
189		190
190	$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;
191		192
192	utf8::encode $msg;
193	LOG llevError, $msg;	193	LOG llevError, $msg;
194	};	194	};
195	}	195	}
196		196
197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
213	)) {	213	)) {
214	no strict 'refs';	214	no strict 'refs';
215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216	}	216	}
217		217
218	$Event::DIED = sub {	218	$EV::DIED = sub {
219	warn "error in event callback: @_";	219	warn "error in event callback: @_";
220	};	220	};
221		221
222	#############################################################################	222	#############################################################################
223		223
…		…
246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247	$d	247	$d
248	} || "[unable to dump $_[0]: '$@']";	248	} || "[unable to dump $_[0]: '$@']";
249	}	249	}
250		250
251	=item $ref = cf::from_json $json	251	=item $ref = cf::decode_json $json
252		252
253	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
254		254
255	=item $json = cf::to_json $ref	255	=item $json = cf::encode_json $ref
256		256
257	Converts a perl data structure into its JSON representation.	257	Converts a perl data structure into its JSON representation.
258		258
259	=cut	259	=cut
260		260
261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262		262
263	sub to_json ($) { $json_coder->encode ($_[0]) }	263	sub encode_json($) { $json_coder->encode ($_[0]) }
264	sub from_json ($) { $json_coder->decode ($_[0]) }	264	sub decode_json($) { $json_coder->decode ($_[0]) }
265		265
266	=item cf::lock_wait $string	266	=item cf::lock_wait $string
267		267
268	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
269		269
…		…
272	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
273	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,
274	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
275	returned.	275	returned.
276		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
277	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
278	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
279		282
280	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
281		284
282	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.
283		286
284	=cut	287	=cut
285		288
286	our %LOCK;	289	our %LOCK;
		290	our %LOCKER;#d#
287		291
288	sub lock_wait($) {	292	sub lock_wait($) {
289	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#
290		299
291	# wait for lock, if any	300	# wait for lock, if any
292	while ($LOCK{$key}) {	301	while ($LOCK{$key}) {
293	push @{ $LOCK{$key} }, $Coro::current;	302	push @{ $LOCK{$key} }, $Coro::current;
294	Coro::schedule;	303	Coro::schedule;
…		…
300		309
301	# wait, to be sure we are not locked	310	# wait, to be sure we are not locked
302	lock_wait $key;	311	lock_wait $key;
303		312
304	$LOCK{$key} = [];	313	$LOCK{$key} = [];
		314	$LOCKER{$key} = $Coro::current;#d#
305		315
306	Coro::guard {	316	Coro::guard {
		317	delete $LOCKER{$key};#d#
307	# wake up all waiters, to be on the safe side	318	# wake up all waiters, to be on the safe side
308	$_->ready for @{ delete $LOCK{$key} };	319	$_->ready for @{ delete $LOCK{$key} };
309	}	320	}
310	}	321	}
311		322
…		…
323	};	334	};
324	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
325	$guard	336	$guard
326	}	337	}
327		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
328	=item cf::get_slot $time[, $priority[, $name]]	354	=item cf::get_slot $time[, $priority[, $name]]
329		355
330	Allocate $time seconds of blocking CPU time at priority C<$priority>:	356	Allocate $time seconds of blocking CPU time at priority C<$priority>:
331	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
332	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.
…		…
341	our @SLOT_QUEUE;	367	our @SLOT_QUEUE;
342	our $SLOT_QUEUE;	368	our $SLOT_QUEUE;
343		369
344	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	370	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345	$SLOT_QUEUE = Coro::async {	371	$SLOT_QUEUE = Coro::async {
		372	$Coro::current->desc ("timeslot manager");
		373
346	my $signal = new Coro::Signal;	374	my $signal = new Coro::Signal;
347		375
348	while () {	376	while () {
349	next_job:	377	next_job:
350	my $avail = cf::till_tick;	378	my $avail = cf::till_tick;
…		…
358	}	386	}
359	}	387	}
360	}	388	}
361		389
362	if (@SLOT_QUEUE) {	390	if (@SLOT_QUEUE) {
363	# 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
364	push @cf::WAIT_FOR_TICK, $signal;	392	push @cf::WAIT_FOR_TICK, $signal;
365	$signal->wait;	393	$signal->wait;
366	} else {	394	} else {
367	Coro::schedule;	395	Coro::schedule;
368	}	396	}
…		…
391		419
392	BEGIN { *async = \&Coro::async_pool }	420	BEGIN { *async = \&Coro::async_pool }
393		421
394	=item cf::sync_job { BLOCK }	422	=item cf::sync_job { BLOCK }
395		423
396	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	424	The design of Deliantra requires that the main coroutine ($Coro::main)
397	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
398	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
399	acceptable.	427	acceptable.
400		428
401	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
402	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
…		…
407		435
408	sub sync_job(&) {	436	sub sync_job(&) {
409	my ($job) = @_;	437	my ($job) = @_;
410		438
411	if ($Coro::current == $Coro::main) {	439	if ($Coro::current == $Coro::main) {
412	my $time = Event::time;	440	my $time = EV::time;
413		441
414	# this is the main coro, too bad, we have to block	442	# this is the main coro, too bad, we have to block
415	# till the operation succeeds, freezing the server :/	443	# till the operation succeeds, freezing the server :/
416		444
		445	LOG llevError, Carp::longmess "sync job";#d#
		446
417	# TODO: use suspend/resume instead	447	# TODO: use suspend/resume instead
418	# (but this is cancel-safe)	448	# (but this is cancel-safe)
419	my $freeze_guard = freeze_mainloop;	449	my $freeze_guard = freeze_mainloop;
420		450
421	my $busy = 1;	451	my $busy = 1;
422	my @res;	452	my @res;
423		453
424	(async {	454	(async {
		455	$Coro::current->desc ("sync job coro");
425	@res = eval { $job->() };	456	@res = eval { $job->() };
426	warn $@ if $@;	457	warn $@ if $@;
427	undef $busy;	458	undef $busy;
428	})->prio (Coro::PRIO_MAX);	459	})->prio (Coro::PRIO_MAX);
429		460
430	while ($busy) {	461	while ($busy) {
431	Coro::cede or Event::one_event;	462	if (Coro::nready) {
		463	Coro::cede_notself;
		464	} else {
		465	EV::loop EV::LOOP_ONESHOT;
432	}	466	}
		467	}
433		468
434	$time = Event::time - $time;	469	$time = EV::time - $time;
435		470
436	LOG llevError | logBacktrace, Carp::longmess "long sync job"	471	LOG llevError | logBacktrace, Carp::longmess "long sync job"
437	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	472	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438		473
439	$tick_start += $time; # do not account sync jobs to server load	474	$tick_start += $time; # do not account sync jobs to server load
…		…
469	=item fork_call { }, $args	504	=item fork_call { }, $args
470		505
471	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
472	process, returning the results. Everything must be serialisable with	507	process, returning the results. Everything must be serialisable with
473	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
474	never block itself or use any form of Event handling.	509	never block itself or use any form of event handling.
475		510
476	=cut	511	=cut
477		512
478	sub fork_call(&@) {	513	sub fork_call(&@) {
479	my ($cb, @args) = @_;	514	my ($cb, @args) = @_;
480		515
481	# we seemingly have to make a local copy of the whole thing,	516	# we seemingly have to make a local copy of the whole thing,
482	# otherwise perl prematurely frees the stuff :/	517	# otherwise perl prematurely frees the stuff :/
483	# TODO: investigate and fix (liekly this will be rather laborious)	518	# TODO: investigate and fix (likely this will be rather laborious)
484		519
485	my @res = Coro::Util::fork_eval {	520	my @res = Coro::Util::fork_eval {
486	reset_signals;	521	reset_signals;
487	&$cb	522	&$cb
488	}, @args;	523	}, @args;
…		…
497	=item cf::db_put $family => $key => $value	532	=item cf::db_put $family => $key => $value
498		533
499	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
500	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).
501		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
502	=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	}
503		560
504	our $DB;	561	our $DB;
505		562
506	sub db_init {	563	sub db_init {
507	unless ($DB) {
508	$DB = BDB::db_create $DB_ENV;
509
510	cf::sync_job {	564	cf::sync_job {
511	eval {	565	$DB ||= db_table "db";
512	$DB->set_flags (BDB::CHKSUM);
513
514	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516	cf::cleanup "db_open(db): $!" if $!;
517	};
518	cf::cleanup "db_open(db): $@" if $@;
519	};
520	}	566	};
521	}	567	}
522		568
523	sub db_get($$) {	569	sub db_get($$) {
524	my $key = "$_[0]/$_[1]";	570	my $key = "$_[0]/$_[1]";
525		571
…		…
575	if (1) {	621	if (1) {
576	$md5 =	622	$md5 =
577	join "\x00",	623	join "\x00",
578	$processversion,	624	$processversion,
579	map {	625	map {
580	Coro::cede;	626	cf::cede_to_tick;
581	($src->[$_], Digest::MD5::md5_hex $data[$_])	627	($src->[$_], Digest::MD5::md5_hex $data[$_])
582	} 0.. $#$src;	628	} 0.. $#$src;
583		629
584		630
585	my $dbmd5 = db_get cache => "$id/md5";	631	my $dbmd5 = db_get cache => "$id/md5";
…		…
629	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")
630	to it. All such attachable objects support the following methods.	676	to it. All such attachable objects support the following methods.
631		677
632	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>
633	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
634	Crossfire TRT).	680	Deliantra).
635		681
636	=over 4	682	=over 4
637		683
638	=item $attachable->attach ($attachment, key => $value...)	684	=item $attachable->attach ($attachment, key => $value...)
639		685
…		…
937		983
938	=cut	984	=cut
939		985
940	#############################################################################	986	#############################################################################
941	# object support	987	# object support
942	#
943		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#
944	sub _can_merge {	1022	sub _can_merge {
945	my ($ob1, $ob2) = @_;	1023	my ($ob1, $ob2) = @_;
946		1024
947	local $Storable::canonical = 1;	1025	++$SLOW_MERGES;#d#
948	my $fob1 = Storable::freeze $ob1;
949	my $fob2 = Storable::freeze $ob2;
950		1026
951	$fob1 eq $fob2	1027	# we do the slow way here
		1028	return _object_equal $ob1, $ob2
952	}	1029	}
953		1030
954	sub reattach {	1031	sub reattach {
955	# basically do the same as instantiate, without calling instantiate	1032	# basically do the same as instantiate, without calling instantiate
956	my ($obj) = @_;	1033	my ($obj) = @_;
…		…
978	cf::attachable->attach (	1055	cf::attachable->attach (
979	prio => -1000000,	1056	prio => -1000000,
980	on_instantiate => sub {	1057	on_instantiate => sub {
981	my ($obj, $data) = @_;	1058	my ($obj, $data) = @_;
982		1059
983	$data = from_json $data;	1060	$data = decode_json $data;
984		1061
985	for (@$data) {	1062	for (@$data) {
986	my ($name, $args) = @$_;	1063	my ($name, $args) = @$_;
987		1064
988	$obj->attach ($name, %{$args || {} });	1065	$obj->attach ($name, %{$args || {} });
…		…
1004	sub object_freezer_save {	1081	sub object_freezer_save {
1005	my ($filename, $rdata, $objs) = @_;	1082	my ($filename, $rdata, $objs) = @_;
1006		1083
1007	sync_job {	1084	sync_job {
1008	if (length $$rdata) {	1085	if (length $$rdata) {
		1086	utf8::decode (my $decname = $filename);
1009	warn sprintf "saving %s (%d,%d)\n",	1087	warn sprintf "saving %s (%d,%d)\n",
1010	$filename, length $$rdata, scalar @$objs;	1088	$decname, length $$rdata, scalar @$objs;
1011		1089
1012	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1090	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013	chmod SAVE_MODE, $fh;	1091	chmod SAVE_MODE, $fh;
1014	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1092	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015	aio_fsync $fh if $cf::USE_FSYNC;	1093	aio_fsync $fh if $cf::USE_FSYNC;
1016	close $fh;	1094	close $fh;
1017		1095
1018	if (@$objs) {	1096	if (@$objs) {
1019	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) {
1020	chmod SAVE_MODE, $fh;	1098	chmod SAVE_MODE, $fh;
1021	my $data = Storable::nfreeze { version => 1, objs => $objs };	1099	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022	aio_write $fh, 0, (length $data), $data, 0;	1100	aio_write $fh, 0, (length $data), $data, 0;
1023	aio_fsync $fh if $cf::USE_FSYNC;	1101	aio_fsync $fh if $cf::USE_FSYNC;
1024	close $fh;	1102	close $fh;
1025	aio_rename "$filename.pst~", "$filename.pst";	1103	aio_rename "$filename.pst~", "$filename.pst";
1026	}	1104	}
…		…
1034	}	1112	}
1035	} else {	1113	} else {
1036	aio_unlink $filename;	1114	aio_unlink $filename;
1037	aio_unlink "$filename.pst";	1115	aio_unlink "$filename.pst";
1038	}	1116	}
1039	}	1117	};
1040	}	1118	}
1041		1119
1042	sub object_freezer_as_string {	1120	sub object_freezer_as_string {
1043	my ($rdata, $objs) = @_;	1121	my ($rdata, $objs) = @_;
1044		1122
…		…
1056	or return;	1134	or return;
1057		1135
1058	unless (aio_stat "$filename.pst") {	1136	unless (aio_stat "$filename.pst") {
1059	(aio_load "$filename.pst", $av) >= 0	1137	(aio_load "$filename.pst", $av) >= 0
1060	or return;	1138	or return;
		1139
1061	$av = eval { (Storable::thaw $av)->{objs} };	1140	my $st = eval { Coro::Storable::thaw $av };
		1141	$av = $st->{objs};
1062	}	1142	}
1063		1143
		1144	utf8::decode (my $decname = $filename);
1064	warn sprintf "loading %s (%d)\n",	1145	warn sprintf "loading %s (%d,%d)\n",
1065	$filename, length $data, scalar @{$av || []};	1146	$decname, length $data, scalar @{$av || []};
		1147
1066	return ($data, $av);	1148	($data, $av)
1067	}	1149	}
1068		1150
1069	=head2 COMMAND CALLBACKS	1151	=head2 COMMAND CALLBACKS
1070		1152
1071	=over 4	1153	=over 4
…		…
1149	my ($type, $reply, @payload) =	1231	my ($type, $reply, @payload) =
1150	"ARRAY" eq ref $msg	1232	"ARRAY" eq ref $msg
1151	? @$msg	1233	? @$msg
1152	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	1234	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153		1235
		1236	my @reply;
		1237
1154	if (my $cb = $EXTCMD{$type}) {	1238	if (my $cb = $EXTCMD{$type}) {
1155	my @reply = $cb->($pl, @payload);	1239	@reply = $cb->($pl, @payload);
1156
1157	$pl->ext_reply ($reply, @reply)
1158	if $reply;
1159	}	1240	}
		1241
		1242	$pl->ext_reply ($reply, @reply)
		1243	if $reply;
		1244
1160	} else {	1245	} else {
1161	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1246	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162	}	1247	}
1163		1248
1164	cf::override;	1249	cf::override;
…		…
1254		1339
1255	=head3 cf::player	1340	=head3 cf::player
1256		1341
1257	=over 4	1342	=over 4
1258		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
1259	=item cf::player::find $login	1358	=item cf::player::find $login
1260		1359
1261	Returns the given player object, loading it if necessary (might block).	1360	Returns the given player object, loading it if necessary (might block).
1262		1361
1263	=cut	1362	=cut
…		…
1298	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1397	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1398	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1399	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301	aio_unlink +(playerdir $login) . "/$login.pl";	1400	aio_unlink +(playerdir $login) . "/$login.pl";
1302		1401
1303	my $pl = load_pl path $login	1402	my $f = new_from_file cf::object::thawer path $login
1304	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;
1305	$cf::PLAYER{$login} = $pl	1409	$cf::PLAYER{$login} = $pl
1306	}	1410	}
1307	}	1411	}
1308	}	1412	}
1309		1413
…		…
1319		1423
1320	aio_mkdir playerdir $pl, 0770;	1424	aio_mkdir playerdir $pl, 0770;
1321	$pl->{last_save} = $cf::RUNTIME;	1425	$pl->{last_save} = $cf::RUNTIME;
1322		1426
1323	$pl->save_pl ($path);	1427	$pl->save_pl ($path);
1324	Coro::cede;	1428	cf::cede_to_tick;
1325	}	1429	}
1326		1430
1327	sub new($) {	1431	sub new($) {
1328	my ($login) = @_;	1432	my ($login) = @_;
1329		1433
…		…
1407	or return [];	1511	or return [];
1408		1512
1409	my @logins;	1513	my @logins;
1410		1514
1411	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") {
1412	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1520	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413	aio_read $fh, 0, 512, my $buf, 0 or next;	1521	aio_read $fh, 0, 512, my $buf, 0 or next;
1414	$buf !~ /^password -------------$/m or next; # official not-valid tag	1522	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1523	}
1415		1524
1416	utf8::decode $login;	1525	utf8::decode $login;
1417	push @logins, $login;	1526	push @logins, $login;
1418	}	1527	}
1419		1528
…		…
1452		1561
1453	Expand crossfire pod fragments into protocol xml.	1562	Expand crossfire pod fragments into protocol xml.
1454		1563
1455	=cut	1564	=cut
1456		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
1457	sub expand_cfpod {	1577	sub expand_cfpod {
1458	((my $self), (local $_)) = @_;	1578	my ($self, $pod) = @_;
1459		1579
1460	# escape & and <	1580	my $xml;
1461	s/&/&amp;/g;
1462	s/(?<![BIUGH])</&lt;/g;
1463		1581
1464	# this is buggy, it needs to properly take care of nested <'s	1582	while () {
		1583	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1584	$group = $1;
1465		1585
1466	1 while	1586	$group =~ s/&/&amp;/g;
1467	# replace B<>, I<>, U<> etc.	1587	$group =~ s/</&lt;/g;
1468	s/B<([^\>]*)>/<b>$1<\/b>/	1588
1469	|| s/I<([^\>]*)>/<i>$1<\/i>/	1589	$xml .= $group;
1470	|| s/U<([^\>]*)>/<u>$1<\/u>/	1590	} elsif ($pod =~ m%\G
1471	# replace G<male|female> tags	1591	([BCGHITU])
1472	|| s{G<([^>|]*)\|([^>]*)>}{	1592	<
1473	$self->gender ? $2 : $1	1593	(?:
1474	}ge	1594	([^<>]*) (?{ $group = $^N })
1475	# replace H<hint text>	1595	| < $interior >
1476	|| s{H<([^\>]*)>}	1596	)
		1597	>
		1598	%gcsx
1477	{	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") {
1478	("<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>",
1479	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1618	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480	"")	1619	"")
1481	[$self->{hintmode}]	1620	[$self->{hintmode}];
		1621	} else {
		1622	$xml .= "error processing '$code($data)' directive";
1482	}ge;	1623	}
		1624	} else {
		1625	if ($pod =~ /\G(.+)/) {
		1626	warn "parse error while expanding $pod (at $1)";
		1627	}
		1628	last;
		1629	}
		1630	}
1483		1631
		1632	for ($xml) {
1484	# create single paragraphs (very hackish)	1633	# create single paragraphs (very hackish)
1485	s/(?<=\S)\n(?=\w)/ /g;	1634	s/(?<=\S)\n(?=\w)/ /g;
1486		1635
1487	# compress some whitespace	1636	# compress some whitespace
1488	s/\s+\n/\n/g; # ws line-ends	1637	s/\s+\n/\n/g; # ws line-ends
1489	s/\n\n+/\n/g; # double lines	1638	s/\n\n+/\n/g; # double lines
1490	s/^\n+//; # beginning lines	1639	s/^\n+//; # beginning lines
1491	s/\n+$//; # ending lines	1640	s/\n+$//; # ending lines
		1641	}
1492		1642
1493	$_	1643	$xml
1494	}	1644	}
		1645
		1646	no re 'eval';
1495		1647
1496	sub hintmode {	1648	sub hintmode {
1497	$_[0]{hintmode} = $_[1] if @_ > 1;	1649	$_[0]{hintmode} = $_[1] if @_ > 1;
1498	$_[0]{hintmode}	1650	$_[0]{hintmode}
1499	}	1651	}
…		…
1505	=cut	1657	=cut
1506		1658
1507	sub ext_reply($$@) {	1659	sub ext_reply($$@) {
1508	my ($self, $id, @msg) = @_;	1660	my ($self, $id, @msg) = @_;
1509		1661
1510	if ($self->ns->extcmd == 2) {	1662	$self->ns->ext_reply ($id, @msg)
1511	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512	} elsif ($self->ns->extcmd == 1) {
1513	#TODO: version 1, remove
1514	unshift @msg, msgtype => "reply", msgid => $id;
1515	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516	}
1517	}	1663	}
1518		1664
1519	=item $player->ext_msg ($type, @msg)	1665	=item $player->ext_msg ($type, @msg)
1520		1666
1521	Sends an ext event to the client.	1667	Sends an ext event to the client.
…		…
1749		1895
1750	sub load_header_from($) {	1896	sub load_header_from($) {
1751	my ($self, $path) = @_;	1897	my ($self, $path) = @_;
1752		1898
1753	utf8::encode $path;	1899	utf8::encode $path;
1754	#aio_open $path, O_RDONLY, 0	1900	my $f = new_from_file cf::object::thawer $path
1755	# or return;
1756
1757	$self->_load_header ($path)
1758	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;
1759		1908
1760	$self->{load_path} = $path;	1909	$self->{load_path} = $path;
1761		1910
1762	1	1911	1
1763	}	1912	}
…		…
1817	sub find {	1966	sub find {
1818	my ($path, $origin) = @_;	1967	my ($path, $origin) = @_;
1819		1968
1820	$path = normalise $path, $origin && $origin->path;	1969	$path = normalise $path, $origin && $origin->path;
1821		1970
		1971	cf::lock_wait "map_data:$path";#d#remove
1822	cf::lock_wait "map_find:$path";	1972	cf::lock_wait "map_find:$path";
1823		1973
1824	$cf::MAP{$path} || do {	1974	$cf::MAP{$path} || do {
1825	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
1826	my $map = new_from_path cf::map $path	1978	my $map = new_from_path cf::map $path
1827	or return;	1979	or return;
1828		1980
1829	$map->{last_save} = $cf::RUNTIME;	1981	$map->{last_save} = $cf::RUNTIME;
1830		1982
…		…
1832	or return;	1984	or return;
1833		1985
1834	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1986	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835	# doing this can freeze the server in a sync job, obviously	1987	# doing this can freeze the server in a sync job, obviously
1836	#$cf::WAIT_FOR_TICK->wait;	1988	#$cf::WAIT_FOR_TICK->wait;
		1989	undef $guard1;
		1990	undef $guard2;
1837	$map->reset;	1991	$map->reset;
1838	undef $guard;
1839	return find $path;	1992	return find $path;
1840	}	1993	}
1841		1994
1842	$cf::MAP{$path} = $map	1995	$cf::MAP{$path} = $map
1843	}	1996	}
…		…
1852	local $self->{deny_reset} = 1; # loading can take a long time	2005	local $self->{deny_reset} = 1; # loading can take a long time
1853		2006
1854	my $path = $self->{path};	2007	my $path = $self->{path};
1855		2008
1856	{	2009	{
1857	my $guard = cf::lock_acquire "map_load:$path";	2010	my $guard = cf::lock_acquire "map_data:$path";
1858		2011
		2012	return unless $self->valid;
1859	return if $self->in_memory != cf::MAP_SWAPPED;	2013	return unless $self->in_memory == cf::MAP_SWAPPED;
1860		2014
1861	$self->in_memory (cf::MAP_LOADING);	2015	$self->in_memory (cf::MAP_LOADING);
1862		2016
1863	$self->alloc;	2017	$self->alloc;
1864		2018
1865	$self->pre_load;	2019	$self->pre_load;
1866	Coro::cede;	2020	cf::cede_to_tick;
1867		2021
		2022	my $f = new_from_file cf::object::thawer $self->{load_path};
		2023	$f->skip_block;
1868	$self->_load_objects ($self->{load_path}, 1)	2024	$self->_load_objects ($f)
1869	or return;	2025	or return;
1870		2026
1871	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2027	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872	if delete $self->{load_original};	2028	if delete $self->{load_original};
1873		2029
1874	if (my $uniq = $self->uniq_path) {	2030	if (my $uniq = $self->uniq_path) {
1875	utf8::encode $uniq;	2031	utf8::encode $uniq;
1876	if (aio_open $uniq, O_RDONLY, 0) {	2032	unless (aio_stat $uniq) {
		2033	if (my $f = new_from_file cf::object::thawer $uniq) {
1877	$self->clear_unique_items;	2034	$self->clear_unique_items;
1878	$self->_load_objects ($uniq, 0);	2035	$self->_load_objects ($f);
		2036	$f->resolve_delayed_derefs;
		2037	}
1879	}	2038	}
1880	}	2039	}
1881		2040
1882	Coro::cede;	2041	$f->resolve_delayed_derefs;
		2042
		2043	cf::cede_to_tick;
1883	# now do the right thing for maps	2044	# now do the right thing for maps
1884	$self->link_multipart_objects;	2045	$self->link_multipart_objects;
1885	$self->difficulty ($self->estimate_difficulty)	2046	$self->difficulty ($self->estimate_difficulty)
1886	unless $self->difficulty;	2047	unless $self->difficulty;
1887	Coro::cede;	2048	cf::cede_to_tick;
1888		2049
1889	unless ($self->{deny_activate}) {	2050	unless ($self->{deny_activate}) {
1890	$self->decay_objects;	2051	$self->decay_objects;
1891	$self->fix_auto_apply;	2052	$self->fix_auto_apply;
1892	$self->update_buttons;	2053	$self->update_buttons;
1893	Coro::cede;	2054	cf::cede_to_tick;
1894	$self->set_darkness_map;	2055	$self->set_darkness_map;
1895	Coro::cede;	2056	cf::cede_to_tick;
1896	$self->activate;	2057	$self->activate;
1897	}	2058	}
1898		2059
1899	$self->{last_save} = $cf::RUNTIME;	2060	$self->{last_save} = $cf::RUNTIME;
1900	$self->last_access ($cf::RUNTIME);	2061	$self->last_access ($cf::RUNTIME);
…		…
1916		2077
1917	$self	2078	$self
1918	}	2079	}
1919		2080
1920	# 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
1921	sub load_diag {	2082	sub load_neighbours {
1922	my ($map) = @_;	2083	my ($map) = @_;
1923		2084
1924	my @diag; # diagonal neighbours	2085	my @neigh; # diagonal neighbours
1925		2086
1926	for (0 .. 3) {	2087	for (0 .. 3) {
1927	my $neigh = $map->tile_path ($_)	2088	my $neigh = $map->tile_path ($_)
1928	or next;	2089	or next;
1929	$neigh = find $neigh, $map	2090	$neigh = find $neigh, $map
1930	or next;	2091	or next;
1931	$neigh->load;	2092	$neigh->load;
1932		2093
		2094	push @neigh,
1933	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2095	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1934	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2096	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1935	}	2097	}
1936		2098
1937	for (@diag) {	2099	for (grep defined $_->[0], @neigh) {
		2100	my ($path, $origin) = @$_;
1938	my $neigh = find @$_	2101	my $neigh = find $path, $origin
1939	or next;	2102	or next;
1940	$neigh->load;	2103	$neigh->load;
1941	}	2104	}
1942	}	2105	}
1943		2106
…		…
1948	}	2111	}
1949		2112
1950	sub do_load_sync {	2113	sub do_load_sync {
1951	my ($map) = @_;	2114	my ($map) = @_;
1952		2115
		2116	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2117	if $Coro::current == $Coro::main;
		2118
1953	cf::sync_job { $map->load };	2119	cf::sync_job { $map->load };
1954	}	2120	}
1955		2121
1956	our %MAP_PREFETCH;	2122	our %MAP_PREFETCH;
1957	our $MAP_PREFETCHER = undef;	2123	our $MAP_PREFETCHER = undef;
1958		2124
1959	sub find_async {	2125	sub find_async {
1960	my ($path, $origin) = @_;	2126	my ($path, $origin, $load) = @_;
1961		2127
1962	$path = normalise $path, $origin && $origin->{path};	2128	$path = normalise $path, $origin && $origin->{path};
1963		2129
1964	if (my $map = $cf::MAP{$path}) {	2130	if (my $map = $cf::MAP{$path}) {
1965	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2131	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966	}	2132	}
1967		2133
1968	undef $MAP_PREFETCH{$path};	2134	$MAP_PREFETCH{$path} |= $load;
		2135
1969	$MAP_PREFETCHER ||= cf::async {	2136	$MAP_PREFETCHER ||= cf::async {
		2137	$Coro::current->{desc} = "map prefetcher";
		2138
1970	while (%MAP_PREFETCH) {	2139	while (%MAP_PREFETCH) {
1971	for my $path (keys %MAP_PREFETCH) {	2140	while (my ($k, $v) = each %MAP_PREFETCH) {
1972	if (my $map = find $path) {	2141	if (my $map = find $k) {
1973	$map->load;	2142	$map->load if $v;
1974	}	2143	}
1975		2144
1976	delete $MAP_PREFETCH{$path};	2145	delete $MAP_PREFETCH{$k};
1977	}	2146	}
1978	}	2147	}
1979	undef $MAP_PREFETCHER;	2148	undef $MAP_PREFETCHER;
1980	};	2149	};
1981	$MAP_PREFETCHER->prio (6);	2150	$MAP_PREFETCHER->prio (6);
…		…
1984	}	2153	}
1985		2154
1986	sub save {	2155	sub save {
1987	my ($self) = @_;	2156	my ($self) = @_;
1988		2157
1989	my $lock = cf::lock_acquire "map_data:" . $self->path;	2158	my $lock = cf::lock_acquire "map_data:$self->{path}";
1990		2159
1991	$self->{last_save} = $cf::RUNTIME;	2160	$self->{last_save} = $cf::RUNTIME;
1992		2161
1993	return unless $self->dirty;	2162	return unless $self->dirty;
1994		2163
…		…
2000	return if $self->{deny_save};	2169	return if $self->{deny_save};
2001		2170
2002	local $self->{last_access} = $self->last_access;#d#	2171	local $self->{last_access} = $self->last_access;#d#
2003		2172
2004	cf::async {	2173	cf::async {
		2174	$Coro::current->{desc} = "map player save";
2005	$_->contr->save for $self->players;	2175	$_->contr->save for $self->players;
2006	};	2176	};
2007		2177
2008	if ($uniq) {	2178	if ($uniq) {
2009	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2179	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2017	my ($self) = @_;	2187	my ($self) = @_;
2018		2188
2019	# save first because save cedes	2189	# save first because save cedes
2020	$self->save;	2190	$self->save;
2021		2191
2022	my $lock = cf::lock_acquire "map_data:" . $self->path;	2192	my $lock = cf::lock_acquire "map_data:$self->{path}";
2023		2193
2024	return if $self->players;	2194	return if $self->players;
2025	return if $self->in_memory != cf::MAP_IN_MEMORY;	2195	return if $self->in_memory != cf::MAP_IN_MEMORY;
2026	return if $self->{deny_save};	2196	return if $self->{deny_save};
2027		2197
		2198	$self->in_memory (cf::MAP_SWAPPED);
		2199
		2200	$self->deactivate;
		2201	$_->clear_links_to ($self) for values %cf::MAP;
2028	$self->clear;	2202	$self->clear;
2029	$self->in_memory (cf::MAP_SWAPPED);
2030	}	2203	}
2031		2204
2032	sub reset_at {	2205	sub reset_at {
2033	my ($self) = @_;	2206	my ($self) = @_;
2034		2207
…		…
2066	if $uniq;	2239	if $uniq;
2067	}	2240	}
2068		2241
2069	delete $cf::MAP{$self->path};	2242	delete $cf::MAP{$self->path};
2070		2243
		2244	$self->deactivate;
		2245	$_->clear_links_to ($self) for values %cf::MAP;
2071	$self->clear;	2246	$self->clear;
2072
2073	$_->clear_links_to ($self) for values %cf::MAP;
2074		2247
2075	$self->unlink_save;	2248	$self->unlink_save;
2076	$self->destroy;	2249	$self->destroy;
2077	}	2250	}
2078		2251
2079	my $nuke_counter = "aaaa";	2252	my $nuke_counter = "aaaa";
2080		2253
2081	sub nuke {	2254	sub nuke {
2082	my ($self) = @_;	2255	my ($self) = @_;
2083		2256
		2257	{
		2258	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2259
2084	delete $cf::MAP{$self->path};	2260	delete $cf::MAP{$self->path};
2085		2261
2086	$self->unlink_save;	2262	$self->unlink_save;
2087		2263
2088	bless $self, "cf::map";	2264	bless $self, "cf::map";
2089	delete $self->{deny_reset};	2265	delete $self->{deny_reset};
2090	$self->{deny_save} = 1;	2266	$self->{deny_save} = 1;
2091	$self->reset_timeout (1);	2267	$self->reset_timeout (1);
2092	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2268	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093		2269
2094	$cf::MAP{$self->path} = $self;	2270	$cf::MAP{$self->path} = $self;
		2271	}
2095		2272
2096	$self->reset; # polite request, might not happen	2273	$self->reset; # polite request, might not happen
2097	}	2274	}
2098		2275
2099	=item $maps = cf::map::tmp_maps	2276	=item $maps = cf::map::tmp_maps
…		…
2175		2352
2176	sub inv_recursive {	2353	sub inv_recursive {
2177	inv_recursive_ inv $_[0]	2354	inv_recursive_ inv $_[0]
2178	}	2355	}
2179		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
2180	package cf;	2385	package cf;
2181		2386
2182	=back	2387	=back
2183		2388
2184	=head3 cf::object::player	2389	=head3 cf::object::player
…		…
2312	# use -1 or undef as default coordinates, not 0, 0	2517	# use -1 or undef as default coordinates, not 0, 0
2313	($x, $y) = ($map->enter_x, $map->enter_y)	2518	($x, $y) = ($map->enter_x, $map->enter_y)
2314	if $x <=0 && $y <= 0;	2519	if $x <=0 && $y <= 0;
2315		2520
2316	$map->load;	2521	$map->load;
2317	$map->load_diag;	2522	$map->load_neighbours;
2318		2523
2319	return unless $self->contr->active;	2524	return unless $self->contr->active;
2320	$self->activate_recursive;	2525	$self->activate_recursive;
2321		2526
2322	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2527	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2342	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2547	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343		2548
2344	$self->enter_link;	2549	$self->enter_link;
2345		2550
2346	(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
2347	my $map = eval {	2573	my $map = eval {
2348	my $map = cf::map::find $path;	2574	my $map = defined $path ? cf::map::find $path : undef;
2349		2575
2350	if ($map) {	2576	if ($map) {
2351	$map = $map->customise_for ($self);	2577	$map = $map->customise_for ($self);
2352	$map = $check->($map) if $check && $map;	2578	$map = $check->($map) if $check && $map;
2353	} else {	2579	} else {
2354	$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);
2355	}	2581	}
2356		2582
2357	$map	2583	$map
2358	};	2584	};
2359		2585
…		…
2412	$rmp->{origin_y} = $exit->y;	2638	$rmp->{origin_y} = $exit->y;
2413	}	2639	}
2414		2640
2415	$rmp->{random_seed} ||= $exit->random_seed;	2641	$rmp->{random_seed} ||= $exit->random_seed;
2416		2642
2417	my $data = cf::to_json $rmp;	2643	my $data = cf::encode_json $rmp;
2418	my $md5 = Digest::MD5::md5_hex $data;	2644	my $md5 = Digest::MD5::md5_hex $data;
2419	my $meta = "$RANDOMDIR/$md5.meta";	2645	my $meta = "$RANDOMDIR/$md5.meta";
2420		2646
2421	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2647	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422	aio_write $fh, 0, (length $data), $data, 0;	2648	aio_write $fh, 0, (length $data), $data, 0;
…		…
2449	# if exit is damned, update players death & WoR home-position	2675	# if exit is damned, update players death & WoR home-position
2450	$self->contr->savebed ($slaying, $hp, $sp)	2676	$self->contr->savebed ($slaying, $hp, $sp)
2451	if $exit->flag (FLAG_DAMNED);	2677	if $exit->flag (FLAG_DAMNED);
2452		2678
2453	(async {	2679	(async {
		2680	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2681
2454	$self->deactivate_recursive; # just to be sure	2682	$self->deactivate_recursive; # just to be sure
2455	unless (eval {	2683	unless (eval {
2456	$self->goto ($slaying, $hp, $sp);	2684	$self->goto ($slaying, $hp, $sp);
2457		2685
2458	1;	2686	1;
…		…
2493	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
2494	the message unless the client supports the msg packet.	2722	the message unless the client supports the msg packet.
2495		2723
2496	=cut	2724	=cut
2497		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
2498	sub cf::client::send_msg {	2778	sub cf::client::send_msg {
2499	my ($self, $channel, $msg, $color, @extra) = @_;	2779	my ($self, $channel, $msg, $color, @extra) = @_;
2500		2780
2501	$msg = $self->pl->expand_cfpod ($msg);	2781	$msg = $self->pl->expand_cfpod ($msg);
2502		2782
2503	$color &= cf::NDI_CLIENT_MASK; # just in case...	2783	$color &= cf::NDI_CLIENT_MASK; # just in case...
2504		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
2505	if (ref $channel) {	2794	} elsif (ref $channel) {
2506	# send meta info to client, if not yet sent	2795	# send meta info to client, if not yet sent
2507	unless (exists $self->{channel}{$channel->{id}}) {	2796	unless (exists $self->{channel}{$channel->{id}}) {
2508	$self->{channel}{$channel->{id}} = $channel;	2797	$self->{channel}{$channel->{id}} = $channel;
2509	$self->ext_msg (channel_info => $channel);	2798	$self->ext_msg (channel_info => $channel)
		2799	if $self->can_msg;
2510	}	2800	}
2511		2801
2512	$channel = $channel->{id};	2802	$channel = $channel->{id};
2513	}	2803	}
2514		2804
…		…
2555	=cut	2845	=cut
2556		2846
2557	sub cf::client::ext_msg($$@) {	2847	sub cf::client::ext_msg($$@) {
2558	my ($self, $type, @msg) = @_;	2848	my ($self, $type, @msg) = @_;
2559		2849
2560	my $extcmd = $self->extcmd;
2561
2562	if ($extcmd == 2) {	2850	if ($self->extcmd == 2) {
2563	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2851	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564	} elsif ($extcmd == 1) { # TODO: remove	2852	} elsif ($self->extcmd == 1) { # TODO: remove
2565	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;
2566	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2872	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567	}	2873	}
2568	}	2874	}
2569		2875
2570	=item $success = $client->query ($flags, "text", \&cb)	2876	=item $success = $client->query ($flags, "text", \&cb)
…		…
2632	my ($type, $reply, @payload) =	2938	my ($type, $reply, @payload) =
2633	"ARRAY" eq ref $msg	2939	"ARRAY" eq ref $msg
2634	? @$msg	2940	? @$msg
2635	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	2941	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636		2942
		2943	my @reply;
		2944
2637	if (my $cb = $EXTICMD{$type}) {	2945	if (my $cb = $EXTICMD{$type}) {
2638	my @reply = $cb->($ns, @payload);	2946	@reply = $cb->($ns, @payload);
2639
2640	$ns->ext_reply ($reply, @reply)
2641	if $reply;
2642	}	2947	}
		2948
		2949	$ns->ext_reply ($reply, @reply)
		2950	if $reply;
		2951
2643	} else {	2952	} else {
2644	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";
2645	}	2954	}
2646		2955
2647	cf::override;	2956	cf::override;
…		…
2707	=pod	3016	=pod
2708		3017
2709	The following functions and methods are available within a safe environment:	3018	The following functions and methods are available within a safe environment:
2710		3019
2711	cf::object	3020	cf::object
2712	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
2713	insert remove name archname title slaying race	3022	insert remove name archname title slaying race decrease_ob_nr
2714		3023
2715	cf::object::player	3024	cf::object::player
2716	player	3025	player
2717		3026
2718	cf::player	3027	cf::player
…		…
2723		3032
2724	=cut	3033	=cut
2725		3034
2726	for (	3035	for (
2727	["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
2728	insert remove inv name archname title slaying race)],	3037	insert remove inv name archname title slaying race
		3038	decrease_ob_nr destroy)],
2729	["cf::object::player" => qw(player)],	3039	["cf::object::player" => qw(player)],
2730	["cf::player" => qw(peaceful)],	3040	["cf::player" => qw(peaceful)],
2731	["cf::map" => qw(trigger)],	3041	["cf::map" => qw(trigger)],
2732	) {	3042	) {
2733	no strict 'refs';	3043	no strict 'refs';
…		…
2809	# the server's init and main functions	3119	# the server's init and main functions
2810		3120
2811	sub load_facedata($) {	3121	sub load_facedata($) {
2812	my ($path) = @_;	3122	my ($path) = @_;
2813		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
2814	warn "loading facedata from $path\n";	3130	warn "loading facedata from $path\n";
2815		3131
2816	my $facedata;	3132	my $facedata;
2817	0 < aio_load $path, $facedata	3133	0 < aio_load $path, $facedata
2818	or die "$path: $!";	3134	or die "$path: $!";
2819		3135
2820	$facedata = Coro::Storable::thaw $facedata;	3136	$facedata = Coro::Storable::thaw $facedata;
2821		3137
2822	$facedata->{version} == 2	3138	$facedata->{version} == 2
2823	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;
2824		3147
2825	{	3148	{
2826	my $faces = $facedata->{faceinfo};	3149	my $faces = $facedata->{faceinfo};
2827		3150
2828	while (my ($face, $info) = each %$faces) {	3151	while (my ($face, $info) = each %$faces) {
2829	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3152	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830	cf::face::set_visibility $idx, $info->{visibility};	3153	cf::face::set_visibility $idx, $info->{visibility};
2831	cf::face::set_magicmap $idx, $info->{magicmap};	3154	cf::face::set_magicmap $idx, $info->{magicmap};
2832	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3155	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3156	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834		3157
2835	cf::cede_to_tick;	3158	cf::cede_to_tick;
2836	}	3159	}
2837		3160
2838	while (my ($face, $info) = each %$faces) {	3161	while (my ($face, $info) = each %$faces) {
…		…
2863		3186
2864	{	3187	{
2865	# TODO: for gcfclient pleasure, we should give resources	3188	# TODO: for gcfclient pleasure, we should give resources
2866	# that gcfclient doesn't grok a >10000 face index.	3189	# that gcfclient doesn't grok a >10000 face index.
2867	my $res = $facedata->{resource};	3190	my $res = $facedata->{resource};
2868	my $enc = JSON::XS->new->utf8->canonical;
2869		3191
2870	my $soundconf = delete $res->{"res/sound.conf"};	3192	my $soundconf = delete $res->{"res/sound.conf"};
2871		3193
2872	while (my ($name, $info) = each %$res) {	3194	while (my ($name, $info) = each %$res) {
2873	my $meta = $enc->encode ({
2874	name => $name,
2875	%{ $info->{meta} || {} },
2876	});
2877
2878	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3195	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3196	my $data;
2879		3197
2880	if ($info->{type} & 1) {	3198	if ($info->{type} & 1) {
2881	# prepend meta info	3199	# prepend meta info
2882		3200
		3201	my $meta = $enc->encode ({
		3202	name => $name,
		3203	%{ $info->{meta} || {} },
		3204	});
		3205
2883	my $data = pack "(w/a*)*", $meta, $info->{data};	3206	$data = pack "(w/a*)*", $meta, $info->{data};
2884	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886	cf::face::set_data $idx, 0, $data, $chk;
2887	} else {	3207	} else {
2888	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};	3208	$data = $info->{data};
2889	}	3209	}
2890		3210
		3211	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891	cf::face::set_type $idx, $info->{type};	3212	cf::face::set_type $idx, $info->{type};
2892		3213
2893	cf::cede_to_tick;	3214	cf::cede_to_tick;
2894	}	3215	}
2895		3216
…		…
2922	$ns->fx_want ($k, $v);	3243	$ns->fx_want ($k, $v);
2923	}	3244	}
2924	};	3245	};
2925		3246
2926	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
2927	load_resource_file "$MAPDIR/regions"	3252	load_resource_file "$MAPDIR/regions"
2928	or die "unable to load regions file\n";	3253	or die "unable to load regions file\n";
2929		3254
2930	for (cf::region::list) {	3255	for (cf::region::list) {
2931	$_->{match} = qr/$_->{match}/	3256	$_->{match} = qr/$_->{match}/
…		…
2967		3292
2968	sub init {	3293	sub init {
2969	reload_resources;	3294	reload_resources;
2970	}	3295	}
2971		3296
2972	sub cfg_load {	3297	sub reload_config {
2973	open my $fh, "<:utf8", "$CONFDIR/config"	3298	open my $fh, "<:utf8", "$CONFDIR/config"
2974	or return;	3299	or return;
2975		3300
2976	local $/;	3301	local $/;
2977	*CFG = YAML::Syck::Load <$fh>;	3302	*CFG = YAML::Syck::Load <$fh>;
…		…
2993	sub main {	3318	sub main {
2994	# we must not ever block the main coroutine	3319	# we must not ever block the main coroutine
2995	local $Coro::idle = sub {	3320	local $Coro::idle = sub {
2996	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#
2997	(async {	3322	(async {
2998	Event::one_event;	3323	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3324	EV::loop EV::LOOP_ONESHOT;
2999	})->prio (Coro::PRIO_MAX);	3325	})->prio (Coro::PRIO_MAX);
3000	};	3326	};
3001		3327
3002	cfg_load;	3328	reload_config;
3003	db_init;	3329	db_init;
3004	load_extensions;	3330	load_extensions;
3005		3331
3006	$TICK_WATCHER->start;	3332	$TICK_WATCHER->start;
		3333	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3007	Event::loop;	3334	EV::loop;
3008	}	3335	}
3009		3336
3010	#############################################################################	3337	#############################################################################
3011	# initialisation and cleanup	3338	# initialisation and cleanup
3012		3339
3013	# install some emergency cleanup handlers	3340	# install some emergency cleanup handlers
3014	BEGIN {	3341	BEGIN {
		3342	our %SIGWATCHER = ();
3015	for my $signal (qw(INT HUP TERM)) {	3343	for my $signal (qw(INT HUP TERM)) {
3016	Event->signal (	3344	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3017	reentrant => 0,
3018	data => WF_AUTOCANCEL,
3019	signal => $signal,
3020	prio => 0,
3021	cb => sub {
3022	cf::cleanup "SIG$signal";	3345	cf::cleanup "SIG$signal";
3023	},
3024	);	3346	};
3025	}	3347	}
3026	}	3348	}
3027		3349
3028	sub write_runtime {	3350	sub write_runtime {
3029	my $runtime = "$LOCALDIR/runtime";	3351	my $runtime = "$LOCALDIR/runtime";
…		…
3074	# and maps saved/destroyed asynchronously.	3396	# and maps saved/destroyed asynchronously.
3075	warn "begin emergency player save\n";	3397	warn "begin emergency player save\n";
3076	for my $login (keys %cf::PLAYER) {	3398	for my $login (keys %cf::PLAYER) {
3077	my $pl = $cf::PLAYER{$login} or next;	3399	my $pl = $cf::PLAYER{$login} or next;
3078	$pl->valid or next;	3400	$pl->valid or next;
		3401	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079	$pl->save;	3402	$pl->save;
3080	}	3403	}
3081	warn "end emergency player save\n";	3404	warn "end emergency player save\n";
3082		3405
3083	warn "begin emergency map save\n";	3406	warn "begin emergency map save\n";
…		…
3122	warn "syncing database to disk";	3445	warn "syncing database to disk";
3123	BDB::db_env_txn_checkpoint $DB_ENV;	3446	BDB::db_env_txn_checkpoint $DB_ENV;
3124		3447
3125	# 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
3126		3449
3127	warn "cancelling all WF_AUTOCANCEL watchers";
3128	for (Event::all_watchers) {
3129	$_->cancel if $_->data & WF_AUTOCANCEL;
3130	}
3131
3132	warn "flushing outstanding aio requests";	3450	warn "flushing outstanding aio requests";
3133	for (;;) {	3451	for (;;) {
3134	BDB::flush;	3452	BDB::flush;
3135	IO::AIO::flush;	3453	IO::AIO::flush;
3136	Coro::cede;	3454	Coro::cede_notself;
3137	last unless IO::AIO::nreqs || BDB::nreqs;	3455	last unless IO::AIO::nreqs || BDB::nreqs;
3138	warn "iterate...";	3456	warn "iterate...";
3139	}	3457	}
3140		3458
3141	++$RELOAD;	3459	++$RELOAD;
…		…
3200	warn "reloading cf.pm";	3518	warn "reloading cf.pm";
3201	require cf;	3519	require cf;
3202	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3520	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203		3521
3204	warn "loading config and database again";	3522	warn "loading config and database again";
3205	cf::cfg_load;	3523	cf::reload_config;
3206		3524
3207	warn "loading extensions";	3525	warn "loading extensions";
3208	cf::load_extensions;	3526	cf::load_extensions;
3209		3527
3210	warn "reattaching attachments to objects/players";	3528	warn "reattaching attachments to objects/players";
…		…
3230		3548
3231	sub reload_perl() {	3549	sub reload_perl() {
3232	# doing reload synchronously and two reloads happen back-to-back,	3550	# doing reload synchronously and two reloads happen back-to-back,
3233	# coro crashes during coro_state_free->destroy here.	3551	# coro crashes during coro_state_free->destroy here.
3234		3552
3235	$RELOAD_WATCHER ||= Event->timer (	3553	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3236	reentrant => 0,
3237	after => 0,
3238	data => WF_AUTOCANCEL,
3239	cb => sub {
3240	do_reload_perl;
3241	undef $RELOAD_WATCHER;	3554	undef $RELOAD_WATCHER;
3242	},	3555	do_reload_perl;
3243	);	3556	};
3244	}	3557	}
3245		3558
3246	register_command "reload" => sub {	3559	register_command "reload" => sub {
3247	my ($who, $arg) = @_;	3560	my ($who, $arg) = @_;
3248		3561
3249	if ($who->flag (FLAG_WIZ)) {	3562	if ($who->flag (FLAG_WIZ)) {
3250	$who->message ("reloading server.");	3563	$who->message ("reloading server.");
		3564	async {
		3565	$Coro::current->{desc} = "perl_reload";
3251	async { reload_perl };	3566	reload_perl;
		3567	};
3252	}	3568	}
3253	};	3569	};
3254		3570
3255	unshift @INC, $LIBDIR;	3571	unshift @INC, $LIBDIR;
3256		3572
…		…
3275	my $signal = new Coro::Signal;	3591	my $signal = new Coro::Signal;
3276	push @WAIT_FOR_TICK_BEGIN, $signal;	3592	push @WAIT_FOR_TICK_BEGIN, $signal;
3277	$signal->wait;	3593	$signal->wait;
3278	}	3594	}
3279		3595
3280	my $min = 1e6;#d#	3596	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3281	my $avg = 10;
3282	$TICK_WATCHER = Event->timer (
3283	reentrant => 0,
3284	parked => 1,
3285	prio => 0,
3286	at => $NEXT_TICK || $TICK,
3287	data => WF_AUTOCANCEL,
3288	cb => sub {
3289	if ($Coro::current != $Coro::main) {	3597	if ($Coro::current != $Coro::main) {
3290	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"
3291	unless ++$bug_warning > 10;	3599	unless ++$bug_warning > 10;
3292	return;	3600	return;
3293	}	3601	}
3294		3602
3295	$NOW = $tick_start = Event::time;	3603	$NOW = $tick_start = EV::now;
3296		3604
3297	cf::server_tick; # one server iteration	3605	cf::server_tick; # one server iteration
3298		3606
3299	0 && sync_job {#d#	3607	$RUNTIME += $TICK;
3300	for(1..10) {	3608	$NEXT_TICK += $TICK;
3301	my $t = Event::time;
3302	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3303	or die;
3304		3609
3305	$map->width (50);	3610	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3306	$map->height (50);	3611	$NEXT_RUNTIME_WRITE = $NOW + 10;
3307	$map->alloc;	3612	Coro::async_pool {
3308	$map->_load_objects ("/tmp/x.map", 1);	3613	$Coro::current->{desc} = "runtime saver";
3309	my $t = Event::time - $t;	3614	write_runtime
3310		3615	or warn "ERROR: unable to write runtime file: $!";
3311	#next unless $t < 0.0013;#d#
3312	if ($t < $min) {
3313	$min = $t;
3314	}
3315	$avg = $avg * 0.99 + $t * 0.01;
3316	}
3317	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318	exit 0;
3319	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320	};	3616	};
		3617	}
3321		3618
3322	$RUNTIME += $TICK;
3323	$NEXT_TICK += $TICK;
3324
3325	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326	$NEXT_RUNTIME_WRITE = $NOW + 10;
3327	Coro::async_pool {
3328	write_runtime
3329	or warn "ERROR: unable to write runtime file: $!";
3330	};
3331	}
3332
3333	# my $AFTER = Event::time;
3334	# warn $AFTER - $NOW;#d#
3335
3336	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3619	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337	$sig->send;	3620	$sig->send;
3338	}	3621	}
3339	while (my $sig = shift @WAIT_FOR_TICK) {	3622	while (my $sig = shift @WAIT_FOR_TICK) {
3340	$sig->send;	3623	$sig->send;
3341	}	3624	}
3342		3625
3343	$NOW = Event::time;
3344
3345	# if we are delayed by four ticks or more, skip them all
3346	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348	$TICK_WATCHER->at ($NEXT_TICK);
3349	$TICK_WATCHER->start;
3350
3351	$LOAD = ($NOW - $tick_start) / $TICK;	3626	$LOAD = ($NOW - $tick_start) / $TICK;
3352	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3627	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353		3628
3354	_post_tick;	3629	_post_tick;
3355		3630	};
3356		3631	$TICK_WATCHER->priority (EV::MAXPRI);
3357	},
3358	);
3359		3632
3360	{	3633	{
		3634	BDB::min_parallel 8;
3361	BDB::max_poll_time $TICK * 0.1;	3635	BDB::max_poll_time $TICK * 0.1;
3362	$BDB_POLL_WATCHER = Event->io (	3636	$BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3363	reentrant => 0,
3364	fd => BDB::poll_fileno,
3365	poll => 'r',
3366	prio => 0,
3367	data => WF_AUTOCANCEL,
3368	cb => \&BDB::poll_cb,
3369	);
3370	BDB::min_parallel 8;
3371		3637
3372	BDB::set_sync_prepare {	3638	BDB::set_sync_prepare {
3373	my $status;	3639	my $status;
3374	my $current = $Coro::current;	3640	my $current = $Coro::current;
3375	(	3641	(
…		…
3384	)	3650	)
3385	};	3651	};
3386		3652
3387	unless ($DB_ENV) {	3653	unless ($DB_ENV) {
3388	$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);
3389		3659
3390	cf::sync_job {	3660	cf::sync_job {
3391	eval {	3661	eval {
3392	BDB::db_env_open	3662	BDB::db_env_open
3393	$DB_ENV,	3663	$DB_ENV,
…		…
3395	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
3396	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3666	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397	0666;	3667	0666;
3398		3668
3399	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3669	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402	$DB_ENV->set_lk_detect;
3403	};	3670	};
3404		3671
3405	cf::cleanup "db_env_open(db): $@" if $@;	3672	cf::cleanup "db_env_open(db): $@" if $@;
3406	};	3673	};
3407	}	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	};
3408	}	3685	}
3409		3686
3410	{	3687	{
3411	IO::AIO::min_parallel 8;	3688	IO::AIO::min_parallel 8;
3412		3689
3413	undef $Coro::AIO::WATCHER;	3690	undef $Coro::AIO::WATCHER;
3414	IO::AIO::max_poll_time $TICK * 0.1;	3691	IO::AIO::max_poll_time $TICK * 0.1;
3415	$AIO_POLL_WATCHER = Event->io (	3692	$AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3416	reentrant => 0,
3417	data => WF_AUTOCANCEL,
3418	fd => IO::AIO::poll_fileno,
3419	poll => 'r',
3420	prio => 6,
3421	cb => \&IO::AIO::poll_cb,
3422	);
3423	}	3693	}
3424		3694
3425	my $_log_backtrace;	3695	my $_log_backtrace;
3426		3696
3427	sub _log_backtrace {	3697	sub _log_backtrace {
…		…
3431		3701
3432	# limit the # of concurrent backtraces	3702	# limit the # of concurrent backtraces
3433	if ($_log_backtrace < 2) {	3703	if ($_log_backtrace < 2) {
3434	++$_log_backtrace;	3704	++$_log_backtrace;
3435	async {	3705	async {
		3706	$Coro::current->{desc} = "abt $msg";
		3707
3436	my @bt = fork_call {	3708	my @bt = fork_call {
3437	@addr = map { sprintf "%x", $_ } @addr;	3709	@addr = map { sprintf "%x", $_ } @addr;
3438	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3710	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439	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 |"
3440	or die "addr2line: $!";	3712	or die "addr2line: $!";

Diff Legend

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