[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.394 by root, Thu Nov 8 19:43:25 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;
10	use Event;	9	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::Event;
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
…		…
79	our $NEXT_TICK;	80	our $NEXT_TICK;
80	our $NOW;	81	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		83
83	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	88	our $DB_ENV;
85		89
86	our %CFG;	90	our %CFG;
87		91
88	our $UPTIME; $UPTIME \|\|= time;	92	our $UPTIME; $UPTIME \|\|= time;
89	our $RUNTIME;	93	our $RUNTIME;
90		94
91	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
94		98
95	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		101
…		…
186	$msg .= "\n"	190	$msg .= "\n"
187	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
188		192
189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190		194
191	utf8::encode $msg;
192	LOG llevError, $msg;	195	LOG llevError, $msg;
193	};	196	};
194	}	197	}
195		198
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
271	Wait until the given lock is available and then acquires it and returns	274	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,	275	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	276	for example when the coroutine gets canceled), the lock is automatically
274	returned.	277	returned.
275		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
276	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
278		284
279	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
280		286
281	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
282		288
283	=cut	289	=cut
284		290
285	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
286		293
287	sub lock_wait($) {	294	sub lock_wait($) {
288	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
289		301
290	# wait for lock, if any	302	# wait for lock, if any
291	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	305	Coro::schedule;
…		…
299		311
300	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
301	lock_wait $key;	313	lock_wait $key;
302		314
303	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
304		317
305	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
308	}	322	}
309	}	323	}
310		324
…		…
322	};	336	};
323	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
324	$guard	338	$guard
325	}	339	}
326		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
327	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
328		400
329	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
330	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
334		406
335	BEGIN { *async = \&Coro::async_pool }	407	BEGIN { *async = \&Coro::async_pool }
336		408
337	=item cf::sync_job { BLOCK }	409	=item cf::sync_job { BLOCK }
338		410
339	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	411	The design of Deliantra requires that the main coroutine ($Coro::main)
340	is always able to handle events or runnable, as Crossfire TRT is only	412	is always able to handle events or runnable, as Deliantra is only
341	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	413	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342	acceptable.	414	acceptable.
343		415
344	If it must be done, put the blocking parts into C<sync_job>. This will run	416	If it must be done, put the blocking parts into C<sync_job>. This will run
345	the given BLOCK in another coroutine while waiting for the result. The	417	the given BLOCK in another coroutine while waiting for the result. The
…		…
355	my $time = Event::time;	427	my $time = Event::time;
356		428
357	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
358	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
359		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
360	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
361	# (but this is cancel-safe)	435	# (but this is cancel-safe)
362	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
363		437
364	my $busy = 1;	438	my $busy = 1;
365	my @res;	439	my @res;
366		440
367	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
368	@res = eval { $job->() };	443	@res = eval { $job->() };
369	warn $@ if $@;	444	warn $@ if $@;
370	undef $busy;	445	undef $busy;
371	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
372		447
373	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
374	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
375	}	454	}
376		455
377	$time = Event::time - $time;	456	$time = Event::time - $time;
378		457
379	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	458	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
…		…
416	Coro::Storable. May, of course, block. Note that the executed sub may	495	Coro::Storable. May, of course, block. Note that the executed sub may
417	never block itself or use any form of Event handling.	496	never block itself or use any form of Event handling.
418		497
419	=cut	498	=cut
420		499
421	sub _store_scalar {
422	open my $fh, ">", \my $buf
423	or die "fork_call: cannot open fh-to-buf in child : $!";
424	Storable::store_fd $_[0], $fh;
425	close $fh;
426
427	$buf
428	}
429
430	sub fork_call(&@) {	500	sub fork_call(&@) {
431	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
432		502
433	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
434	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
435	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
436	or die "pipe: $!";
437		506
438	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
439	close $fh2;
440
441	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442	warn "pst<$res>" unless $res =~ /^pst/;
443	$res = Coro::Storable::thaw $res;
444
445	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447	Carp::confess $$res unless "ARRAY" eq ref $res;
448
449	return wantarray ? @$res : $res->[-1];
450	} else {
451	reset_signals;	508	reset_signals;
452	local $SIG{__WARN__};	509	&$cb
453	local $SIG{__DIE__};	510	}, @args;
454	# just in case, this hack effectively disables event
455	# in the child. cleaner and slower would be canceling all watchers,
456	# but this works for the time being.
457	local $Coro::idle;
458	$Coro::current->prio (Coro::PRIO_MAX);
459		511
460	eval {	512	wantarray ? @res : $res[-1]
461	close $fh1;
462
463	my @res = eval { $cb->(@args) };
464
465	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466	close $fh2;
467	};
468
469	warn $@ if $@;
470	_exit 0;
471	}
472	}	513	}
473		514
474	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
475		516
476	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
478	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
479		520
480	Stores the given C<$value> in the family. It can currently store binary	521	Stores the given C<$value> in the family. It can currently store binary
481	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
483	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
484		547
485	our $DB;	548	our $DB;
486		549
487	sub db_init {	550	sub db_init {
488	unless ($DB) {
489	$DB = BDB::db_create $DB_ENV;
490
491	cf::sync_job {	551	cf::sync_job {
492	eval {	552	$DB \|\|= db_table "db";
493	$DB->set_flags (BDB::CHKSUM);
494
495	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
497	cf::cleanup "db_open(db): $!" if $!;
498	};
499	cf::cleanup "db_open(db): $@" if $@;
500	};
501	}	553	};
502	}	554	}
503		555
504	sub db_get($$) {	556	sub db_get($$) {
505	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
506		558
…		…
556	if (1) {	608	if (1) {
557	$md5 =	609	$md5 =
558	join "\x00",	610	join "\x00",
559	$processversion,	611	$processversion,
560	map {	612	map {
561	Coro::cede;	613	cf::cede_to_tick;
562	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
563	} 0.. $#$src;	615	} 0.. $#$src;
564		616
565		617
566	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
610	attach callbacks/event handlers (a collection of which is called an "attachment")	662	attach callbacks/event handlers (a collection of which is called an "attachment")
611	to it. All such attachable objects support the following methods.	663	to it. All such attachable objects support the following methods.
612		664
613	In the following description, CLASS can be any of C<global>, C<object>	665	In the following description, CLASS can be any of C<global>, C<object>
614	C<player>, C<client> or C<map> (i.e. the attachable objects in	666	C<player>, C<client> or C<map> (i.e. the attachable objects in
615	Crossfire TRT).	667	Deliantra).
616		668
617	=over 4	669	=over 4
618		670
619	=item $attachable->attach ($attachment, key => $value...)	671	=item $attachable->attach ($attachment, key => $value...)
620		672
…		…
919	=cut	971	=cut
920		972
921	#############################################################################	973	#############################################################################
922	# object support	974	# object support
923		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
		1017
924	sub reattach {	1018	sub reattach {
925	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
926	my ($obj) = @_;	1020	my ($obj) = @_;
927		1021
928	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1022	bless $obj, ref $obj; # re-bless in case extensions have been reloaded
…		…
974	sub object_freezer_save {	1068	sub object_freezer_save {
975	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
976		1070
977	sync_job {	1071	sync_job {
978	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
979	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
980	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
981		1076
982	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
983	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
984	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
986	close $fh;	1081	close $fh;
987		1082
988	if (@$objs) {	1083	if (@$objs) {
989	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
990	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
991	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
993	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
994	close $fh;	1089	close $fh;
995	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
996	}	1091	}
…		…
1004	}	1099	}
1005	} else {	1100	} else {
1006	aio_unlink $filename;	1101	aio_unlink $filename;
1007	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1008	}	1103	}
1009	}	1104	};
1010	}	1105	}
1011		1106
1012	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1013	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1014		1109
…		…
1026	or return;	1121	or return;
1027		1122
1028	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1029	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1030	or return;	1125	or return;
		1126
1031	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1032	}	1129	}
1033		1130
		1131	utf8::decode (my $decname = $filename);
1034	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1035	$filename, length $data, scalar @{$av \|\| []};	1133	$decname, length $data, scalar @{$av \|\| []};
		1134
1036	return ($data, $av);	1135	($data, $av)
1037	}	1136	}
1038		1137
1039	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1040		1139
1041	=over 4	1140	=over 4
…		…
1114	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1115		1214
1116	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117		1216
1118	if (ref $msg) {	1217	if (ref $msg) {
		1218	my ($type, $reply, @payload) =
		1219	"ARRAY" eq ref $msg
		1220	? @$msg
		1221	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1222
		1223	my @reply;
		1224
1119	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1120	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1121	$pl->ext_reply ($msg->{msgid}, %reply);
1122	}
1123	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1124	} else {	1232	} else {
1125	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126	}	1234	}
1127		1235
1128	cf::override;	1236	cf::override;
…		…
1218		1326
1219	=head3 cf::player	1327	=head3 cf::player
1220		1328
1221	=over 4	1329	=over 4
1222		1330
		1331	=item cf::player::num_playing
		1332
		1333	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1334
		1335	=cut
		1336
		1337	sub num_playing {
		1338	scalar grep
		1339	$_->ob->map
		1340	&& !$_->hidden
		1341	&& !$_->ob->flag (cf::FLAG_WIZ),
		1342	cf::player::list
		1343	}
		1344
1223	=item cf::player::find $login	1345	=item cf::player::find $login
1224		1346
1225	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1226		1348
1227	=cut	1349	=cut
…		…
1262	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1266		1388
1267	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1268	or return;	1390	or return;
		1391
		1392	my $pl = cf::player::load_pl $f
		1393	or return;
		1394	local $cf::PLAYER_LOADING{$login} = $pl;
		1395	$f->resolve_delayed_derefs;
1269	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1270	}	1397	}
1271	}	1398	}
1272	}	1399	}
1273		1400
…		…
1283		1410
1284	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1285	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1286		1413
1287	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1288	Coro::cede;	1415	cf::cede_to_tick;
1289	}	1416	}
1290		1417
1291	sub new($) {	1418	sub new($) {
1292	my ($login) = @_;	1419	my ($login) = @_;
1293		1420
…		…
1297	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1298		1425
1299	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1300		1427
1301	$self	1428	$self
		1429	}
		1430
		1431	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1432
		1433	=cut
		1434
		1435	sub send_msg {
		1436	my $ns = shift->ns
		1437	or return;
		1438	$ns->send_msg (@_);
1302	}	1439	}
1303		1440
1304	=item $pl->quit_character	1441	=item $pl->quit_character
1305		1442
1306	Nukes the player without looking back. If logged in, the connection will	1443	Nukes the player without looking back. If logged in, the connection will
…		…
1361	or return [];	1498	or return [];
1362		1499
1363	my @logins;	1500	my @logins;
1364		1501
1365	for my $login (@$dirs) {	1502	for my $login (@$dirs) {
		1503	my $path = path $login;
		1504
		1505	# a .pst is a dead give-away for a valid player
		1506	unless (-e "$path.pst") {
1366	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1368	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1369		1511
1370	utf8::decode $login;	1512	utf8::decode $login;
1371	push @logins, $login;	1513	push @logins, $login;
1372	}	1514	}
1373		1515
…		…
1406		1548
1407	Expand crossfire pod fragments into protocol xml.	1549	Expand crossfire pod fragments into protocol xml.
1408		1550
1409	=cut	1551	=cut
1410		1552
		1553	use re 'eval';
		1554
		1555	my $group;
		1556	my $interior; $interior = qr{
		1557	# match a pod interior sequence sans C<< >>
		1558	(?:
		1559	\ (.*?)\ (?{ $group = $^N })
		1560	\| < (??{$interior}) >
		1561	)
		1562	}x;
		1563
1411	sub expand_cfpod {	1564	sub expand_cfpod {
1412	((my $self), (local $_)) = @_;	1565	my ($self, $pod) = @_;
1413		1566
1414	# escape & and <	1567	my $xml;
1415	s/&/&/g;
1416	s/(?<![BIUGH])</</g;
1417		1568
1418	# this is buggy, it needs to properly take care of nested <'s	1569	while () {
		1570	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
		1571	$group = $1;
1419		1572
1420	1 while	1573	$group =~ s/&/&/g;
1421	# replace B<>, I<>, U<> etc.	1574	$group =~ s/</</g;
1422	s/B<([^\>]*)>/<b>$1<\/b>/	1575
1423	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1576	$xml .= $group;
1424	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1577	} elsif ($pod =~ m%\G
1425	# replace G<male\|female> tags	1578	([BCGHITU])
1426	\|\| s{G<([^>\|])\\|([^>])>}{	1579	<
1427	$self->gender ? $2 : $1	1580	(?:
1428	}ge	1581	([^<>]*) (?{ $group = $^N })
1429	# replace H<hint text>	1582	\| < $interior >
1430	\|\| s{H<([^\>]*)>}	1583	)
		1584	>
		1585	%gcsx
1431	{	1586	) {
		1587	my ($code, $data) = ($1, $group);
		1588
		1589	if ($code eq "B") {
		1590	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1591	} elsif ($code eq "I") {
		1592	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1593	} elsif ($code eq "U") {
		1594	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1595	} elsif ($code eq "C") {
		1596	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1597	} elsif ($code eq "T") {
		1598	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1599	} elsif ($code eq "G") {
		1600	my ($male, $female) = split /\\|/, $data;
		1601	$data = $self->gender ? $female : $male;
		1602	$xml .= expand_cfpod ($self, $data);
		1603	} elsif ($code eq "H") {
1432	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1604	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1433	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1605	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434	"")	1606	"")
1435	[$self->{hintmode}]	1607	[$self->{hintmode}];
		1608	} else {
		1609	$xml .= "error processing '$code($data)' directive";
1436	}ge;	1610	}
		1611	} else {
		1612	if ($pod =~ /\G(.+)/) {
		1613	warn "parse error while expanding $pod (at $1)";
		1614	}
		1615	last;
		1616	}
		1617	}
1437		1618
		1619	for ($xml) {
1438	# create single paragraphs (very hackish)	1620	# create single paragraphs (very hackish)
1439	s/(?<=\S)\n(?=\w)/ /g;	1621	s/(?<=\S)\n(?=\w)/ /g;
1440		1622
1441	# compress some whitespace	1623	# compress some whitespace
1442	s/\s+\n/\n/g; # ws line-ends	1624	s/\s+\n/\n/g; # ws line-ends
1443	s/\n\n+/\n/g; # double lines	1625	s/\n\n+/\n/g; # double lines
1444	s/^\n+//; # beginning lines	1626	s/^\n+//; # beginning lines
1445	s/\n+$//; # ending lines	1627	s/\n+$//; # ending lines
		1628	}
1446		1629
1447	$_	1630	$xml
1448	}	1631	}
		1632
		1633	no re 'eval';
1449		1634
1450	sub hintmode {	1635	sub hintmode {
1451	$_[0]{hintmode} = $_[1] if @_ > 1;	1636	$_[0]{hintmode} = $_[1] if @_ > 1;
1452	$_[0]{hintmode}	1637	$_[0]{hintmode}
1453	}	1638	}
1454		1639
1455	=item $player->ext_reply ($msgid, %msg)	1640	=item $player->ext_reply ($msgid, @msg)
1456		1641
1457	Sends an ext reply to the player.	1642	Sends an ext reply to the player.
1458		1643
1459	=cut	1644	=cut
1460		1645
1461	sub ext_reply($$%) {	1646	sub ext_reply($$@) {
1462	my ($self, $id, %msg) = @_;	1647	my ($self, $id, @msg) = @_;
1463		1648
1464	$msg{msgid} = $id;	1649	$self->ns->ext_reply ($id, @msg)
1465	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466	}	1650	}
1467		1651
1468	=item $player->ext_event ($type, %msg)	1652	=item $player->ext_msg ($type, @msg)
1469		1653
1470	Sends an ext event to the client.	1654	Sends an ext event to the client.
1471		1655
1472	=cut	1656	=cut
1473		1657
1474	sub ext_event($$%) {	1658	sub ext_msg($$@) {
1475	my ($self, $type, %msg) = @_;	1659	my ($self, $type, @msg) = @_;
1476		1660
1477	$self->ns->ext_event ($type, %msg);	1661	$self->ns->ext_msg ($type, @msg);
1478	}	1662	}
1479		1663
1480	=head3 cf::region	1664	=head3 cf::region
1481		1665
1482	=over 4	1666	=over 4
…		…
1698		1882
1699	sub load_header_from($) {	1883	sub load_header_from($) {
1700	my ($self, $path) = @_;	1884	my ($self, $path) = @_;
1701		1885
1702	utf8::encode $path;	1886	utf8::encode $path;
1703	#aio_open $path, O_RDONLY, 0	1887	my $f = new_from_file cf::object::thawer $path
1704	# or return;
1705
1706	$self->_load_header ($path)
1707	or return;	1888	or return;
		1889
		1890	$self->_load_header ($f)
		1891	or return;
		1892
		1893	local $MAP_LOADING{$self->{path}} = $self;
		1894	$f->resolve_delayed_derefs;
1708		1895
1709	$self->{load_path} = $path;	1896	$self->{load_path} = $path;
1710		1897
1711	1	1898	1
1712	}	1899	}
…		…
1766	sub find {	1953	sub find {
1767	my ($path, $origin) = @_;	1954	my ($path, $origin) = @_;
1768		1955
1769	$path = normalise $path, $origin && $origin->path;	1956	$path = normalise $path, $origin && $origin->path;
1770		1957
		1958	cf::lock_wait "map_data:$path";#d#remove
1771	cf::lock_wait "map_find:$path";	1959	cf::lock_wait "map_find:$path";
1772		1960
1773	$cf::MAP{$path} \|\| do {	1961	$cf::MAP{$path} \|\| do {
1774	my $guard = cf::lock_acquire "map_find:$path";	1962	my $guard1 = cf::lock_acquire "map_find:$path";
		1963	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1964
1775	my $map = new_from_path cf::map $path	1965	my $map = new_from_path cf::map $path
1776	or return;	1966	or return;
1777		1967
1778	$map->{last_save} = $cf::RUNTIME;	1968	$map->{last_save} = $cf::RUNTIME;
1779		1969
…		…
1781	or return;	1971	or return;
1782		1972
1783	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1973	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784	# doing this can freeze the server in a sync job, obviously	1974	# doing this can freeze the server in a sync job, obviously
1785	#$cf::WAIT_FOR_TICK->wait;	1975	#$cf::WAIT_FOR_TICK->wait;
		1976	undef $guard1;
		1977	undef $guard2;
1786	$map->reset;	1978	$map->reset;
1787	undef $guard;
1788	return find $path;	1979	return find $path;
1789	}	1980	}
1790		1981
1791	$cf::MAP{$path} = $map	1982	$cf::MAP{$path} = $map
1792	}	1983	}
…		…
1801	local $self->{deny_reset} = 1; # loading can take a long time	1992	local $self->{deny_reset} = 1; # loading can take a long time
1802		1993
1803	my $path = $self->{path};	1994	my $path = $self->{path};
1804		1995
1805	{	1996	{
1806	my $guard = cf::lock_acquire "map_load:$path";	1997	my $guard = cf::lock_acquire "map_data:$path";
1807		1998
		1999	return unless $self->valid;
1808	return if $self->in_memory != cf::MAP_SWAPPED;	2000	return unless $self->in_memory == cf::MAP_SWAPPED;
1809		2001
1810	$self->in_memory (cf::MAP_LOADING);	2002	$self->in_memory (cf::MAP_LOADING);
1811		2003
1812	$self->alloc;	2004	$self->alloc;
1813		2005
1814	$self->pre_load;	2006	$self->pre_load;
1815	Coro::cede;	2007	cf::cede_to_tick;
1816		2008
		2009	my $f = new_from_file cf::object::thawer $self->{load_path};
		2010	$f->skip_block;
1817	$self->_load_objects ($self->{load_path}, 1)	2011	$self->_load_objects ($f)
1818	or return;	2012	or return;
1819		2013
1820	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2014	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821	if delete $self->{load_original};	2015	if delete $self->{load_original};
1822		2016
1823	if (my $uniq = $self->uniq_path) {	2017	if (my $uniq = $self->uniq_path) {
1824	utf8::encode $uniq;	2018	utf8::encode $uniq;
1825	if (aio_open $uniq, O_RDONLY, 0) {	2019	unless (aio_stat $uniq) {
		2020	if (my $f = new_from_file cf::object::thawer $uniq) {
1826	$self->clear_unique_items;	2021	$self->clear_unique_items;
1827	$self->_load_objects ($uniq, 0);	2022	$self->_load_objects ($f);
		2023	$f->resolve_delayed_derefs;
		2024	}
1828	}	2025	}
1829	}	2026	}
1830		2027
1831	Coro::cede;	2028	$f->resolve_delayed_derefs;
		2029
		2030	cf::cede_to_tick;
1832	# now do the right thing for maps	2031	# now do the right thing for maps
1833	$self->link_multipart_objects;	2032	$self->link_multipart_objects;
1834	$self->difficulty ($self->estimate_difficulty)	2033	$self->difficulty ($self->estimate_difficulty)
1835	unless $self->difficulty;	2034	unless $self->difficulty;
1836	Coro::cede;	2035	cf::cede_to_tick;
1837		2036
1838	unless ($self->{deny_activate}) {	2037	unless ($self->{deny_activate}) {
1839	$self->decay_objects;	2038	$self->decay_objects;
1840	$self->fix_auto_apply;	2039	$self->fix_auto_apply;
1841	$self->update_buttons;	2040	$self->update_buttons;
1842	Coro::cede;	2041	cf::cede_to_tick;
1843	$self->set_darkness_map;	2042	$self->set_darkness_map;
1844	Coro::cede;	2043	cf::cede_to_tick;
1845	$self->activate;	2044	$self->activate;
1846	}	2045	}
		2046
		2047	$self->{last_save} = $cf::RUNTIME;
		2048	$self->last_access ($cf::RUNTIME);
1847		2049
1848	$self->in_memory (cf::MAP_IN_MEMORY);	2050	$self->in_memory (cf::MAP_IN_MEMORY);
1849	}	2051	}
1850		2052
1851	$self->post_load;	2053	$self->post_load;
…		…
1862		2064
1863	$self	2065	$self
1864	}	2066	}
1865		2067
1866	# find and load all maps in the 3x3 area around a map	2068	# find and load all maps in the 3x3 area around a map
1867	sub load_diag {	2069	sub load_neighbours {
1868	my ($map) = @_;	2070	my ($map) = @_;
1869		2071
1870	my @diag; # diagonal neighbours	2072	my @neigh; # diagonal neighbours
1871		2073
1872	for (0 .. 3) {	2074	for (0 .. 3) {
1873	my $neigh = $map->tile_path ($_)	2075	my $neigh = $map->tile_path ($_)
1874	or next;	2076	or next;
1875	$neigh = find $neigh, $map	2077	$neigh = find $neigh, $map
1876	or next;	2078	or next;
1877	$neigh->load;	2079	$neigh->load;
1878		2080
		2081	push @neigh,
1879	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2082	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1880	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2083	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1881	}	2084	}
1882		2085
1883	for (@diag) {	2086	for (grep defined $_->[0], @neigh) {
		2087	my ($path, $origin) = @$_;
1884	my $neigh = find @$_	2088	my $neigh = find $path, $origin
1885	or next;	2089	or next;
1886	$neigh->load;	2090	$neigh->load;
1887	}	2091	}
1888	}	2092	}
1889		2093
…		…
1894	}	2098	}
1895		2099
1896	sub do_load_sync {	2100	sub do_load_sync {
1897	my ($map) = @_;	2101	my ($map) = @_;
1898		2102
		2103	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2104	if $Coro::current == $Coro::main;
		2105
1899	cf::sync_job { $map->load };	2106	cf::sync_job { $map->load };
1900	}	2107	}
1901		2108
1902	our %MAP_PREFETCH;	2109	our %MAP_PREFETCH;
1903	our $MAP_PREFETCHER = undef;	2110	our $MAP_PREFETCHER = undef;
1904		2111
1905	sub find_async {	2112	sub find_async {
1906	my ($path, $origin) = @_;	2113	my ($path, $origin, $load) = @_;
1907		2114
1908	$path = normalise $path, $origin && $origin->{path};	2115	$path = normalise $path, $origin && $origin->{path};
1909		2116
1910	if (my $map = $cf::MAP{$path}) {	2117	if (my $map = $cf::MAP{$path}) {
1911	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2118	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1912	}	2119	}
1913		2120
1914	undef $MAP_PREFETCH{$path};	2121	$MAP_PREFETCH{$path} \|= $load;
		2122
1915	$MAP_PREFETCHER \|\|= cf::async {	2123	$MAP_PREFETCHER \|\|= cf::async {
		2124	$Coro::current->{desc} = "map prefetcher";
		2125
1916	while (%MAP_PREFETCH) {	2126	while (%MAP_PREFETCH) {
1917	for my $path (keys %MAP_PREFETCH) {	2127	while (my ($k, $v) = each %MAP_PREFETCH) {
1918	if (my $map = find $path) {	2128	if (my $map = find $k) {
1919	$map->load;	2129	$map->load if $v;
1920	}	2130	}
1921		2131
1922	delete $MAP_PREFETCH{$path};	2132	delete $MAP_PREFETCH{$k};
1923	}	2133	}
1924	}	2134	}
1925	undef $MAP_PREFETCHER;	2135	undef $MAP_PREFETCHER;
1926	};	2136	};
1927	$MAP_PREFETCHER->prio (6);	2137	$MAP_PREFETCHER->prio (6);
…		…
1930	}	2140	}
1931		2141
1932	sub save {	2142	sub save {
1933	my ($self) = @_;	2143	my ($self) = @_;
1934		2144
1935	my $lock = cf::lock_acquire "map_data:" . $self->path;	2145	my $lock = cf::lock_acquire "map_data:$self->{path}";
1936		2146
1937	$self->{last_save} = $cf::RUNTIME;	2147	$self->{last_save} = $cf::RUNTIME;
1938		2148
1939	return unless $self->dirty;	2149	return unless $self->dirty;
1940		2150
…		…
1946	return if $self->{deny_save};	2156	return if $self->{deny_save};
1947		2157
1948	local $self->{last_access} = $self->last_access;#d#	2158	local $self->{last_access} = $self->last_access;#d#
1949		2159
1950	cf::async {	2160	cf::async {
		2161	$Coro::current->{desc} = "map player save";
1951	$_->contr->save for $self->players;	2162	$_->contr->save for $self->players;
1952	};	2163	};
1953		2164
1954	if ($uniq) {	2165	if ($uniq) {
1955	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2166	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1963	my ($self) = @_;	2174	my ($self) = @_;
1964		2175
1965	# save first because save cedes	2176	# save first because save cedes
1966	$self->save;	2177	$self->save;
1967		2178
1968	my $lock = cf::lock_acquire "map_data:" . $self->path;	2179	my $lock = cf::lock_acquire "map_data:$self->{path}";
1969		2180
1970	return if $self->players;	2181	return if $self->players;
1971	return if $self->in_memory != cf::MAP_IN_MEMORY;	2182	return if $self->in_memory != cf::MAP_IN_MEMORY;
1972	return if $self->{deny_save};	2183	return if $self->{deny_save};
1973		2184
		2185	$self->in_memory (cf::MAP_SWAPPED);
		2186
		2187	$self->deactivate;
		2188	$_->clear_links_to ($self) for values %cf::MAP;
1974	$self->clear;	2189	$self->clear;
1975	$self->in_memory (cf::MAP_SWAPPED);
1976	}	2190	}
1977		2191
1978	sub reset_at {	2192	sub reset_at {
1979	my ($self) = @_;	2193	my ($self) = @_;
1980		2194
…		…
2012	if $uniq;	2226	if $uniq;
2013	}	2227	}
2014		2228
2015	delete $cf::MAP{$self->path};	2229	delete $cf::MAP{$self->path};
2016		2230
		2231	$self->deactivate;
		2232	$_->clear_links_to ($self) for values %cf::MAP;
2017	$self->clear;	2233	$self->clear;
2018
2019	$_->clear_links_to ($self) for values %cf::MAP;
2020		2234
2021	$self->unlink_save;	2235	$self->unlink_save;
2022	$self->destroy;	2236	$self->destroy;
2023	}	2237	}
2024		2238
2025	my $nuke_counter = "aaaa";	2239	my $nuke_counter = "aaaa";
2026		2240
2027	sub nuke {	2241	sub nuke {
2028	my ($self) = @_;	2242	my ($self) = @_;
2029		2243
		2244	{
		2245	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2246
2030	delete $cf::MAP{$self->path};	2247	delete $cf::MAP{$self->path};
2031		2248
2032	$self->unlink_save;	2249	$self->unlink_save;
2033		2250
2034	bless $self, "cf::map";	2251	bless $self, "cf::map";
2035	delete $self->{deny_reset};	2252	delete $self->{deny_reset};
2036	$self->{deny_save} = 1;	2253	$self->{deny_save} = 1;
2037	$self->reset_timeout (1);	2254	$self->reset_timeout (1);
2038	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2255	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039		2256
2040	$cf::MAP{$self->path} = $self;	2257	$cf::MAP{$self->path} = $self;
		2258	}
2041		2259
2042	$self->reset; # polite request, might not happen	2260	$self->reset; # polite request, might not happen
2043	}	2261	}
2044		2262
2045	=item $maps = cf::map::tmp_maps	2263	=item $maps = cf::map::tmp_maps
…		…
2121		2339
2122	sub inv_recursive {	2340	sub inv_recursive {
2123	inv_recursive_ inv $_[0]	2341	inv_recursive_ inv $_[0]
2124	}	2342	}
2125		2343
		2344	=item $ref = $ob->ref
		2345
		2346	creates and returns a persistent reference to an objetc that can be stored as a string.
		2347
		2348	=item $ob = cf::object::deref ($refstring)
		2349
		2350	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2351	even if the object actually exists. May block.
		2352
		2353	=cut
		2354
		2355	sub deref {
		2356	my ($ref) = @_;
		2357
		2358	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2359	my ($uuid, $name) = ($1, $2);
		2360	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2361	or return;
		2362	$pl->ob->uuid eq $uuid
		2363	or return;
		2364
		2365	$pl->ob
		2366	} else {
		2367	warn "$ref: cannot resolve object reference\n";
		2368	undef
		2369	}
		2370	}
		2371
2126	package cf;	2372	package cf;
2127		2373
2128	=back	2374	=back
2129		2375
2130	=head3 cf::object::player	2376	=head3 cf::object::player
…		…
2152		2398
2153	} else {	2399	} else {
2154	my $pl = $self->contr;	2400	my $pl = $self->contr;
2155		2401
2156	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2402	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157	my $diag = $pl->{npc_dialog};	2403	my $dialog = $pl->{npc_dialog};
2158	$diag->{pl}->ext_reply (	2404	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159	$diag->{id},
2160	msgtype => "reply",
2161	msg => $diag->{pl}->expand_cfpod ($msg),
2162	add_topics => []
2163	);
2164		2405
2165	} else {	2406	} else {
2166	$msg = $npc->name . " says: $msg" if $npc;	2407	$msg = $npc->name . " says: $msg" if $npc;
2167	$self->message ($msg, $flags);	2408	$self->message ($msg, $flags);
2168	}	2409	}
2169	}	2410	}
		2411	}
		2412
		2413	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2414
		2415	=cut
		2416
		2417	sub cf::object::send_msg {
		2418	my $pl = shift->contr
		2419	or return;
		2420	$pl->send_msg (@_);
2170	}	2421	}
2171		2422
2172	=item $player_object->may ("access")	2423	=item $player_object->may ("access")
2173		2424
2174	Returns wether the given player is authorized to access resource "access"	2425	Returns wether the given player is authorized to access resource "access"
…		…
2253	# use -1 or undef as default coordinates, not 0, 0	2504	# use -1 or undef as default coordinates, not 0, 0
2254	($x, $y) = ($map->enter_x, $map->enter_y)	2505	($x, $y) = ($map->enter_x, $map->enter_y)
2255	if $x <=0 && $y <= 0;	2506	if $x <=0 && $y <= 0;
2256		2507
2257	$map->load;	2508	$map->load;
2258	$map->load_diag;	2509	$map->load_neighbours;
2259		2510
2260	return unless $self->contr->active;	2511	return unless $self->contr->active;
2261	$self->activate_recursive;	2512	$self->activate_recursive;
2262		2513
2263	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2514	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2283	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2534	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284		2535
2285	$self->enter_link;	2536	$self->enter_link;
2286		2537
2287	(async {	2538	(async {
		2539	$Coro::current->{desc} = "player::goto $path $x $y";
		2540
		2541	# *tag paths override both path and x\|y
		2542	if ($path =~ /^\(.)$/) {
		2543	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2544	my $ob = $obs[rand @obs];
		2545
		2546	# see if we actually can go there
		2547	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2548	$ob = $obs[rand @obs];
		2549	} else {
		2550	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2551	}
		2552	# else put us there anyways for now #d#
		2553
		2554	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2555	} else {
		2556	($path, $x, $y) = (undef, undef, undef);
		2557	}
		2558	}
		2559
2288	my $map = eval {	2560	my $map = eval {
2289	my $map = cf::map::find $path;	2561	my $map = defined $path ? cf::map::find $path : undef;
2290		2562
2291	if ($map) {	2563	if ($map) {
2292	$map = $map->customise_for ($self);	2564	$map = $map->customise_for ($self);
2293	$map = $check->($map) if $check && $map;	2565	$map = $check->($map) if $check && $map;
2294	} else {	2566	} else {
2295	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2567	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2296	}	2568	}
2297		2569
2298	$map	2570	$map
2299	};	2571	};
2300		2572
…		…
2390	# if exit is damned, update players death & WoR home-position	2662	# if exit is damned, update players death & WoR home-position
2391	$self->contr->savebed ($slaying, $hp, $sp)	2663	$self->contr->savebed ($slaying, $hp, $sp)
2392	if $exit->flag (FLAG_DAMNED);	2664	if $exit->flag (FLAG_DAMNED);
2393		2665
2394	(async {	2666	(async {
		2667	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2668
2395	$self->deactivate_recursive; # just to be sure	2669	$self->deactivate_recursive; # just to be sure
2396	unless (eval {	2670	unless (eval {
2397	$self->goto ($slaying, $hp, $sp);	2671	$self->goto ($slaying, $hp, $sp);
2398		2672
2399	1;	2673	1;
…		…
2434	the message, with C<log> being the default. If C<$color> is negative, suppress	2708	the message, with C<log> being the default. If C<$color> is negative, suppress
2435	the message unless the client supports the msg packet.	2709	the message unless the client supports the msg packet.
2436		2710
2437	=cut	2711	=cut
2438		2712
		2713	# non-persistent channels (usually the info channel)
		2714	our %CHANNEL = (
		2715	"c/identify" => {
		2716	id => "infobox",
		2717	title => "Identify",
		2718	reply => undef,
		2719	tooltip => "Items recently identified",
		2720	},
		2721	"c/examine" => {
		2722	id => "infobox",
		2723	title => "Examine",
		2724	reply => undef,
		2725	tooltip => "Signs and other items you examined",
		2726	},
		2727	"c/book" => {
		2728	id => "infobox",
		2729	title => "Book",
		2730	reply => undef,
		2731	tooltip => "The contents of a note or book",
		2732	},
		2733	"c/lookat" => {
		2734	id => "infobox",
		2735	title => "Look",
		2736	reply => undef,
		2737	tooltip => "What you saw there",
		2738	},
		2739	"c/who" => {
		2740	id => "infobox",
		2741	title => "Players",
		2742	reply => undef,
		2743	tooltip => "Shows players who are currently online",
		2744	},
		2745	"c/body" => {
		2746	id => "infobox",
		2747	title => "Body Parts",
		2748	reply => undef,
		2749	tooltip => "Shows which body parts you posess and are available",
		2750	},
		2751	"c/uptime" => {
		2752	id => "infobox",
		2753	title => "Uptime",
		2754	reply => undef,
		2755	tooltip => "How long the server has been running since last restart",
		2756	},
		2757	"c/mapinfo" => {
		2758	id => "infobox",
		2759	title => "Map Info",
		2760	reply => undef,
		2761	tooltip => "Information related to the maps",
		2762	},
		2763	);
		2764
2439	sub cf::client::send_msg {	2765	sub cf::client::send_msg {
2440	my ($self, $channel, $msg, $color, @extra) = @_;	2766	my ($self, $channel, $msg, $color, @extra) = @_;
2441		2767
2442	$msg = $self->pl->expand_cfpod ($msg);	2768	$msg = $self->pl->expand_cfpod ($msg);
2443		2769
2444	return unless @extra \|\| length $msg;
2445
2446	$color &= ~cf::NDI_UNIQUE; # just in case...	2770	$color &= cf::NDI_CLIENT_MASK; # just in case...
2447		2771
		2772	# check predefined channels, for the benefit of C
		2773	if ($CHANNEL{$channel}) {
		2774	$channel = $CHANNEL{$channel};
		2775
		2776	$self->ext_msg (channel_info => $channel)
		2777	if $self->can_msg;
		2778
		2779	$channel = $channel->{id};
		2780
2448	if (ref $channel) {	2781	} elsif (ref $channel) {
2449	# send meta info to client, if not yet sent	2782	# send meta info to client, if not yet sent
2450	unless (exists $self->{channel}{$channel->{id}}) {	2783	unless (exists $self->{channel}{$channel->{id}}) {
2451	$self->{channel}{$channel->{id}} = $channel;	2784	$self->{channel}{$channel->{id}} = $channel;
2452	$self->ext_event (channel_info => %$channel);	2785	$self->ext_msg (channel_info => $channel)
		2786	if $self->can_msg;
2453	}	2787	}
2454		2788
2455	$channel = $channel->{id};	2789	$channel = $channel->{id};
2456	}	2790	}
2457		2791
		2792	return unless @extra \|\| length $msg;
		2793
2458	if ($self->can_msg) {	2794	if ($self->can_msg) {
		2795	# default colour, mask it out
		2796	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2797	if $color & cf::NDI_DEF;
		2798
2459	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2799	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2800	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460	} else {	2801	} else {
2461	# replace some tags by gcfclient-compatible ones
2462	for ($msg) {
2463	1 while
2464	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469	}
2470
2471	if ($color >= 0) {	2802	if ($color >= 0) {
		2803	# replace some tags by gcfclient-compatible ones
		2804	for ($msg) {
		2805	1 while
		2806	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2807	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2808	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2809	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2810	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2811	}
		2812
		2813	$color &= cf::NDI_COLOR_MASK;
		2814
		2815	utf8::encode $msg;
		2816
2472	if (0 && $msg =~ /\[/) {	2817	if (0 && $msg =~ /\[/) {
		2818	# COMMAND/INFO
2473	$self->send_packet ("drawextinfo $color 4 0 $msg")	2819	$self->send_packet ("drawextinfo $color 10 8 $msg")
2474	} else {	2820	} else {
2475	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2821	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2476	$self->send_packet ("drawinfo $color $msg")	2822	$self->send_packet ("drawinfo $color $msg")
2477	}	2823	}
2478	}	2824	}
2479	}	2825	}
2480	}	2826	}
2481		2827
2482	=item $client->ext_event ($type, %msg)	2828	=item $client->ext_msg ($type, @msg)
2483		2829
2484	Sends an ext event to the client.	2830	Sends an ext event to the client.
2485		2831
2486	=cut	2832	=cut
2487		2833
2488	sub cf::client::ext_event($$%) {	2834	sub cf::client::ext_msg($$@) {
2489	my ($self, $type, %msg) = @_;	2835	my ($self, $type, @msg) = @_;
2490		2836
2491	return unless $self->extcmd;	2837	if ($self->extcmd == 2) {
2492		2838	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2839	} elsif ($self->extcmd == 1) { # TODO: remove
2493	$msg{msgtype} = "event_$type";	2840	push @msg, msgtype => "event_$type";
2494	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2841	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2842	}
		2843	}
		2844
		2845	=item $client->ext_reply ($msgid, @msg)
		2846
		2847	Sends an ext reply to the client.
		2848
		2849	=cut
		2850
		2851	sub cf::client::ext_reply($$@) {
		2852	my ($self, $id, @msg) = @_;
		2853
		2854	if ($self->extcmd == 2) {
		2855	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2856	} elsif ($self->extcmd == 1) {
		2857	#TODO: version 1, remove
		2858	unshift @msg, msgtype => "reply", msgid => $id;
		2859	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2860	}
2495	}	2861	}
2496		2862
2497	=item $success = $client->query ($flags, "text", \&cb)	2863	=item $success = $client->query ($flags, "text", \&cb)
2498		2864
2499	Queues a query to the client, calling the given callback with	2865	Queues a query to the client, calling the given callback with
…		…
2554	my ($ns, $buf) = @_;	2920	my ($ns, $buf) = @_;
2555		2921
2556	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2922	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557		2923
2558	if (ref $msg) {	2924	if (ref $msg) {
		2925	my ($type, $reply, @payload) =
		2926	"ARRAY" eq ref $msg
		2927	? @$msg
		2928	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2929
		2930	my @reply;
		2931
2559	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2932	if (my $cb = $EXTICMD{$type}) {
2560	if (my %reply = $cb->($ns, $msg)) {	2933	@reply = $cb->($ns, @payload);
2561	$reply{msgid} = $msg->{msgid};
2562	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563	}
2564	}	2934	}
		2935
		2936	$ns->ext_reply ($reply, @reply)
		2937	if $reply;
		2938
2565	} else {	2939	} else {
2566	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2940	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567	}	2941	}
2568		2942
2569	cf::override;	2943	cf::override;
…		…
2616	our $safe = new Safe "safe";	2990	our $safe = new Safe "safe";
2617	our $safe_hole = new Safe::Hole;	2991	our $safe_hole = new Safe::Hole;
2618		2992
2619	$SIG{FPE} = 'IGNORE';	2993	$SIG{FPE} = 'IGNORE';
2620		2994
2621	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2995	$safe->permit_only (Opcode::opset qw(
		2996	:base_core :base_mem :base_orig :base_math
		2997	grepstart grepwhile mapstart mapwhile
		2998	sort time
		2999	));
2622		3000
2623	# here we export the classes and methods available to script code	3001	# here we export the classes and methods available to script code
2624		3002
2625	=pod	3003	=pod
2626		3004
2627	The following functions and methods are available within a safe environment:	3005	The following functions and methods are available within a safe environment:
2628		3006
2629	cf::object	3007	cf::object
2630	contr pay_amount pay_player map x y force_find force_add	3008	contr pay_amount pay_player map x y force_find force_add destroy
2631	insert remove	3009	insert remove name archname title slaying race decrease_ob_nr
2632		3010
2633	cf::object::player	3011	cf::object::player
2634	player	3012	player
2635		3013
2636	cf::player	3014	cf::player
…		…
2641		3019
2642	=cut	3020	=cut
2643		3021
2644	for (	3022	for (
2645	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3023	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3024	insert remove inv name archname title slaying race
2646	insert remove)],	3025	decrease_ob_nr destroy)],
2647	["cf::object::player" => qw(player)],	3026	["cf::object::player" => qw(player)],
2648	["cf::player" => qw(peaceful)],	3027	["cf::player" => qw(peaceful)],
2649	["cf::map" => qw(trigger)],	3028	["cf::map" => qw(trigger)],
2650	) {	3029	) {
2651	no strict 'refs';	3030	no strict 'refs';
…		…
2727	# the server's init and main functions	3106	# the server's init and main functions
2728		3107
2729	sub load_facedata($) {	3108	sub load_facedata($) {
2730	my ($path) = @_;	3109	my ($path) = @_;
2731		3110
		3111	# HACK to clear player env face cache, we need some signal framework
		3112	# for this (global event?)
		3113	%ext::player_env::MUSIC_FACE_CACHE = ();
		3114
		3115	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3116
2732	warn "loading facedata from $path\n";	3117	warn "loading facedata from $path\n";
2733		3118
2734	my $facedata;	3119	my $facedata;
2735	0 < aio_load $path, $facedata	3120	0 < aio_load $path, $facedata
2736	or die "$path: $!";	3121	or die "$path: $!";
2737		3122
2738	$facedata = Coro::Storable::thaw $facedata;	3123	$facedata = Coro::Storable::thaw $facedata;
2739		3124
2740	$facedata->{version} == 2	3125	$facedata->{version} == 2
2741	or cf::cleanup "$path: version mismatch, cannot proceed.";	3126	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3127
		3128	# patch in the exptable
		3129	$facedata->{resource}{"res/exp_table"} = {
		3130	type => FT_RSRC,
		3131	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3132	};
		3133	cf::cede_to_tick;
2742		3134
2743	{	3135	{
2744	my $faces = $facedata->{faceinfo};	3136	my $faces = $facedata->{faceinfo};
2745		3137
2746	while (my ($face, $info) = each %$faces) {	3138	while (my ($face, $info) = each %$faces) {
2747	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3139	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2748	cf::face::set_visibility $idx, $info->{visibility};	3140	cf::face::set_visibility $idx, $info->{visibility};
2749	cf::face::set_magicmap $idx, $info->{magicmap};	3141	cf::face::set_magicmap $idx, $info->{magicmap};
2750	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3142	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3143	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752		3144
2753	cf::cede_to_tick;	3145	cf::cede_to_tick;
2754	}	3146	}
2755		3147
2756	while (my ($face, $info) = each %$faces) {	3148	while (my ($face, $info) = each %$faces) {
…		…
2781		3173
2782	{	3174	{
2783	# TODO: for gcfclient pleasure, we should give resources	3175	# TODO: for gcfclient pleasure, we should give resources
2784	# that gcfclient doesn't grok a >10000 face index.	3176	# that gcfclient doesn't grok a >10000 face index.
2785	my $res = $facedata->{resource};	3177	my $res = $facedata->{resource};
2786	my $enc = JSON::XS->new->utf8->canonical;	3178
		3179	my $soundconf = delete $res->{"res/sound.conf"};
2787		3180
2788	while (my ($name, $info) = each %$res) {	3181	while (my ($name, $info) = each %$res) {
2789	my $meta = $enc->encode ({
2790	name => $name,
2791	type => $info->{type},
2792	copyright => $info->{copyright}, #TODO#
2793	});
2794
2795	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3182	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3183	my $data;
2796		3184
2797	if ($name =~ /\.jpg$/) {	3185	if ($info->{type} & 1) {
2798	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3186	# prepend meta info
2799	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3187
		3188	my $meta = $enc->encode ({
		3189	name => $name,
		3190	%{ $info->{meta} \|\| {} },
		3191	});
		3192
		3193	$data = pack "(w/a)", $meta, $info->{data};
2800	} else {	3194	} else {
2801	my $data = pack "(w/a)", $meta, $info->{data};	3195	$data = $info->{data};
2802	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804	cf::face::set_type $idx, 1;
2805	cf::face::set_data $idx, 0, $data, $chk;
2806	}	3196	}
2807		3197
		3198	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3199	cf::face::set_type $idx, $info->{type};
		3200
2808	cf::cede_to_tick;	3201	cf::cede_to_tick;
2809	}	3202	}
		3203
		3204	if ($soundconf) {
		3205	$soundconf = $enc->decode (delete $soundconf->{data});
		3206
		3207	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3208	my $sound = $soundconf->{compat}[$_]
		3209	or next;
		3210
		3211	my $face = cf::face::find "sound/$sound->[1]";
		3212	cf::sound::set $sound->[0] => $face;
		3213	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3214	}
		3215
		3216	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3217	my $face = cf::face::find "sound/$v";
		3218	cf::sound::set $k => $face;
		3219	}
		3220	}
2810	}	3221	}
2811		3222
2812	1	3223	1
2813	}	3224	}
2814		3225
		3226	register_exticmd fx_want => sub {
		3227	my ($ns, $want) = @_;
		3228
		3229	while (my ($k, $v) = each %$want) {
		3230	$ns->fx_want ($k, $v);
		3231	}
		3232	};
		3233
2815	sub reload_regions {	3234	sub reload_regions {
		3235	# HACK to clear player env face cache, we need some signal framework
		3236	# for this (global event?)
		3237	%ext::player_env::MUSIC_FACE_CACHE = ();
		3238
2816	load_resource_file "$MAPDIR/regions"	3239	load_resource_file "$MAPDIR/regions"
2817	or die "unable to load regions file\n";	3240	or die "unable to load regions file\n";
2818		3241
2819	for (cf::region::list) {	3242	for (cf::region::list) {
2820	$_->{match} = qr/$_->{match}/	3243	$_->{match} = qr/$_->{match}/
…		…
2856		3279
2857	sub init {	3280	sub init {
2858	reload_resources;	3281	reload_resources;
2859	}	3282	}
2860		3283
2861	sub cfg_load {	3284	sub reload_config {
2862	open my $fh, "<:utf8", "$CONFDIR/config"	3285	open my $fh, "<:utf8", "$CONFDIR/config"
2863	or return;	3286	or return;
2864		3287
2865	local $/;	3288	local $/;
2866	*CFG = YAML::Syck::Load <$fh>;	3289	*CFG = YAML::Syck::Load <$fh>;
…		…
2882	sub main {	3305	sub main {
2883	# we must not ever block the main coroutine	3306	# we must not ever block the main coroutine
2884	local $Coro::idle = sub {	3307	local $Coro::idle = sub {
2885	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3308	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886	(async {	3309	(async {
		3310	$Coro::current->{desc} = "IDLE BUG HANDLER";
2887	Event::one_event;	3311	Event::one_event;
2888	})->prio (Coro::PRIO_MAX);	3312	})->prio (Coro::PRIO_MAX);
2889	};	3313	};
2890		3314
2891	cfg_load;	3315	reload_config;
2892	db_init;	3316	db_init;
2893	load_extensions;	3317	load_extensions;
2894		3318
2895	$TICK_WATCHER->start;	3319	$TICK_WATCHER->start;
2896	Event::loop;	3320	Event::loop;
…		…
2963	# and maps saved/destroyed asynchronously.	3387	# and maps saved/destroyed asynchronously.
2964	warn "begin emergency player save\n";	3388	warn "begin emergency player save\n";
2965	for my $login (keys %cf::PLAYER) {	3389	for my $login (keys %cf::PLAYER) {
2966	my $pl = $cf::PLAYER{$login} or next;	3390	my $pl = $cf::PLAYER{$login} or next;
2967	$pl->valid or next;	3391	$pl->valid or next;
		3392	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968	$pl->save;	3393	$pl->save;
2969	}	3394	}
2970	warn "end emergency player save\n";	3395	warn "end emergency player save\n";
2971		3396
2972	warn "begin emergency map save\n";	3397	warn "begin emergency map save\n";
…		…
3020		3445
3021	warn "flushing outstanding aio requests";	3446	warn "flushing outstanding aio requests";
3022	for (;;) {	3447	for (;;) {
3023	BDB::flush;	3448	BDB::flush;
3024	IO::AIO::flush;	3449	IO::AIO::flush;
3025	Coro::cede;	3450	Coro::cede_notself;
3026	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3451	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3027	warn "iterate...";	3452	warn "iterate...";
3028	}	3453	}
3029		3454
3030	++$RELOAD;	3455	++$RELOAD;
…		…
3089	warn "reloading cf.pm";	3514	warn "reloading cf.pm";
3090	require cf;	3515	require cf;
3091	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3516	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092		3517
3093	warn "loading config and database again";	3518	warn "loading config and database again";
3094	cf::cfg_load;	3519	cf::reload_config;
3095		3520
3096	warn "loading extensions";	3521	warn "loading extensions";
3097	cf::load_extensions;	3522	cf::load_extensions;
3098		3523
3099	warn "reattaching attachments to objects/players";	3524	warn "reattaching attachments to objects/players";
…		…
3135	register_command "reload" => sub {	3560	register_command "reload" => sub {
3136	my ($who, $arg) = @_;	3561	my ($who, $arg) = @_;
3137		3562
3138	if ($who->flag (FLAG_WIZ)) {	3563	if ($who->flag (FLAG_WIZ)) {
3139	$who->message ("reloading server.");	3564	$who->message ("reloading server.");
		3565	async {
		3566	$Coro::current->{desc} = "perl_reload";
3140	async { reload_perl };	3567	reload_perl;
		3568	};
3141	}	3569	}
3142	};	3570	};
3143		3571
3144	unshift @INC, $LIBDIR;	3572	unshift @INC, $LIBDIR;
3145		3573
…		…
3164	my $signal = new Coro::Signal;	3592	my $signal = new Coro::Signal;
3165	push @WAIT_FOR_TICK_BEGIN, $signal;	3593	push @WAIT_FOR_TICK_BEGIN, $signal;
3166	$signal->wait;	3594	$signal->wait;
3167	}	3595	}
3168		3596
3169	my $min = 1e6;#d#
3170	my $avg = 10;
3171	$TICK_WATCHER = Event->timer (	3597	$TICK_WATCHER = Event->timer (
3172	reentrant => 0,	3598	reentrant => 0,
3173	parked => 1,	3599	parked => 1,
3174	prio => 0,	3600	prio => 0,
3175	at => $NEXT_TICK \|\| $TICK,	3601	at => $NEXT_TICK \|\| $TICK,
…		…
3183		3609
3184	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = Event::time;
3185		3611
3186	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
3187		3613
3188	0 && sync_job {#d#
3189	for(1..10) {
3190	my $t = Event::time;
3191	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192	or die;
3193
3194	$map->width (50);
3195	$map->height (50);
3196	$map->alloc;
3197	$map->_load_objects ("/tmp/x.map", 1);
3198	my $t = Event::time - $t;
3199
3200	#next unless $t < 0.0013;#d#
3201	if ($t < $min) {
3202	$min = $t;
3203	}
3204	$avg = $avg * 0.99 + $t * 0.01;
3205	}
3206	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207	exit 0;
3208	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209	};
3210
3211	$RUNTIME += $TICK;	3614	$RUNTIME += $TICK;
3212	$NEXT_TICK += $TICK;	3615	$NEXT_TICK += $TICK;
3213		3616
3214	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215	$NEXT_RUNTIME_WRITE = $NOW + 10;	3618	$NEXT_RUNTIME_WRITE = $NOW + 10;
3216	Coro::async_pool {	3619	Coro::async_pool {
		3620	$Coro::current->{desc} = "runtime saver";
3217	write_runtime	3621	write_runtime
3218	or warn "ERROR: unable to write runtime file: $!";	3622	or warn "ERROR: unable to write runtime file: $!";
3219	};	3623	};
3220	}	3624	}
3221		3625
3222	# my $AFTER = Event::time;
3223	# warn $AFTER - $NOW;#d#
3224
3225	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226	$sig->send;	3627	$sig->send;
3227	}	3628	}
3228	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
3229	$sig->send;	3630	$sig->send;
…		…
3239		3640
3240	$LOAD = ($NOW - $tick_start) / $TICK;	3641	$LOAD = ($NOW - $tick_start) / $TICK;
3241	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3642	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242		3643
3243	_post_tick;	3644	_post_tick;
3244
3245
3246	},	3645	},
3247	);	3646	);
3248		3647
3249	{	3648	{
		3649	BDB::min_parallel 8;
3250	BDB::max_poll_time $TICK * 0.1;	3650	BDB::max_poll_time $TICK * 0.1;
3251	$BDB_POLL_WATCHER = Event->io (	3651	$BDB_POLL_WATCHER = Event->io (
3252	reentrant => 0,	3652	reentrant => 0,
3253	fd => BDB::poll_fileno,	3653	fd => BDB::poll_fileno,
3254	poll => 'r',	3654	poll => 'r',
3255	prio => 0,	3655	prio => 0,
3256	data => WF_AUTOCANCEL,	3656	data => WF_AUTOCANCEL,
3257	cb => \&BDB::poll_cb,	3657	cb => \&BDB::poll_cb,
3258	);	3658	);
3259	BDB::min_parallel 8;
3260		3659
3261	BDB::set_sync_prepare {	3660	BDB::set_sync_prepare {
3262	my $status;	3661	my $status;
3263	my $current = $Coro::current;	3662	my $current = $Coro::current;
3264	(	3663	(
…		…
3273	)	3672	)
3274	};	3673	};
3275		3674
3276	unless ($DB_ENV) {	3675	unless ($DB_ENV) {
3277	$DB_ENV = BDB::db_env_create;	3676	$DB_ENV = BDB::db_env_create;
		3677	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3678	\| BDB::LOG_AUTOREMOVE, 1);
		3679	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3680	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278		3681
3279	cf::sync_job {	3682	cf::sync_job {
3280	eval {	3683	eval {
3281	BDB::db_env_open	3684	BDB::db_env_open
3282	$DB_ENV,	3685	$DB_ENV,
…		…
3284	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3687	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3285	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3688	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3286	0666;	3689	0666;
3287		3690
3288	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3691	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3291	$DB_ENV->set_lk_detect;
3292	};	3692	};
3293		3693
3294	cf::cleanup "db_env_open(db): $@" if $@;	3694	cf::cleanup "db_env_open(db): $@" if $@;
3295	};	3695	};
3296	}	3696	}
		3697
		3698	$BDB_DEADLOCK_WATCHER = Event->timer (
		3699	after => 3,
		3700	interval => 1,
		3701	hard => 1,
		3702	prio => 0,
		3703	data => WF_AUTOCANCEL,
		3704	cb => sub {
		3705	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3706	},
		3707	);
		3708	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3709	after => 11,
		3710	interval => 60,
		3711	hard => 1,
		3712	prio => 0,
		3713	data => WF_AUTOCANCEL,
		3714	cb => sub {
		3715	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3716	},
		3717	);
		3718	$BDB_TRICKLE_WATCHER = Event->timer (
		3719	after => 5,
		3720	interval => 10,
		3721	hard => 1,
		3722	prio => 0,
		3723	data => WF_AUTOCANCEL,
		3724	cb => sub {
		3725	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3726	},
		3727	);
3297	}	3728	}
3298		3729
3299	{	3730	{
3300	IO::AIO::min_parallel 8;	3731	IO::AIO::min_parallel 8;
3301		3732
…		…
3304	$AIO_POLL_WATCHER = Event->io (	3735	$AIO_POLL_WATCHER = Event->io (
3305	reentrant => 0,	3736	reentrant => 0,
3306	data => WF_AUTOCANCEL,	3737	data => WF_AUTOCANCEL,
3307	fd => IO::AIO::poll_fileno,	3738	fd => IO::AIO::poll_fileno,
3308	poll => 'r',	3739	poll => 'r',
3309	prio => 6,	3740	prio => 0,
3310	cb => \&IO::AIO::poll_cb,	3741	cb => \&IO::AIO::poll_cb,
3311	);	3742	);
3312	}	3743	}
3313		3744
3314	my $_log_backtrace;	3745	my $_log_backtrace;
…		…
3320		3751
3321	# limit the # of concurrent backtraces	3752	# limit the # of concurrent backtraces
3322	if ($_log_backtrace < 2) {	3753	if ($_log_backtrace < 2) {
3323	++$_log_backtrace;	3754	++$_log_backtrace;
3324	async {	3755	async {
		3756	$Coro::current->{desc} = "abt $msg";
		3757
3325	my @bt = fork_call {	3758	my @bt = fork_call {
3326	@addr = map { sprintf "%x", $_ } @addr;	3759	@addr = map { sprintf "%x", $_ } @addr;
3327	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3760	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3761	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3329	or die "addr2line: $!";	3762	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs. Revision 1.394 by root, Thu Nov 8 19:43:25 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.394 by root, Thu Nov 8 19:43:25 2007 UTC