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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 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.
…		…
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";
…		…
918		970
919	=cut	971	=cut
920		972
921	#############################################################################	973	#############################################################################
922	# object support	974	# object support
923	#
924		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#
925	sub _can_merge {	1009	sub _can_merge {
926	my ($ob1, $ob2) = @_;	1010	my ($ob1, $ob2) = @_;
927		1011
928	local $Storable::canonical = 1;	1012	++$SLOW_MERGES;#d#
929	my $fob1 = Storable::freeze $ob1;
930	my $fob2 = Storable::freeze $ob2;
931		1013
932	$fob1 eq $fob2	1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
933	}	1016	}
934		1017
935	sub reattach {	1018	sub reattach {
936	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
937	my ($obj) = @_;	1020	my ($obj) = @_;
…		…
985	sub object_freezer_save {	1068	sub object_freezer_save {
986	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
987		1070
988	sync_job {	1071	sync_job {
989	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
990	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
991	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
992		1076
993	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
994	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
995	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
997	close $fh;	1081	close $fh;
998		1082
999	if (@$objs) {	1083	if (@$objs) {
1000	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) {
1001	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
1002	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
1004	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
1005	close $fh;	1089	close $fh;
1006	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
1007	}	1091	}
…		…
1015	}	1099	}
1016	} else {	1100	} else {
1017	aio_unlink $filename;	1101	aio_unlink $filename;
1018	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1019	}	1103	}
1020	}	1104	};
1021	}	1105	}
1022		1106
1023	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1024	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1025		1109
…		…
1037	or return;	1121	or return;
1038		1122
1039	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1040	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1041	or return;	1125	or return;
		1126
1042	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1043	}	1129	}
1044		1130
		1131	utf8::decode (my $decname = $filename);
1045	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1046	$filename, length $data, scalar @{$av \|\| []};	1133	$decname, length $data, scalar @{$av \|\| []};
		1134
1047	return ($data, $av);	1135	($data, $av)
1048	}	1136	}
1049		1137
1050	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1051		1139
1052	=over 4	1140	=over 4
…		…
1125	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1126		1214
1127	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128		1216
1129	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
1130	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1131	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1132	$pl->ext_reply ($msg->{msgid}, %reply);
1133	}
1134	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1135	} else {	1232	} else {
1136	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137	}	1234	}
1138		1235
1139	cf::override;	1236	cf::override;
…		…
1229		1326
1230	=head3 cf::player	1327	=head3 cf::player
1231		1328
1232	=over 4	1329	=over 4
1233		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
1234	=item cf::player::find $login	1345	=item cf::player::find $login
1235		1346
1236	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1237		1348
1238	=cut	1349	=cut
…		…
1273	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1277		1388
1278	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1279	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;
1280	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1281	}	1397	}
1282	}	1398	}
1283	}	1399	}
1284		1400
…		…
1294		1410
1295	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1296	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1297		1413
1298	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1299	Coro::cede;	1415	cf::cede_to_tick;
1300	}	1416	}
1301		1417
1302	sub new($) {	1418	sub new($) {
1303	my ($login) = @_;	1419	my ($login) = @_;
1304		1420
…		…
1308	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1309		1425
1310	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1311		1427
1312	$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 (@_);
1313	}	1439	}
1314		1440
1315	=item $pl->quit_character	1441	=item $pl->quit_character
1316		1442
1317	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
…		…
1372	or return [];	1498	or return [];
1373		1499
1374	my @logins;	1500	my @logins;
1375		1501
1376	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") {
1377	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1379	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1380		1511
1381	utf8::decode $login;	1512	utf8::decode $login;
1382	push @logins, $login;	1513	push @logins, $login;
1383	}	1514	}
1384		1515
…		…
1417		1548
1418	Expand crossfire pod fragments into protocol xml.	1549	Expand crossfire pod fragments into protocol xml.
1419		1550
1420	=cut	1551	=cut
1421		1552
		1553	use re 'eval';
		1554
		1555	my $group;
		1556	my $interior; $interior = qr{
		1557	(?:
		1558	\ (.*?)\ (?{ $group = $^N })
		1559	\| < (??{$interior}) >
		1560	)
		1561	}x;
		1562
1422	sub expand_cfpod {	1563	sub expand_cfpod {
1423	((my $self), (local $_)) = @_;	1564	my ($self, $pod) = @_;
1424		1565
1425	# escape & and <	1566	my $xml;
1426	s/&/&/g;
1427	s/(?<![BIUGH])</</g;
1428		1567
1429	# this is buggy, it needs to properly take care of nested <'s	1568	while () {
		1569	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?=[^<]) )+ )/xgcs) {
		1570	$group = $1;
1430		1571
1431	1 while	1572	$group =~ s/&/&/g;
1432	# replace B<>, I<>, U<> etc.	1573	$group =~ s/</</g;
1433	s/B<([^\>]*)>/<b>$1<\/b>/	1574
1434	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1575	$xml .= $group;
1435	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1576	} elsif ($pod =~ m%\G
1436	# replace G<male\|female> tags	1577	([BCGHITU])
1437	\|\| s{G<([^>\|])\\|([^>])>}{	1578	<
1438	$self->gender ? $2 : $1	1579	(?:
1439	}ge	1580	([^<>]*) (?{ $group = $^N })
1440	# replace H<hint text>	1581	\| < $interior >
1441	\|\| s{H<([^\>]*)>}	1582	)
		1583	>
		1584	%gcsx
1442	{	1585	) {
		1586	my ($code, $data) = ($1, $group);
		1587
		1588	if ($code eq "B") {
		1589	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1590	} elsif ($code eq "I") {
		1591	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1592	} elsif ($code eq "U") {
		1593	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1594	} elsif ($code eq "C") {
		1595	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1596	} elsif ($code eq "T") {
		1597	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1598	} elsif ($code eq "G") {
		1599	my ($male, $female) = split /\\|/, $data;
		1600	$data = $self->gender ? $female : $male;
		1601	$xml .= expand_cfpod ($self, $data);
		1602	} elsif ($code eq "H") {
1443	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1603	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1444	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1604	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445	"")	1605	"")
1446	[$self->{hintmode}]	1606	[$self->{hintmode}];
		1607	} else {
		1608	$xml .= "error processing '$code($data)' directive";
1447	}ge;	1609	}
		1610	} else {
		1611	if ($pod =~ /\G(.+)/) {
		1612	warn "parse error while expanding $pod (at $1)";
		1613	}
		1614	last;
		1615	}
		1616	}
1448		1617
		1618	for ($xml) {
1449	# create single paragraphs (very hackish)	1619	# create single paragraphs (very hackish)
1450	s/(?<=\S)\n(?=\w)/ /g;	1620	s/(?<=\S)\n(?=\w)/ /g;
1451		1621
1452	# compress some whitespace	1622	# compress some whitespace
1453	s/\s+\n/\n/g; # ws line-ends	1623	s/\s+\n/\n/g; # ws line-ends
1454	s/\n\n+/\n/g; # double lines	1624	s/\n\n+/\n/g; # double lines
1455	s/^\n+//; # beginning lines	1625	s/^\n+//; # beginning lines
1456	s/\n+$//; # ending lines	1626	s/\n+$//; # ending lines
		1627	}
1457		1628
1458	$_	1629	$xml
1459	}	1630	}
1460		1631
1461	sub hintmode {	1632	sub hintmode {
1462	$_[0]{hintmode} = $_[1] if @_ > 1;	1633	$_[0]{hintmode} = $_[1] if @_ > 1;
1463	$_[0]{hintmode}	1634	$_[0]{hintmode}
1464	}	1635	}
1465		1636
1466	=item $player->ext_reply ($msgid, %msg)	1637	=item $player->ext_reply ($msgid, @msg)
1467		1638
1468	Sends an ext reply to the player.	1639	Sends an ext reply to the player.
1469		1640
1470	=cut	1641	=cut
1471		1642
1472	sub ext_reply($$%) {	1643	sub ext_reply($$@) {
1473	my ($self, $id, %msg) = @_;	1644	my ($self, $id, @msg) = @_;
1474		1645
1475	$msg{msgid} = $id;	1646	$self->ns->ext_reply ($id, @msg)
1476	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477	}	1647	}
1478		1648
1479	=item $player->ext_event ($type, %msg)	1649	=item $player->ext_msg ($type, @msg)
1480		1650
1481	Sends an ext event to the client.	1651	Sends an ext event to the client.
1482		1652
1483	=cut	1653	=cut
1484		1654
1485	sub ext_event($$%) {	1655	sub ext_msg($$@) {
1486	my ($self, $type, %msg) = @_;	1656	my ($self, $type, @msg) = @_;
1487		1657
1488	$self->ns->ext_event ($type, %msg);	1658	$self->ns->ext_msg ($type, @msg);
1489	}	1659	}
1490		1660
1491	=head3 cf::region	1661	=head3 cf::region
1492		1662
1493	=over 4	1663	=over 4
…		…
1709		1879
1710	sub load_header_from($) {	1880	sub load_header_from($) {
1711	my ($self, $path) = @_;	1881	my ($self, $path) = @_;
1712		1882
1713	utf8::encode $path;	1883	utf8::encode $path;
1714	#aio_open $path, O_RDONLY, 0	1884	my $f = new_from_file cf::object::thawer $path
1715	# or return;
1716
1717	$self->_load_header ($path)
1718	or return;	1885	or return;
		1886
		1887	$self->_load_header ($f)
		1888	or return;
		1889
		1890	local $MAP_LOADING{$self->{path}} = $self;
		1891	$f->resolve_delayed_derefs;
1719		1892
1720	$self->{load_path} = $path;	1893	$self->{load_path} = $path;
1721		1894
1722	1	1895	1
1723	}	1896	}
…		…
1777	sub find {	1950	sub find {
1778	my ($path, $origin) = @_;	1951	my ($path, $origin) = @_;
1779		1952
1780	$path = normalise $path, $origin && $origin->path;	1953	$path = normalise $path, $origin && $origin->path;
1781		1954
		1955	cf::lock_wait "map_data:$path";#d#remove
1782	cf::lock_wait "map_find:$path";	1956	cf::lock_wait "map_find:$path";
1783		1957
1784	$cf::MAP{$path} \|\| do {	1958	$cf::MAP{$path} \|\| do {
1785	my $guard = cf::lock_acquire "map_find:$path";	1959	my $guard1 = cf::lock_acquire "map_find:$path";
		1960	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1961
1786	my $map = new_from_path cf::map $path	1962	my $map = new_from_path cf::map $path
1787	or return;	1963	or return;
1788		1964
1789	$map->{last_save} = $cf::RUNTIME;	1965	$map->{last_save} = $cf::RUNTIME;
1790		1966
…		…
1792	or return;	1968	or return;
1793		1969
1794	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1970	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795	# doing this can freeze the server in a sync job, obviously	1971	# doing this can freeze the server in a sync job, obviously
1796	#$cf::WAIT_FOR_TICK->wait;	1972	#$cf::WAIT_FOR_TICK->wait;
		1973	undef $guard1;
		1974	undef $guard2;
1797	$map->reset;	1975	$map->reset;
1798	undef $guard;
1799	return find $path;	1976	return find $path;
1800	}	1977	}
1801		1978
1802	$cf::MAP{$path} = $map	1979	$cf::MAP{$path} = $map
1803	}	1980	}
…		…
1812	local $self->{deny_reset} = 1; # loading can take a long time	1989	local $self->{deny_reset} = 1; # loading can take a long time
1813		1990
1814	my $path = $self->{path};	1991	my $path = $self->{path};
1815		1992
1816	{	1993	{
1817	my $guard = cf::lock_acquire "map_load:$path";	1994	my $guard = cf::lock_acquire "map_data:$path";
1818		1995
		1996	return unless $self->valid;
1819	return if $self->in_memory != cf::MAP_SWAPPED;	1997	return unless $self->in_memory == cf::MAP_SWAPPED;
1820		1998
1821	$self->in_memory (cf::MAP_LOADING);	1999	$self->in_memory (cf::MAP_LOADING);
1822		2000
1823	$self->alloc;	2001	$self->alloc;
1824		2002
1825	$self->pre_load;	2003	$self->pre_load;
1826	Coro::cede;	2004	cf::cede_to_tick;
1827		2005
		2006	my $f = new_from_file cf::object::thawer $self->{load_path};
		2007	$f->skip_block;
1828	$self->_load_objects ($self->{load_path}, 1)	2008	$self->_load_objects ($f)
1829	or return;	2009	or return;
1830		2010
1831	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2011	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832	if delete $self->{load_original};	2012	if delete $self->{load_original};
1833		2013
1834	if (my $uniq = $self->uniq_path) {	2014	if (my $uniq = $self->uniq_path) {
1835	utf8::encode $uniq;	2015	utf8::encode $uniq;
1836	if (aio_open $uniq, O_RDONLY, 0) {	2016	unless (aio_stat $uniq) {
		2017	if (my $f = new_from_file cf::object::thawer $uniq) {
1837	$self->clear_unique_items;	2018	$self->clear_unique_items;
1838	$self->_load_objects ($uniq, 0);	2019	$self->_load_objects ($f);
		2020	$f->resolve_delayed_derefs;
		2021	}
1839	}	2022	}
1840	}	2023	}
1841		2024
1842	Coro::cede;	2025	$f->resolve_delayed_derefs;
		2026
		2027	cf::cede_to_tick;
1843	# now do the right thing for maps	2028	# now do the right thing for maps
1844	$self->link_multipart_objects;	2029	$self->link_multipart_objects;
1845	$self->difficulty ($self->estimate_difficulty)	2030	$self->difficulty ($self->estimate_difficulty)
1846	unless $self->difficulty;	2031	unless $self->difficulty;
1847	Coro::cede;	2032	cf::cede_to_tick;
1848		2033
1849	unless ($self->{deny_activate}) {	2034	unless ($self->{deny_activate}) {
1850	$self->decay_objects;	2035	$self->decay_objects;
1851	$self->fix_auto_apply;	2036	$self->fix_auto_apply;
1852	$self->update_buttons;	2037	$self->update_buttons;
1853	Coro::cede;	2038	cf::cede_to_tick;
1854	$self->set_darkness_map;	2039	$self->set_darkness_map;
1855	Coro::cede;	2040	cf::cede_to_tick;
1856	$self->activate;	2041	$self->activate;
1857	}	2042	}
		2043
		2044	$self->{last_save} = $cf::RUNTIME;
		2045	$self->last_access ($cf::RUNTIME);
1858		2046
1859	$self->in_memory (cf::MAP_IN_MEMORY);	2047	$self->in_memory (cf::MAP_IN_MEMORY);
1860	}	2048	}
1861		2049
1862	$self->post_load;	2050	$self->post_load;
…		…
1873		2061
1874	$self	2062	$self
1875	}	2063	}
1876		2064
1877	# find and load all maps in the 3x3 area around a map	2065	# find and load all maps in the 3x3 area around a map
1878	sub load_diag {	2066	sub load_neighbours {
1879	my ($map) = @_;	2067	my ($map) = @_;
1880		2068
1881	my @diag; # diagonal neighbours	2069	my @neigh; # diagonal neighbours
1882		2070
1883	for (0 .. 3) {	2071	for (0 .. 3) {
1884	my $neigh = $map->tile_path ($_)	2072	my $neigh = $map->tile_path ($_)
1885	or next;	2073	or next;
1886	$neigh = find $neigh, $map	2074	$neigh = find $neigh, $map
1887	or next;	2075	or next;
1888	$neigh->load;	2076	$neigh->load;
1889		2077
		2078	push @neigh,
1890	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2079	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1891	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2080	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1892	}	2081	}
1893		2082
1894	for (@diag) {	2083	for (grep defined $_->[0], @neigh) {
		2084	my ($path, $origin) = @$_;
1895	my $neigh = find @$_	2085	my $neigh = find $path, $origin
1896	or next;	2086	or next;
1897	$neigh->load;	2087	$neigh->load;
1898	}	2088	}
1899	}	2089	}
1900		2090
…		…
1905	}	2095	}
1906		2096
1907	sub do_load_sync {	2097	sub do_load_sync {
1908	my ($map) = @_;	2098	my ($map) = @_;
1909		2099
		2100	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2101	if $Coro::current == $Coro::main;
		2102
1910	cf::sync_job { $map->load };	2103	cf::sync_job { $map->load };
1911	}	2104	}
1912		2105
1913	our %MAP_PREFETCH;	2106	our %MAP_PREFETCH;
1914	our $MAP_PREFETCHER = undef;	2107	our $MAP_PREFETCHER = undef;
1915		2108
1916	sub find_async {	2109	sub find_async {
1917	my ($path, $origin) = @_;	2110	my ($path, $origin, $load) = @_;
1918		2111
1919	$path = normalise $path, $origin && $origin->{path};	2112	$path = normalise $path, $origin && $origin->{path};
1920		2113
1921	if (my $map = $cf::MAP{$path}) {	2114	if (my $map = $cf::MAP{$path}) {
1922	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2115	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1923	}	2116	}
1924		2117
1925	undef $MAP_PREFETCH{$path};	2118	$MAP_PREFETCH{$path} \|= $load;
		2119
1926	$MAP_PREFETCHER \|\|= cf::async {	2120	$MAP_PREFETCHER \|\|= cf::async {
		2121	$Coro::current->{desc} = "map prefetcher";
		2122
1927	while (%MAP_PREFETCH) {	2123	while (%MAP_PREFETCH) {
1928	for my $path (keys %MAP_PREFETCH) {	2124	while (my ($k, $v) = each %MAP_PREFETCH) {
1929	if (my $map = find $path) {	2125	if (my $map = find $k) {
1930	$map->load;	2126	$map->load if $v;
1931	}	2127	}
1932		2128
1933	delete $MAP_PREFETCH{$path};	2129	delete $MAP_PREFETCH{$k};
1934	}	2130	}
1935	}	2131	}
1936	undef $MAP_PREFETCHER;	2132	undef $MAP_PREFETCHER;
1937	};	2133	};
1938	$MAP_PREFETCHER->prio (6);	2134	$MAP_PREFETCHER->prio (6);
…		…
1941	}	2137	}
1942		2138
1943	sub save {	2139	sub save {
1944	my ($self) = @_;	2140	my ($self) = @_;
1945		2141
1946	my $lock = cf::lock_acquire "map_data:" . $self->path;	2142	my $lock = cf::lock_acquire "map_data:$self->{path}";
1947		2143
1948	$self->{last_save} = $cf::RUNTIME;	2144	$self->{last_save} = $cf::RUNTIME;
1949		2145
1950	return unless $self->dirty;	2146	return unless $self->dirty;
1951		2147
…		…
1957	return if $self->{deny_save};	2153	return if $self->{deny_save};
1958		2154
1959	local $self->{last_access} = $self->last_access;#d#	2155	local $self->{last_access} = $self->last_access;#d#
1960		2156
1961	cf::async {	2157	cf::async {
		2158	$Coro::current->{desc} = "map player save";
1962	$_->contr->save for $self->players;	2159	$_->contr->save for $self->players;
1963	};	2160	};
1964		2161
1965	if ($uniq) {	2162	if ($uniq) {
1966	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2163	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1974	my ($self) = @_;	2171	my ($self) = @_;
1975		2172
1976	# save first because save cedes	2173	# save first because save cedes
1977	$self->save;	2174	$self->save;
1978		2175
1979	my $lock = cf::lock_acquire "map_data:" . $self->path;	2176	my $lock = cf::lock_acquire "map_data:$self->{path}";
1980		2177
1981	return if $self->players;	2178	return if $self->players;
1982	return if $self->in_memory != cf::MAP_IN_MEMORY;	2179	return if $self->in_memory != cf::MAP_IN_MEMORY;
1983	return if $self->{deny_save};	2180	return if $self->{deny_save};
1984		2181
		2182	$self->in_memory (cf::MAP_SWAPPED);
		2183
		2184	$self->deactivate;
		2185	$_->clear_links_to ($self) for values %cf::MAP;
1985	$self->clear;	2186	$self->clear;
1986	$self->in_memory (cf::MAP_SWAPPED);
1987	}	2187	}
1988		2188
1989	sub reset_at {	2189	sub reset_at {
1990	my ($self) = @_;	2190	my ($self) = @_;
1991		2191
…		…
2023	if $uniq;	2223	if $uniq;
2024	}	2224	}
2025		2225
2026	delete $cf::MAP{$self->path};	2226	delete $cf::MAP{$self->path};
2027		2227
		2228	$self->deactivate;
		2229	$_->clear_links_to ($self) for values %cf::MAP;
2028	$self->clear;	2230	$self->clear;
2029
2030	$_->clear_links_to ($self) for values %cf::MAP;
2031		2231
2032	$self->unlink_save;	2232	$self->unlink_save;
2033	$self->destroy;	2233	$self->destroy;
2034	}	2234	}
2035		2235
2036	my $nuke_counter = "aaaa";	2236	my $nuke_counter = "aaaa";
2037		2237
2038	sub nuke {	2238	sub nuke {
2039	my ($self) = @_;	2239	my ($self) = @_;
2040		2240
		2241	{
		2242	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2243
2041	delete $cf::MAP{$self->path};	2244	delete $cf::MAP{$self->path};
2042		2245
2043	$self->unlink_save;	2246	$self->unlink_save;
2044		2247
2045	bless $self, "cf::map";	2248	bless $self, "cf::map";
2046	delete $self->{deny_reset};	2249	delete $self->{deny_reset};
2047	$self->{deny_save} = 1;	2250	$self->{deny_save} = 1;
2048	$self->reset_timeout (1);	2251	$self->reset_timeout (1);
2049	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2252	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050		2253
2051	$cf::MAP{$self->path} = $self;	2254	$cf::MAP{$self->path} = $self;
		2255	}
2052		2256
2053	$self->reset; # polite request, might not happen	2257	$self->reset; # polite request, might not happen
2054	}	2258	}
2055		2259
2056	=item $maps = cf::map::tmp_maps	2260	=item $maps = cf::map::tmp_maps
…		…
2132		2336
2133	sub inv_recursive {	2337	sub inv_recursive {
2134	inv_recursive_ inv $_[0]	2338	inv_recursive_ inv $_[0]
2135	}	2339	}
2136		2340
		2341	=item $ref = $ob->ref
		2342
		2343	creates and returns a persistent reference to an objetc that can be stored as a string.
		2344
		2345	=item $ob = cf::object::deref ($refstring)
		2346
		2347	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2348	even if the object actually exists. May block.
		2349
		2350	=cut
		2351
		2352	sub deref {
		2353	my ($ref) = @_;
		2354
		2355	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2356	my ($uuid, $name) = ($1, $2);
		2357	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2358	or return;
		2359	$pl->ob->uuid eq $uuid
		2360	or return;
		2361
		2362	$pl->ob
		2363	} else {
		2364	warn "$ref: cannot resolve object reference\n";
		2365	undef
		2366	}
		2367	}
		2368
2137	package cf;	2369	package cf;
2138		2370
2139	=back	2371	=back
2140		2372
2141	=head3 cf::object::player	2373	=head3 cf::object::player
…		…
2163		2395
2164	} else {	2396	} else {
2165	my $pl = $self->contr;	2397	my $pl = $self->contr;
2166		2398
2167	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2399	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168	my $diag = $pl->{npc_dialog};	2400	my $dialog = $pl->{npc_dialog};
2169	$diag->{pl}->ext_reply (	2401	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170	$diag->{id},
2171	msgtype => "reply",
2172	msg => $diag->{pl}->expand_cfpod ($msg),
2173	add_topics => []
2174	);
2175		2402
2176	} else {	2403	} else {
2177	$msg = $npc->name . " says: $msg" if $npc;	2404	$msg = $npc->name . " says: $msg" if $npc;
2178	$self->message ($msg, $flags);	2405	$self->message ($msg, $flags);
2179	}	2406	}
2180	}	2407	}
		2408	}
		2409
		2410	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2411
		2412	=cut
		2413
		2414	sub cf::object::send_msg {
		2415	my $pl = shift->contr
		2416	or return;
		2417	$pl->send_msg (@_);
2181	}	2418	}
2182		2419
2183	=item $player_object->may ("access")	2420	=item $player_object->may ("access")
2184		2421
2185	Returns wether the given player is authorized to access resource "access"	2422	Returns wether the given player is authorized to access resource "access"
…		…
2264	# use -1 or undef as default coordinates, not 0, 0	2501	# use -1 or undef as default coordinates, not 0, 0
2265	($x, $y) = ($map->enter_x, $map->enter_y)	2502	($x, $y) = ($map->enter_x, $map->enter_y)
2266	if $x <=0 && $y <= 0;	2503	if $x <=0 && $y <= 0;
2267		2504
2268	$map->load;	2505	$map->load;
2269	$map->load_diag;	2506	$map->load_neighbours;
2270		2507
2271	return unless $self->contr->active;	2508	return unless $self->contr->active;
2272	$self->activate_recursive;	2509	$self->activate_recursive;
2273		2510
2274	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2511	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2294	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2531	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295		2532
2296	$self->enter_link;	2533	$self->enter_link;
2297		2534
2298	(async {	2535	(async {
		2536	$Coro::current->{desc} = "player::goto $path $x $y";
		2537
		2538	# *tag paths override both path and x\|y
		2539	if ($path =~ /^\(.)$/) {
		2540	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2541	my $ob = $obs[rand @obs];
		2542
		2543	# see if we actually can go there
		2544	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2545	$ob = $obs[rand @obs];
		2546	} else {
		2547	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2548	}
		2549	# else put us there anyways for now #d#
		2550
		2551	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2552	} else {
		2553	($path, $x, $y) = (undef, undef, undef);
		2554	}
		2555	}
		2556
2299	my $map = eval {	2557	my $map = eval {
2300	my $map = cf::map::find $path;	2558	my $map = defined $path ? cf::map::find $path : undef;
2301		2559
2302	if ($map) {	2560	if ($map) {
2303	$map = $map->customise_for ($self);	2561	$map = $map->customise_for ($self);
2304	$map = $check->($map) if $check && $map;	2562	$map = $check->($map) if $check && $map;
2305	} else {	2563	} else {
2306	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2564	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2307	}	2565	}
2308		2566
2309	$map	2567	$map
2310	};	2568	};
2311		2569
…		…
2401	# if exit is damned, update players death & WoR home-position	2659	# if exit is damned, update players death & WoR home-position
2402	$self->contr->savebed ($slaying, $hp, $sp)	2660	$self->contr->savebed ($slaying, $hp, $sp)
2403	if $exit->flag (FLAG_DAMNED);	2661	if $exit->flag (FLAG_DAMNED);
2404		2662
2405	(async {	2663	(async {
		2664	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2665
2406	$self->deactivate_recursive; # just to be sure	2666	$self->deactivate_recursive; # just to be sure
2407	unless (eval {	2667	unless (eval {
2408	$self->goto ($slaying, $hp, $sp);	2668	$self->goto ($slaying, $hp, $sp);
2409		2669
2410	1;	2670	1;
…		…
2445	the message, with C<log> being the default. If C<$color> is negative, suppress	2705	the message, with C<log> being the default. If C<$color> is negative, suppress
2446	the message unless the client supports the msg packet.	2706	the message unless the client supports the msg packet.
2447		2707
2448	=cut	2708	=cut
2449		2709
		2710	# non-persistent channels (usually the info channel)
		2711	our %CHANNEL = (
		2712	"c/identify" => {
		2713	id => "infobox",
		2714	title => "Identify",
		2715	reply => undef,
		2716	tooltip => "Items recently identified",
		2717	},
		2718	"c/examine" => {
		2719	id => "infobox",
		2720	title => "Examine",
		2721	reply => undef,
		2722	tooltip => "Signs and other items you examined",
		2723	},
		2724	"c/book" => {
		2725	id => "infobox",
		2726	title => "Book",
		2727	reply => undef,
		2728	tooltip => "The contents of a note or book",
		2729	},
		2730	"c/lookat" => {
		2731	id => "infobox",
		2732	title => "Look",
		2733	reply => undef,
		2734	tooltip => "What you saw there",
		2735	},
		2736	"c/who" => {
		2737	id => "infobox",
		2738	title => "Players",
		2739	reply => undef,
		2740	tooltip => "Shows players who are currently online",
		2741	},
		2742	"c/body" => {
		2743	id => "infobox",
		2744	title => "Body Parts",
		2745	reply => undef,
		2746	tooltip => "Shows which body parts you posess and are available",
		2747	},
		2748	"c/uptime" => {
		2749	id => "infobox",
		2750	title => "Uptime",
		2751	reply => undef,
		2752	tooltip => "How long the server has been running since last restart",
		2753	},
		2754	"c/mapinfo" => {
		2755	id => "infobox",
		2756	title => "Map Info",
		2757	reply => undef,
		2758	tooltip => "Information related to the maps",
		2759	},
		2760	);
		2761
2450	sub cf::client::send_msg {	2762	sub cf::client::send_msg {
2451	my ($self, $channel, $msg, $color, @extra) = @_;	2763	my ($self, $channel, $msg, $color, @extra) = @_;
2452		2764
2453	$msg = $self->pl->expand_cfpod ($msg);	2765	$msg = $self->pl->expand_cfpod ($msg);
2454		2766
2455	$color &= ~cf::NDI_UNIQUE; # just in case...	2767	$color &= cf::NDI_CLIENT_MASK; # just in case...
2456		2768
		2769	# check predefined channels, for the benefit of C
		2770	if ($CHANNEL{$channel}) {
		2771	$channel = $CHANNEL{$channel};
		2772
		2773	$self->ext_msg (channel_info => $channel)
		2774	if $self->can_msg;
		2775
		2776	$channel = $channel->{id};
		2777
2457	if (ref $channel) {	2778	} elsif (ref $channel) {
2458	# send meta info to client, if not yet sent	2779	# send meta info to client, if not yet sent
2459	unless (exists $self->{channel}{$channel->{id}}) {	2780	unless (exists $self->{channel}{$channel->{id}}) {
2460	$self->{channel}{$channel->{id}} = $channel;	2781	$self->{channel}{$channel->{id}} = $channel;
2461	$self->ext_event (channel_info => %$channel);	2782	$self->ext_msg (channel_info => $channel)
		2783	if $self->can_msg;
2462	}	2784	}
2463		2785
2464	$channel = $channel->{id};	2786	$channel = $channel->{id};
2465	}	2787	}
2466		2788
2467	return unless @extra \|\| length $msg;	2789	return unless @extra \|\| length $msg;
2468		2790
2469	if ($self->can_msg) {	2791	if ($self->can_msg) {
		2792	# default colour, mask it out
		2793	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2794	if $color & cf::NDI_DEF;
		2795
2470	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2796	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2797	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471	} else {	2798	} else {
2472	# replace some tags by gcfclient-compatible ones
2473	for ($msg) {
2474	1 while
2475	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480	}
2481
2482	if ($color >= 0) {	2799	if ($color >= 0) {
		2800	# replace some tags by gcfclient-compatible ones
		2801	for ($msg) {
		2802	1 while
		2803	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2804	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2805	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2806	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2807	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2808	}
		2809
		2810	$color &= cf::NDI_COLOR_MASK;
		2811
		2812	utf8::encode $msg;
		2813
2483	if (0 && $msg =~ /\[/) {	2814	if (0 && $msg =~ /\[/) {
		2815	# COMMAND/INFO
2484	$self->send_packet ("drawextinfo $color 4 0 $msg")	2816	$self->send_packet ("drawextinfo $color 10 8 $msg")
2485	} else {	2817	} else {
2486	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2818	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2487	$self->send_packet ("drawinfo $color $msg")	2819	$self->send_packet ("drawinfo $color $msg")
2488	}	2820	}
2489	}	2821	}
2490	}	2822	}
2491	}	2823	}
2492		2824
2493	=item $client->ext_event ($type, %msg)	2825	=item $client->ext_msg ($type, @msg)
2494		2826
2495	Sends an ext event to the client.	2827	Sends an ext event to the client.
2496		2828
2497	=cut	2829	=cut
2498		2830
2499	sub cf::client::ext_event($$%) {	2831	sub cf::client::ext_msg($$@) {
2500	my ($self, $type, %msg) = @_;	2832	my ($self, $type, @msg) = @_;
2501		2833
2502	return unless $self->extcmd;	2834	if ($self->extcmd == 2) {
2503		2835	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2836	} elsif ($self->extcmd == 1) { # TODO: remove
2504	$msg{msgtype} = "event_$type";	2837	push @msg, msgtype => "event_$type";
2505	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2838	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2839	}
		2840	}
		2841
		2842	=item $client->ext_reply ($msgid, @msg)
		2843
		2844	Sends an ext reply to the client.
		2845
		2846	=cut
		2847
		2848	sub cf::client::ext_reply($$@) {
		2849	my ($self, $id, @msg) = @_;
		2850
		2851	if ($self->extcmd == 2) {
		2852	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2853	} elsif ($self->extcmd == 1) {
		2854	#TODO: version 1, remove
		2855	unshift @msg, msgtype => "reply", msgid => $id;
		2856	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2857	}
2506	}	2858	}
2507		2859
2508	=item $success = $client->query ($flags, "text", \&cb)	2860	=item $success = $client->query ($flags, "text", \&cb)
2509		2861
2510	Queues a query to the client, calling the given callback with	2862	Queues a query to the client, calling the given callback with
…		…
2565	my ($ns, $buf) = @_;	2917	my ($ns, $buf) = @_;
2566		2918
2567	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2919	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568		2920
2569	if (ref $msg) {	2921	if (ref $msg) {
		2922	my ($type, $reply, @payload) =
		2923	"ARRAY" eq ref $msg
		2924	? @$msg
		2925	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2926
		2927	my @reply;
		2928
2570	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2929	if (my $cb = $EXTICMD{$type}) {
2571	if (my %reply = $cb->($ns, $msg)) {	2930	@reply = $cb->($ns, @payload);
2572	$reply{msgid} = $msg->{msgid};
2573	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574	}
2575	}	2931	}
		2932
		2933	$ns->ext_reply ($reply, @reply)
		2934	if $reply;
		2935
2576	} else {	2936	} else {
2577	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2937	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578	}	2938	}
2579		2939
2580	cf::override;	2940	cf::override;
…		…
2627	our $safe = new Safe "safe";	2987	our $safe = new Safe "safe";
2628	our $safe_hole = new Safe::Hole;	2988	our $safe_hole = new Safe::Hole;
2629		2989
2630	$SIG{FPE} = 'IGNORE';	2990	$SIG{FPE} = 'IGNORE';
2631		2991
2632	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2992	$safe->permit_only (Opcode::opset qw(
		2993	:base_core :base_mem :base_orig :base_math
		2994	grepstart grepwhile mapstart mapwhile
		2995	sort time
		2996	));
2633		2997
2634	# here we export the classes and methods available to script code	2998	# here we export the classes and methods available to script code
2635		2999
2636	=pod	3000	=pod
2637		3001
2638	The following functions and methods are available within a safe environment:	3002	The following functions and methods are available within a safe environment:
2639		3003
2640	cf::object	3004	cf::object
2641	contr pay_amount pay_player map x y force_find force_add	3005	contr pay_amount pay_player map x y force_find force_add destroy
2642	insert remove	3006	insert remove name archname title slaying race decrease_ob_nr
2643		3007
2644	cf::object::player	3008	cf::object::player
2645	player	3009	player
2646		3010
2647	cf::player	3011	cf::player
…		…
2652		3016
2653	=cut	3017	=cut
2654		3018
2655	for (	3019	for (
2656	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3020	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3021	insert remove inv name archname title slaying race
2657	insert remove)],	3022	decrease_ob_nr destroy)],
2658	["cf::object::player" => qw(player)],	3023	["cf::object::player" => qw(player)],
2659	["cf::player" => qw(peaceful)],	3024	["cf::player" => qw(peaceful)],
2660	["cf::map" => qw(trigger)],	3025	["cf::map" => qw(trigger)],
2661	) {	3026	) {
2662	no strict 'refs';	3027	no strict 'refs';
…		…
2738	# the server's init and main functions	3103	# the server's init and main functions
2739		3104
2740	sub load_facedata($) {	3105	sub load_facedata($) {
2741	my ($path) = @_;	3106	my ($path) = @_;
2742		3107
		3108	# HACK to clear player env face cache, we need some signal framework
		3109	# for this (global event?)
		3110	%ext::player_env::MUSIC_FACE_CACHE = ();
		3111
		3112	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3113
2743	warn "loading facedata from $path\n";	3114	warn "loading facedata from $path\n";
2744		3115
2745	my $facedata;	3116	my $facedata;
2746	0 < aio_load $path, $facedata	3117	0 < aio_load $path, $facedata
2747	or die "$path: $!";	3118	or die "$path: $!";
2748		3119
2749	$facedata = Coro::Storable::thaw $facedata;	3120	$facedata = Coro::Storable::thaw $facedata;
2750		3121
2751	$facedata->{version} == 2	3122	$facedata->{version} == 2
2752	or cf::cleanup "$path: version mismatch, cannot proceed.";	3123	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3124
		3125	# patch in the exptable
		3126	$facedata->{resource}{"res/exp_table"} = {
		3127	type => FT_RSRC,
		3128	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3129	};
		3130	cf::cede_to_tick;
2753		3131
2754	{	3132	{
2755	my $faces = $facedata->{faceinfo};	3133	my $faces = $facedata->{faceinfo};
2756		3134
2757	while (my ($face, $info) = each %$faces) {	3135	while (my ($face, $info) = each %$faces) {
2758	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3136	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2759	cf::face::set_visibility $idx, $info->{visibility};	3137	cf::face::set_visibility $idx, $info->{visibility};
2760	cf::face::set_magicmap $idx, $info->{magicmap};	3138	cf::face::set_magicmap $idx, $info->{magicmap};
2761	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3139	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3140	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763		3141
2764	cf::cede_to_tick;	3142	cf::cede_to_tick;
2765	}	3143	}
2766		3144
2767	while (my ($face, $info) = each %$faces) {	3145	while (my ($face, $info) = each %$faces) {
…		…
2792		3170
2793	{	3171	{
2794	# TODO: for gcfclient pleasure, we should give resources	3172	# TODO: for gcfclient pleasure, we should give resources
2795	# that gcfclient doesn't grok a >10000 face index.	3173	# that gcfclient doesn't grok a >10000 face index.
2796	my $res = $facedata->{resource};	3174	my $res = $facedata->{resource};
2797	my $enc = JSON::XS->new->utf8->canonical;	3175
		3176	my $soundconf = delete $res->{"res/sound.conf"};
2798		3177
2799	while (my ($name, $info) = each %$res) {	3178	while (my ($name, $info) = each %$res) {
2800	my $meta = $enc->encode ({
2801	name => $name,
2802	type => $info->{type},
2803	copyright => $info->{copyright}, #TODO#
2804	});
2805
2806	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3179	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3180	my $data;
2807		3181
2808	if ($name =~ /\.jpg$/) {	3182	if ($info->{type} & 1) {
2809	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3183	# prepend meta info
2810	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3184
		3185	my $meta = $enc->encode ({
		3186	name => $name,
		3187	%{ $info->{meta} \|\| {} },
		3188	});
		3189
		3190	$data = pack "(w/a)", $meta, $info->{data};
2811	} else {	3191	} else {
2812	my $data = pack "(w/a)", $meta, $info->{data};	3192	$data = $info->{data};
2813	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815	cf::face::set_type $idx, 1;
2816	cf::face::set_data $idx, 0, $data, $chk;
2817	}	3193	}
2818		3194
		3195	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3196	cf::face::set_type $idx, $info->{type};
		3197
2819	cf::cede_to_tick;	3198	cf::cede_to_tick;
2820	}	3199	}
		3200
		3201	if ($soundconf) {
		3202	$soundconf = $enc->decode (delete $soundconf->{data});
		3203
		3204	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3205	my $sound = $soundconf->{compat}[$_]
		3206	or next;
		3207
		3208	my $face = cf::face::find "sound/$sound->[1]";
		3209	cf::sound::set $sound->[0] => $face;
		3210	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3211	}
		3212
		3213	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3214	my $face = cf::face::find "sound/$v";
		3215	cf::sound::set $k => $face;
		3216	}
		3217	}
2821	}	3218	}
2822		3219
2823	1	3220	1
2824	}	3221	}
2825		3222
		3223	register_exticmd fx_want => sub {
		3224	my ($ns, $want) = @_;
		3225
		3226	while (my ($k, $v) = each %$want) {
		3227	$ns->fx_want ($k, $v);
		3228	}
		3229	};
		3230
2826	sub reload_regions {	3231	sub reload_regions {
		3232	# HACK to clear player env face cache, we need some signal framework
		3233	# for this (global event?)
		3234	%ext::player_env::MUSIC_FACE_CACHE = ();
		3235
2827	load_resource_file "$MAPDIR/regions"	3236	load_resource_file "$MAPDIR/regions"
2828	or die "unable to load regions file\n";	3237	or die "unable to load regions file\n";
2829		3238
2830	for (cf::region::list) {	3239	for (cf::region::list) {
2831	$_->{match} = qr/$_->{match}/	3240	$_->{match} = qr/$_->{match}/
…		…
2867		3276
2868	sub init {	3277	sub init {
2869	reload_resources;	3278	reload_resources;
2870	}	3279	}
2871		3280
2872	sub cfg_load {	3281	sub reload_config {
2873	open my $fh, "<:utf8", "$CONFDIR/config"	3282	open my $fh, "<:utf8", "$CONFDIR/config"
2874	or return;	3283	or return;
2875		3284
2876	local $/;	3285	local $/;
2877	*CFG = YAML::Syck::Load <$fh>;	3286	*CFG = YAML::Syck::Load <$fh>;
…		…
2893	sub main {	3302	sub main {
2894	# we must not ever block the main coroutine	3303	# we must not ever block the main coroutine
2895	local $Coro::idle = sub {	3304	local $Coro::idle = sub {
2896	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3305	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897	(async {	3306	(async {
		3307	$Coro::current->{desc} = "IDLE BUG HANDLER";
2898	Event::one_event;	3308	Event::one_event;
2899	})->prio (Coro::PRIO_MAX);	3309	})->prio (Coro::PRIO_MAX);
2900	};	3310	};
2901		3311
2902	cfg_load;	3312	reload_config;
2903	db_init;	3313	db_init;
2904	load_extensions;	3314	load_extensions;
2905		3315
2906	$TICK_WATCHER->start;	3316	$TICK_WATCHER->start;
2907	Event::loop;	3317	Event::loop;
…		…
2974	# and maps saved/destroyed asynchronously.	3384	# and maps saved/destroyed asynchronously.
2975	warn "begin emergency player save\n";	3385	warn "begin emergency player save\n";
2976	for my $login (keys %cf::PLAYER) {	3386	for my $login (keys %cf::PLAYER) {
2977	my $pl = $cf::PLAYER{$login} or next;	3387	my $pl = $cf::PLAYER{$login} or next;
2978	$pl->valid or next;	3388	$pl->valid or next;
		3389	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979	$pl->save;	3390	$pl->save;
2980	}	3391	}
2981	warn "end emergency player save\n";	3392	warn "end emergency player save\n";
2982		3393
2983	warn "begin emergency map save\n";	3394	warn "begin emergency map save\n";
…		…
3031		3442
3032	warn "flushing outstanding aio requests";	3443	warn "flushing outstanding aio requests";
3033	for (;;) {	3444	for (;;) {
3034	BDB::flush;	3445	BDB::flush;
3035	IO::AIO::flush;	3446	IO::AIO::flush;
3036	Coro::cede;	3447	Coro::cede_notself;
3037	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3448	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3038	warn "iterate...";	3449	warn "iterate...";
3039	}	3450	}
3040		3451
3041	++$RELOAD;	3452	++$RELOAD;
…		…
3100	warn "reloading cf.pm";	3511	warn "reloading cf.pm";
3101	require cf;	3512	require cf;
3102	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3513	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103		3514
3104	warn "loading config and database again";	3515	warn "loading config and database again";
3105	cf::cfg_load;	3516	cf::reload_config;
3106		3517
3107	warn "loading extensions";	3518	warn "loading extensions";
3108	cf::load_extensions;	3519	cf::load_extensions;
3109		3520
3110	warn "reattaching attachments to objects/players";	3521	warn "reattaching attachments to objects/players";
…		…
3146	register_command "reload" => sub {	3557	register_command "reload" => sub {
3147	my ($who, $arg) = @_;	3558	my ($who, $arg) = @_;
3148		3559
3149	if ($who->flag (FLAG_WIZ)) {	3560	if ($who->flag (FLAG_WIZ)) {
3150	$who->message ("reloading server.");	3561	$who->message ("reloading server.");
		3562	async {
		3563	$Coro::current->{desc} = "perl_reload";
3151	async { reload_perl };	3564	reload_perl;
		3565	};
3152	}	3566	}
3153	};	3567	};
3154		3568
3155	unshift @INC, $LIBDIR;	3569	unshift @INC, $LIBDIR;
3156		3570
…		…
3175	my $signal = new Coro::Signal;	3589	my $signal = new Coro::Signal;
3176	push @WAIT_FOR_TICK_BEGIN, $signal;	3590	push @WAIT_FOR_TICK_BEGIN, $signal;
3177	$signal->wait;	3591	$signal->wait;
3178	}	3592	}
3179		3593
3180	my $min = 1e6;#d#
3181	my $avg = 10;
3182	$TICK_WATCHER = Event->timer (	3594	$TICK_WATCHER = Event->timer (
3183	reentrant => 0,	3595	reentrant => 0,
3184	parked => 1,	3596	parked => 1,
3185	prio => 0,	3597	prio => 0,
3186	at => $NEXT_TICK \|\| $TICK,	3598	at => $NEXT_TICK \|\| $TICK,
…		…
3194		3606
3195	$NOW = $tick_start = Event::time;	3607	$NOW = $tick_start = Event::time;
3196		3608
3197	cf::server_tick; # one server iteration	3609	cf::server_tick; # one server iteration
3198		3610
3199	0 && sync_job {#d#
3200	for(1..10) {
3201	my $t = Event::time;
3202	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203	or die;
3204
3205	$map->width (50);
3206	$map->height (50);
3207	$map->alloc;
3208	$map->_load_objects ("/tmp/x.map", 1);
3209	my $t = Event::time - $t;
3210
3211	#next unless $t < 0.0013;#d#
3212	if ($t < $min) {
3213	$min = $t;
3214	}
3215	$avg = $avg * 0.99 + $t * 0.01;
3216	}
3217	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218	exit 0;
3219	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220	};
3221
3222	$RUNTIME += $TICK;	3611	$RUNTIME += $TICK;
3223	$NEXT_TICK += $TICK;	3612	$NEXT_TICK += $TICK;
3224		3613
3225	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3614	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226	$NEXT_RUNTIME_WRITE = $NOW + 10;	3615	$NEXT_RUNTIME_WRITE = $NOW + 10;
3227	Coro::async_pool {	3616	Coro::async_pool {
		3617	$Coro::current->{desc} = "runtime saver";
3228	write_runtime	3618	write_runtime
3229	or warn "ERROR: unable to write runtime file: $!";	3619	or warn "ERROR: unable to write runtime file: $!";
3230	};	3620	};
3231	}	3621	}
3232		3622
3233	# my $AFTER = Event::time;
3234	# warn $AFTER - $NOW;#d#
3235
3236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3623	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237	$sig->send;	3624	$sig->send;
3238	}	3625	}
3239	while (my $sig = shift @WAIT_FOR_TICK) {	3626	while (my $sig = shift @WAIT_FOR_TICK) {
3240	$sig->send;	3627	$sig->send;
…		…
3250		3637
3251	$LOAD = ($NOW - $tick_start) / $TICK;	3638	$LOAD = ($NOW - $tick_start) / $TICK;
3252	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3639	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253		3640
3254	_post_tick;	3641	_post_tick;
3255
3256
3257	},	3642	},
3258	);	3643	);
3259		3644
3260	{	3645	{
		3646	BDB::min_parallel 8;
3261	BDB::max_poll_time $TICK * 0.1;	3647	BDB::max_poll_time $TICK * 0.1;
3262	$BDB_POLL_WATCHER = Event->io (	3648	$BDB_POLL_WATCHER = Event->io (
3263	reentrant => 0,	3649	reentrant => 0,
3264	fd => BDB::poll_fileno,	3650	fd => BDB::poll_fileno,
3265	poll => 'r',	3651	poll => 'r',
3266	prio => 0,	3652	prio => 0,
3267	data => WF_AUTOCANCEL,	3653	data => WF_AUTOCANCEL,
3268	cb => \&BDB::poll_cb,	3654	cb => \&BDB::poll_cb,
3269	);	3655	);
3270	BDB::min_parallel 8;
3271		3656
3272	BDB::set_sync_prepare {	3657	BDB::set_sync_prepare {
3273	my $status;	3658	my $status;
3274	my $current = $Coro::current;	3659	my $current = $Coro::current;
3275	(	3660	(
…		…
3284	)	3669	)
3285	};	3670	};
3286		3671
3287	unless ($DB_ENV) {	3672	unless ($DB_ENV) {
3288	$DB_ENV = BDB::db_env_create;	3673	$DB_ENV = BDB::db_env_create;
		3674	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3675	\| BDB::LOG_AUTOREMOVE, 1);
		3676	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3677	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289		3678
3290	cf::sync_job {	3679	cf::sync_job {
3291	eval {	3680	eval {
3292	BDB::db_env_open	3681	BDB::db_env_open
3293	$DB_ENV,	3682	$DB_ENV,
…		…
3295	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3684	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3296	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3685	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3297	0666;	3686	0666;
3298		3687
3299	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3688	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3302	$DB_ENV->set_lk_detect;
3303	};	3689	};
3304		3690
3305	cf::cleanup "db_env_open(db): $@" if $@;	3691	cf::cleanup "db_env_open(db): $@" if $@;
3306	};	3692	};
3307	}	3693	}
		3694
		3695	$BDB_DEADLOCK_WATCHER = Event->timer (
		3696	after => 3,
		3697	interval => 1,
		3698	hard => 1,
		3699	prio => 0,
		3700	data => WF_AUTOCANCEL,
		3701	cb => sub {
		3702	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3703	},
		3704	);
		3705	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3706	after => 11,
		3707	interval => 60,
		3708	hard => 1,
		3709	prio => 0,
		3710	data => WF_AUTOCANCEL,
		3711	cb => sub {
		3712	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3713	},
		3714	);
		3715	$BDB_TRICKLE_WATCHER = Event->timer (
		3716	after => 5,
		3717	interval => 10,
		3718	hard => 1,
		3719	prio => 0,
		3720	data => WF_AUTOCANCEL,
		3721	cb => sub {
		3722	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3723	},
		3724	);
3308	}	3725	}
3309		3726
3310	{	3727	{
3311	IO::AIO::min_parallel 8;	3728	IO::AIO::min_parallel 8;
3312		3729
…		…
3315	$AIO_POLL_WATCHER = Event->io (	3732	$AIO_POLL_WATCHER = Event->io (
3316	reentrant => 0,	3733	reentrant => 0,
3317	data => WF_AUTOCANCEL,	3734	data => WF_AUTOCANCEL,
3318	fd => IO::AIO::poll_fileno,	3735	fd => IO::AIO::poll_fileno,
3319	poll => 'r',	3736	poll => 'r',
3320	prio => 6,	3737	prio => 0,
3321	cb => \&IO::AIO::poll_cb,	3738	cb => \&IO::AIO::poll_cb,
3322	);	3739	);
3323	}	3740	}
3324		3741
3325	my $_log_backtrace;	3742	my $_log_backtrace;
…		…
3331		3748
3332	# limit the # of concurrent backtraces	3749	# limit the # of concurrent backtraces
3333	if ($_log_backtrace < 2) {	3750	if ($_log_backtrace < 2) {
3334	++$_log_backtrace;	3751	++$_log_backtrace;
3335	async {	3752	async {
		3753	$Coro::current->{desc} = "abt $msg";
		3754
3336	my @bt = fork_call {	3755	my @bt = fork_call {
3337	@addr = map { sprintf "%x", $_ } @addr;	3756	@addr = map { sprintf "%x", $_ } @addr;
3338	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3757	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3758	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3340	or die "addr2line: $!";	3759	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC vs. Revision 1.391 by root, Fri Oct 26 04:22:05 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 2007 UTC