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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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::blocking_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;
1042	$av = eval { (Storable::thaw $av)->{objs} };
1043	}
1044		1126
		1127	my $st = eval { Coro::Storable::thaw $av }
		1128	\|\| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1129	$av = $st->{objs};
		1130	}
		1131
		1132	utf8::decode (my $decname = $filename);
1045	warn sprintf "loading %s (%d)\n",	1133	warn sprintf "loading %s (%d,%d)\n",
1046	$filename, length $data, scalar @{$av \|\| []};	1134	$decname, length $data, scalar @{$av \|\| []};
		1135
1047	return ($data, $av);	1136	($data, $av)
1048	}	1137	}
1049		1138
1050	=head2 COMMAND CALLBACKS	1139	=head2 COMMAND CALLBACKS
1051		1140
1052	=over 4	1141	=over 4
…		…
1125	my ($pl, $buf) = @_;	1214	my ($pl, $buf) = @_;
1126		1215
1127	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1216	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128		1217
1129	if (ref $msg) {	1218	if (ref $msg) {
		1219	my ($type, $reply, @payload) =
		1220	"ARRAY" eq ref $msg
		1221	? @$msg
		1222	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1223
		1224	my @reply;
		1225
1130	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1226	if (my $cb = $EXTCMD{$type}) {
1131	if (my %reply = $cb->($pl, $msg)) {	1227	@reply = $cb->($pl, @payload);
1132	$pl->ext_reply ($msg->{msgid}, %reply);
1133	}
1134	}	1228	}
		1229
		1230	$pl->ext_reply ($reply, @reply)
		1231	if $reply;
		1232
1135	} else {	1233	} else {
1136	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1234	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137	}	1235	}
1138		1236
1139	cf::override;	1237	cf::override;
…		…
1229		1327
1230	=head3 cf::player	1328	=head3 cf::player
1231		1329
1232	=over 4	1330	=over 4
1233		1331
		1332	=item cf::player::num_playing
		1333
		1334	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1335
		1336	=cut
		1337
		1338	sub num_playing {
		1339	scalar grep
		1340	$_->ob->map
		1341	&& !$_->hidden
		1342	&& !$_->ob->flag (cf::FLAG_WIZ),
		1343	cf::player::list
		1344	}
		1345
1234	=item cf::player::find $login	1346	=item cf::player::find $login
1235		1347
1236	Returns the given player object, loading it if necessary (might block).	1348	Returns the given player object, loading it if necessary (might block).
1237		1349
1238	=cut	1350	=cut
…		…
1273	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1385	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1386	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1387	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276	aio_unlink +(playerdir $login) . "/$login.pl";	1388	aio_unlink +(playerdir $login) . "/$login.pl";
1277		1389
1278	my $pl = load_pl path $login	1390	my $f = new_from_file cf::object::thawer path $login
1279	or return;	1391	or return;
		1392
		1393	my $pl = cf::player::load_pl $f
		1394	or return;
		1395	local $cf::PLAYER_LOADING{$login} = $pl;
		1396	$f->resolve_delayed_derefs;
1280	$cf::PLAYER{$login} = $pl	1397	$cf::PLAYER{$login} = $pl
1281	}	1398	}
1282	}	1399	}
1283	}	1400	}
1284		1401
…		…
1294		1411
1295	aio_mkdir playerdir $pl, 0770;	1412	aio_mkdir playerdir $pl, 0770;
1296	$pl->{last_save} = $cf::RUNTIME;	1413	$pl->{last_save} = $cf::RUNTIME;
1297		1414
1298	$pl->save_pl ($path);	1415	$pl->save_pl ($path);
1299	Coro::cede;	1416	cf::cede_to_tick;
1300	}	1417	}
1301		1418
1302	sub new($) {	1419	sub new($) {
1303	my ($login) = @_;	1420	my ($login) = @_;
1304		1421
…		…
1308	$self->{deny_save} = 1;	1425	$self->{deny_save} = 1;
1309		1426
1310	$cf::PLAYER{$login} = $self;	1427	$cf::PLAYER{$login} = $self;
1311		1428
1312	$self	1429	$self
		1430	}
		1431
		1432	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1433
		1434	=cut
		1435
		1436	sub send_msg {
		1437	my $ns = shift->ns
		1438	or return;
		1439	$ns->send_msg (@_);
1313	}	1440	}
1314		1441
1315	=item $pl->quit_character	1442	=item $pl->quit_character
1316		1443
1317	Nukes the player without looking back. If logged in, the connection will	1444	Nukes the player without looking back. If logged in, the connection will
…		…
1372	or return [];	1499	or return [];
1373		1500
1374	my @logins;	1501	my @logins;
1375		1502
1376	for my $login (@$dirs) {	1503	for my $login (@$dirs) {
		1504	my $path = path $login;
		1505
		1506	# a .pst is a dead give-away for a valid player
		1507	unless (-e "$path.pst") {
1377	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1508	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378	aio_read $fh, 0, 512, my $buf, 0 or next;	1509	aio_read $fh, 0, 512, my $buf, 0 or next;
1379	$buf !~ /^password -------------$/m or next; # official not-valid tag	1510	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1511	}
1380		1512
1381	utf8::decode $login;	1513	utf8::decode $login;
1382	push @logins, $login;	1514	push @logins, $login;
1383	}	1515	}
1384		1516
…		…
1422	sub expand_cfpod {	1554	sub expand_cfpod {
1423	((my $self), (local $_)) = @_;	1555	((my $self), (local $_)) = @_;
1424		1556
1425	# escape & and <	1557	# escape & and <
1426	s/&/&/g;	1558	s/&/&/g;
1427	s/(?<![BIUGH])</</g;	1559	s/(?<![BIUGHT])</</g;
1428		1560
1429	# this is buggy, it needs to properly take care of nested <'s	1561	# this is buggy, it needs to properly take care of nested <'s
1430		1562
1431	1 while	1563	1 while
1432	# replace B<>, I<>, U<> etc.	1564	# replace B<>, I<>, U<> etc.
1433	s/B<([^\>]*)>/<b>$1<\/b>/	1565	s/B<([^\>]*)>/<b>$1<\/b>/
1434	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1566	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1435	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1567	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1568	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436	# replace G<male\|female> tags	1569	# replace G<male\|female> tags
1437	\|\| s{G<([^>\|])\\|([^>])>}{	1570	\|\| s{G<([^>\|])\\|([^>])>}{
1438	$self->gender ? $2 : $1	1571	$self->gender ? $2 : $1
1439	}ge	1572	}ge
1440	# replace H<hint text>	1573	# replace H<hint text>
…		…
1461	sub hintmode {	1594	sub hintmode {
1462	$_[0]{hintmode} = $_[1] if @_ > 1;	1595	$_[0]{hintmode} = $_[1] if @_ > 1;
1463	$_[0]{hintmode}	1596	$_[0]{hintmode}
1464	}	1597	}
1465		1598
1466	=item $player->ext_reply ($msgid, %msg)	1599	=item $player->ext_reply ($msgid, @msg)
1467		1600
1468	Sends an ext reply to the player.	1601	Sends an ext reply to the player.
1469		1602
1470	=cut	1603	=cut
1471		1604
1472	sub ext_reply($$%) {	1605	sub ext_reply($$@) {
1473	my ($self, $id, %msg) = @_;	1606	my ($self, $id, @msg) = @_;
1474		1607
1475	$msg{msgid} = $id;	1608	$self->ns->ext_reply ($id, @msg)
1476	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477	}	1609	}
1478		1610
1479	=item $player->ext_event ($type, %msg)	1611	=item $player->ext_msg ($type, @msg)
1480		1612
1481	Sends an ext event to the client.	1613	Sends an ext event to the client.
1482		1614
1483	=cut	1615	=cut
1484		1616
1485	sub ext_event($$%) {	1617	sub ext_msg($$@) {
1486	my ($self, $type, %msg) = @_;	1618	my ($self, $type, @msg) = @_;
1487		1619
1488	$self->ns->ext_event ($type, %msg);	1620	$self->ns->ext_msg ($type, @msg);
1489	}	1621	}
1490		1622
1491	=head3 cf::region	1623	=head3 cf::region
1492		1624
1493	=over 4	1625	=over 4
…		…
1709		1841
1710	sub load_header_from($) {	1842	sub load_header_from($) {
1711	my ($self, $path) = @_;	1843	my ($self, $path) = @_;
1712		1844
1713	utf8::encode $path;	1845	utf8::encode $path;
1714	#aio_open $path, O_RDONLY, 0	1846	my $f = new_from_file cf::object::thawer $path
1715	# or return;
1716
1717	$self->_load_header ($path)
1718	or return;	1847	or return;
		1848
		1849	$self->_load_header ($f)
		1850	or return;
		1851
		1852	local $MAP_LOADING{$self->{path}} = $self;
		1853	$f->resolve_delayed_derefs;
1719		1854
1720	$self->{load_path} = $path;	1855	$self->{load_path} = $path;
1721		1856
1722	1	1857	1
1723	}	1858	}
…		…
1777	sub find {	1912	sub find {
1778	my ($path, $origin) = @_;	1913	my ($path, $origin) = @_;
1779		1914
1780	$path = normalise $path, $origin && $origin->path;	1915	$path = normalise $path, $origin && $origin->path;
1781		1916
		1917	cf::lock_wait "map_data:$path";#d#remove
1782	cf::lock_wait "map_find:$path";	1918	cf::lock_wait "map_find:$path";
1783		1919
1784	$cf::MAP{$path} \|\| do {	1920	$cf::MAP{$path} \|\| do {
1785	my $guard = cf::lock_acquire "map_find:$path";	1921	my $guard1 = cf::lock_acquire "map_find:$path";
		1922	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1923
1786	my $map = new_from_path cf::map $path	1924	my $map = new_from_path cf::map $path
1787	or return;	1925	or return;
1788		1926
1789	$map->{last_save} = $cf::RUNTIME;	1927	$map->{last_save} = $cf::RUNTIME;
1790		1928
…		…
1792	or return;	1930	or return;
1793		1931
1794	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1932	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795	# doing this can freeze the server in a sync job, obviously	1933	# doing this can freeze the server in a sync job, obviously
1796	#$cf::WAIT_FOR_TICK->wait;	1934	#$cf::WAIT_FOR_TICK->wait;
		1935	undef $guard1;
		1936	undef $guard2;
1797	$map->reset;	1937	$map->reset;
1798	undef $guard;
1799	return find $path;	1938	return find $path;
1800	}	1939	}
1801		1940
1802	$cf::MAP{$path} = $map	1941	$cf::MAP{$path} = $map
1803	}	1942	}
…		…
1812	local $self->{deny_reset} = 1; # loading can take a long time	1951	local $self->{deny_reset} = 1; # loading can take a long time
1813		1952
1814	my $path = $self->{path};	1953	my $path = $self->{path};
1815		1954
1816	{	1955	{
1817	my $guard = cf::lock_acquire "map_load:$path";	1956	my $guard = cf::lock_acquire "map_data:$path";
1818		1957
		1958	return unless $self->valid;
1819	return if $self->in_memory != cf::MAP_SWAPPED;	1959	return unless $self->in_memory == cf::MAP_SWAPPED;
1820		1960
1821	$self->in_memory (cf::MAP_LOADING);	1961	$self->in_memory (cf::MAP_LOADING);
1822		1962
1823	$self->alloc;	1963	$self->alloc;
1824		1964
1825	$self->pre_load;	1965	$self->pre_load;
1826	Coro::cede;	1966	cf::cede_to_tick;
1827		1967
		1968	my $f = new_from_file cf::object::thawer $self->{load_path};
		1969	$f->skip_block;
1828	$self->_load_objects ($self->{load_path}, 1)	1970	$self->_load_objects ($f)
1829	or return;	1971	or return;
1830		1972
1831	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1973	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832	if delete $self->{load_original};	1974	if delete $self->{load_original};
1833		1975
1834	if (my $uniq = $self->uniq_path) {	1976	if (my $uniq = $self->uniq_path) {
1835	utf8::encode $uniq;	1977	utf8::encode $uniq;
1836	if (aio_open $uniq, O_RDONLY, 0) {	1978	unless (aio_stat $uniq) {
		1979	if (my $f = new_from_file cf::object::thawer $uniq) {
1837	$self->clear_unique_items;	1980	$self->clear_unique_items;
1838	$self->_load_objects ($uniq, 0);	1981	$self->_load_objects ($f);
		1982	$f->resolve_delayed_derefs;
		1983	}
1839	}	1984	}
1840	}	1985	}
1841		1986
1842	Coro::cede;	1987	$f->resolve_delayed_derefs;
		1988
		1989	cf::cede_to_tick;
1843	# now do the right thing for maps	1990	# now do the right thing for maps
1844	$self->link_multipart_objects;	1991	$self->link_multipart_objects;
1845	$self->difficulty ($self->estimate_difficulty)	1992	$self->difficulty ($self->estimate_difficulty)
1846	unless $self->difficulty;	1993	unless $self->difficulty;
1847	Coro::cede;	1994	cf::cede_to_tick;
1848		1995
1849	unless ($self->{deny_activate}) {	1996	unless ($self->{deny_activate}) {
1850	$self->decay_objects;	1997	$self->decay_objects;
1851	$self->fix_auto_apply;	1998	$self->fix_auto_apply;
1852	$self->update_buttons;	1999	$self->update_buttons;
1853	Coro::cede;	2000	cf::cede_to_tick;
1854	$self->set_darkness_map;	2001	$self->set_darkness_map;
1855	Coro::cede;	2002	cf::cede_to_tick;
1856	$self->activate;	2003	$self->activate;
1857	}	2004	}
		2005
		2006	$self->{last_save} = $cf::RUNTIME;
		2007	$self->last_access ($cf::RUNTIME);
1858		2008
1859	$self->in_memory (cf::MAP_IN_MEMORY);	2009	$self->in_memory (cf::MAP_IN_MEMORY);
1860	}	2010	}
1861		2011
1862	$self->post_load;	2012	$self->post_load;
…		…
1873		2023
1874	$self	2024	$self
1875	}	2025	}
1876		2026
1877	# find and load all maps in the 3x3 area around a map	2027	# find and load all maps in the 3x3 area around a map
1878	sub load_diag {	2028	sub load_neighbours {
1879	my ($map) = @_;	2029	my ($map) = @_;
1880		2030
1881	my @diag; # diagonal neighbours	2031	my @neigh; # diagonal neighbours
1882		2032
1883	for (0 .. 3) {	2033	for (0 .. 3) {
1884	my $neigh = $map->tile_path ($_)	2034	my $neigh = $map->tile_path ($_)
1885	or next;	2035	or next;
1886	$neigh = find $neigh, $map	2036	$neigh = find $neigh, $map
1887	or next;	2037	or next;
1888	$neigh->load;	2038	$neigh->load;
1889		2039
		2040	push @neigh,
1890	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2041	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1891	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2042	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1892	}	2043	}
1893		2044
1894	for (@diag) {	2045	for (grep defined $_->[0], @neigh) {
		2046	my ($path, $origin) = @$_;
1895	my $neigh = find @$_	2047	my $neigh = find $path, $origin
1896	or next;	2048	or next;
1897	$neigh->load;	2049	$neigh->load;
1898	}	2050	}
1899	}	2051	}
1900		2052
…		…
1905	}	2057	}
1906		2058
1907	sub do_load_sync {	2059	sub do_load_sync {
1908	my ($map) = @_;	2060	my ($map) = @_;
1909		2061
		2062	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2063	if $Coro::current == $Coro::main;
		2064
1910	cf::sync_job { $map->load };	2065	cf::sync_job { $map->load };
1911	}	2066	}
1912		2067
1913	our %MAP_PREFETCH;	2068	our %MAP_PREFETCH;
1914	our $MAP_PREFETCHER = undef;	2069	our $MAP_PREFETCHER = undef;
1915		2070
1916	sub find_async {	2071	sub find_async {
1917	my ($path, $origin) = @_;	2072	my ($path, $origin, $load) = @_;
1918		2073
1919	$path = normalise $path, $origin && $origin->{path};	2074	$path = normalise $path, $origin && $origin->{path};
1920		2075
1921	if (my $map = $cf::MAP{$path}) {	2076	if (my $map = $cf::MAP{$path}) {
1922	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2077	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1923	}	2078	}
1924		2079
1925	undef $MAP_PREFETCH{$path};	2080	$MAP_PREFETCH{$path} \|= $load;
		2081
1926	$MAP_PREFETCHER \|\|= cf::async {	2082	$MAP_PREFETCHER \|\|= cf::async {
		2083	$Coro::current->{desc} = "map prefetcher";
		2084
1927	while (%MAP_PREFETCH) {	2085	while (%MAP_PREFETCH) {
1928	for my $path (keys %MAP_PREFETCH) {	2086	while (my ($k, $v) = each %MAP_PREFETCH) {
1929	if (my $map = find $path) {	2087	if (my $map = find $k) {
1930	$map->load;	2088	$map->load if $v;
1931	}	2089	}
1932		2090
1933	delete $MAP_PREFETCH{$path};	2091	delete $MAP_PREFETCH{$k};
1934	}	2092	}
1935	}	2093	}
1936	undef $MAP_PREFETCHER;	2094	undef $MAP_PREFETCHER;
1937	};	2095	};
1938	$MAP_PREFETCHER->prio (6);	2096	$MAP_PREFETCHER->prio (6);
…		…
1941	}	2099	}
1942		2100
1943	sub save {	2101	sub save {
1944	my ($self) = @_;	2102	my ($self) = @_;
1945		2103
1946	my $lock = cf::lock_acquire "map_data:" . $self->path;	2104	my $lock = cf::lock_acquire "map_data:$self->{path}";
1947		2105
1948	$self->{last_save} = $cf::RUNTIME;	2106	$self->{last_save} = $cf::RUNTIME;
1949		2107
1950	return unless $self->dirty;	2108	return unless $self->dirty;
1951		2109
…		…
1957	return if $self->{deny_save};	2115	return if $self->{deny_save};
1958		2116
1959	local $self->{last_access} = $self->last_access;#d#	2117	local $self->{last_access} = $self->last_access;#d#
1960		2118
1961	cf::async {	2119	cf::async {
		2120	$Coro::current->{desc} = "map player save";
1962	$_->contr->save for $self->players;	2121	$_->contr->save for $self->players;
1963	};	2122	};
1964		2123
1965	if ($uniq) {	2124	if ($uniq) {
1966	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2125	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1974	my ($self) = @_;	2133	my ($self) = @_;
1975		2134
1976	# save first because save cedes	2135	# save first because save cedes
1977	$self->save;	2136	$self->save;
1978		2137
1979	my $lock = cf::lock_acquire "map_data:" . $self->path;	2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
1980		2139
1981	return if $self->players;	2140	return if $self->players;
1982	return if $self->in_memory != cf::MAP_IN_MEMORY;	2141	return if $self->in_memory != cf::MAP_IN_MEMORY;
1983	return if $self->{deny_save};	2142	return if $self->{deny_save};
1984		2143
		2144	$self->in_memory (cf::MAP_SWAPPED);
		2145
		2146	$self->deactivate;
		2147	$_->clear_links_to ($self) for values %cf::MAP;
1985	$self->clear;	2148	$self->clear;
1986	$self->in_memory (cf::MAP_SWAPPED);
1987	}	2149	}
1988		2150
1989	sub reset_at {	2151	sub reset_at {
1990	my ($self) = @_;	2152	my ($self) = @_;
1991		2153
…		…
2023	if $uniq;	2185	if $uniq;
2024	}	2186	}
2025		2187
2026	delete $cf::MAP{$self->path};	2188	delete $cf::MAP{$self->path};
2027		2189
		2190	$self->deactivate;
		2191	$_->clear_links_to ($self) for values %cf::MAP;
2028	$self->clear;	2192	$self->clear;
2029
2030	$_->clear_links_to ($self) for values %cf::MAP;
2031		2193
2032	$self->unlink_save;	2194	$self->unlink_save;
2033	$self->destroy;	2195	$self->destroy;
2034	}	2196	}
2035		2197
2036	my $nuke_counter = "aaaa";	2198	my $nuke_counter = "aaaa";
2037		2199
2038	sub nuke {	2200	sub nuke {
2039	my ($self) = @_;	2201	my ($self) = @_;
2040		2202
		2203	{
		2204	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2205
2041	delete $cf::MAP{$self->path};	2206	delete $cf::MAP{$self->path};
2042		2207
2043	$self->unlink_save;	2208	$self->unlink_save;
2044		2209
2045	bless $self, "cf::map";	2210	bless $self, "cf::map";
2046	delete $self->{deny_reset};	2211	delete $self->{deny_reset};
2047	$self->{deny_save} = 1;	2212	$self->{deny_save} = 1;
2048	$self->reset_timeout (1);	2213	$self->reset_timeout (1);
2049	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2214	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050		2215
2051	$cf::MAP{$self->path} = $self;	2216	$cf::MAP{$self->path} = $self;
		2217	}
2052		2218
2053	$self->reset; # polite request, might not happen	2219	$self->reset; # polite request, might not happen
2054	}	2220	}
2055		2221
2056	=item $maps = cf::map::tmp_maps	2222	=item $maps = cf::map::tmp_maps
…		…
2132		2298
2133	sub inv_recursive {	2299	sub inv_recursive {
2134	inv_recursive_ inv $_[0]	2300	inv_recursive_ inv $_[0]
2135	}	2301	}
2136		2302
		2303	=item $ref = $ob->ref
		2304
		2305	creates and returns a persistent reference to an objetc that can be stored as a string.
		2306
		2307	=item $ob = cf::object::deref ($refstring)
		2308
		2309	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2310	even if the object actually exists. May block.
		2311
		2312	=cut
		2313
		2314	sub deref {
		2315	my ($ref) = @_;
		2316
		2317	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2318	my ($uuid, $name) = ($1, $2);
		2319	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2320	or return;
		2321	$pl->ob->uuid eq $uuid
		2322	or return;
		2323
		2324	$pl->ob
		2325	} else {
		2326	warn "$ref: cannot resolve object reference\n";
		2327	undef
		2328	}
		2329	}
		2330
2137	package cf;	2331	package cf;
2138		2332
2139	=back	2333	=back
2140		2334
2141	=head3 cf::object::player	2335	=head3 cf::object::player
…		…
2163		2357
2164	} else {	2358	} else {
2165	my $pl = $self->contr;	2359	my $pl = $self->contr;
2166		2360
2167	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2361	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168	my $diag = $pl->{npc_dialog};	2362	my $dialog = $pl->{npc_dialog};
2169	$diag->{pl}->ext_reply (	2363	$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		2364
2176	} else {	2365	} else {
2177	$msg = $npc->name . " says: $msg" if $npc;	2366	$msg = $npc->name . " says: $msg" if $npc;
2178	$self->message ($msg, $flags);	2367	$self->message ($msg, $flags);
2179	}	2368	}
2180	}	2369	}
		2370	}
		2371
		2372	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2373
		2374	=cut
		2375
		2376	sub cf::object::send_msg {
		2377	my $pl = shift->contr
		2378	or return;
		2379	$pl->send_msg (@_);
2181	}	2380	}
2182		2381
2183	=item $player_object->may ("access")	2382	=item $player_object->may ("access")
2184		2383
2185	Returns wether the given player is authorized to access resource "access"	2384	Returns wether the given player is authorized to access resource "access"
…		…
2264	# use -1 or undef as default coordinates, not 0, 0	2463	# use -1 or undef as default coordinates, not 0, 0
2265	($x, $y) = ($map->enter_x, $map->enter_y)	2464	($x, $y) = ($map->enter_x, $map->enter_y)
2266	if $x <=0 && $y <= 0;	2465	if $x <=0 && $y <= 0;
2267		2466
2268	$map->load;	2467	$map->load;
2269	$map->load_diag;	2468	$map->load_neighbours;
2270		2469
2271	return unless $self->contr->active;	2470	return unless $self->contr->active;
2272	$self->activate_recursive;	2471	$self->activate_recursive;
2273		2472
2274	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2473	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2294	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2493	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295		2494
2296	$self->enter_link;	2495	$self->enter_link;
2297		2496
2298	(async {	2497	(async {
		2498	$Coro::current->{desc} = "player::goto $path $x $y";
		2499
		2500	# *tag paths override both path and x\|y
		2501	if ($path =~ /^\(.)$/) {
		2502	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2503	my $ob = $obs[rand @obs];
		2504
		2505	# see if we actually can go there
		2506	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2507	$ob = $obs[rand @obs];
		2508	} else {
		2509	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2510	}
		2511	# else put us there anyways for now #d#
		2512
		2513	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2514	} else {
		2515	($path, $x, $y) = (undef, undef, undef);
		2516	}
		2517	}
		2518
2299	my $map = eval {	2519	my $map = eval {
2300	my $map = cf::map::find $path;	2520	my $map = defined $path ? cf::map::find $path : undef;
2301		2521
2302	if ($map) {	2522	if ($map) {
2303	$map = $map->customise_for ($self);	2523	$map = $map->customise_for ($self);
2304	$map = $check->($map) if $check && $map;	2524	$map = $check->($map) if $check && $map;
2305	} else {	2525	} else {
2306	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2526	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2307	}	2527	}
2308		2528
2309	$map	2529	$map
2310	};	2530	};
2311		2531
…		…
2401	# if exit is damned, update players death & WoR home-position	2621	# if exit is damned, update players death & WoR home-position
2402	$self->contr->savebed ($slaying, $hp, $sp)	2622	$self->contr->savebed ($slaying, $hp, $sp)
2403	if $exit->flag (FLAG_DAMNED);	2623	if $exit->flag (FLAG_DAMNED);
2404		2624
2405	(async {	2625	(async {
		2626	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2627
2406	$self->deactivate_recursive; # just to be sure	2628	$self->deactivate_recursive; # just to be sure
2407	unless (eval {	2629	unless (eval {
2408	$self->goto ($slaying, $hp, $sp);	2630	$self->goto ($slaying, $hp, $sp);
2409		2631
2410	1;	2632	1;
…		…
2445	the message, with C<log> being the default. If C<$color> is negative, suppress	2667	the message, with C<log> being the default. If C<$color> is negative, suppress
2446	the message unless the client supports the msg packet.	2668	the message unless the client supports the msg packet.
2447		2669
2448	=cut	2670	=cut
2449		2671
		2672	our %CHANNEL = (
		2673	"c/identify" => {
		2674	id => "infobox",
		2675	title => "Identify",
		2676	reply => undef,
		2677	tooltip => "Items recently identified",
		2678	},
		2679	"c/examine" => {
		2680	id => "infobox",
		2681	title => "Examine",
		2682	reply => undef,
		2683	tooltip => "Signs and other items you examined",
		2684	},
		2685	"c/lookat" => {
		2686	id => "infobox",
		2687	title => "Look",
		2688	reply => undef,
		2689	tooltip => "What you saw there",
		2690	},
		2691	);
		2692
2450	sub cf::client::send_msg {	2693	sub cf::client::send_msg {
2451	my ($self, $channel, $msg, $color, @extra) = @_;	2694	my ($self, $channel, $msg, $color, @extra) = @_;
2452		2695
2453	$msg = $self->pl->expand_cfpod ($msg);	2696	$msg = $self->pl->expand_cfpod ($msg);
2454		2697
2455	return unless @extra \|\| length $msg;
2456
2457	$color &= ~cf::NDI_UNIQUE; # just in case...	2698	$color &= cf::NDI_CLIENT_MASK; # just in case...
2458		2699
		2700	# check predefined channels, for the benefit of C
		2701	if ($CHANNEL{$channel}) {
		2702	$channel = $CHANNEL{$channel};
		2703
		2704	$self->ext_msg (channel_info => $channel)
		2705	if $self->can_msg;
		2706
		2707	$channel = $channel->{id};
		2708
2459	if (ref $channel) {	2709	} elsif (ref $channel) {
2460	# send meta info to client, if not yet sent	2710	# send meta info to client, if not yet sent
2461	unless (exists $self->{channel}{$channel->{id}}) {	2711	unless (exists $self->{channel}{$channel->{id}}) {
2462	$self->{channel}{$channel->{id}} = $channel;	2712	$self->{channel}{$channel->{id}} = $channel;
2463	$self->ext_event (channel_info => %$channel);	2713	$self->ext_msg (channel_info => $channel)
		2714	if $self->can_msg;
2464	}	2715	}
2465		2716
2466	$channel = $channel->{id};	2717	$channel = $channel->{id};
2467	}	2718	}
2468		2719
		2720	return unless @extra \|\| length $msg;
		2721
2469	if ($self->can_msg) {	2722	if ($self->can_msg) {
		2723	# default colour, mask it out
		2724	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2725	if $color & cf::NDI_DEF;
		2726
2470	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2727	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2728	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471	} else {	2729	} 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) {	2730	if ($color >= 0) {
		2731	# replace some tags by gcfclient-compatible ones
		2732	for ($msg) {
		2733	1 while
		2734	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2735	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2736	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2737	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2738	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2739	}
		2740
		2741	$color &= cf::NDI_COLOR_MASK;
		2742
		2743	utf8::encode $msg;
		2744
2483	if (0 && $msg =~ /\[/) {	2745	if (0 && $msg =~ /\[/) {
		2746	# COMMAND/INFO
2484	$self->send_packet ("drawextinfo $color 4 0 $msg")	2747	$self->send_packet ("drawextinfo $color 10 8 $msg")
2485	} else {	2748	} else {
2486	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2749	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2487	$self->send_packet ("drawinfo $color $msg")	2750	$self->send_packet ("drawinfo $color $msg")
2488	}	2751	}
2489	}	2752	}
2490	}	2753	}
2491	}	2754	}
2492		2755
2493	=item $client->ext_event ($type, %msg)	2756	=item $client->ext_msg ($type, @msg)
2494		2757
2495	Sends an ext event to the client.	2758	Sends an ext event to the client.
2496		2759
2497	=cut	2760	=cut
2498		2761
2499	sub cf::client::ext_event($$%) {	2762	sub cf::client::ext_msg($$@) {
2500	my ($self, $type, %msg) = @_;	2763	my ($self, $type, @msg) = @_;
2501		2764
2502	return unless $self->extcmd;	2765	if ($self->extcmd == 2) {
2503		2766	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2767	} elsif ($self->extcmd == 1) { # TODO: remove
2504	$msg{msgtype} = "event_$type";	2768	push @msg, msgtype => "event_$type";
2505	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2769	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2770	}
		2771	}
		2772
		2773	=item $client->ext_reply ($msgid, @msg)
		2774
		2775	Sends an ext reply to the client.
		2776
		2777	=cut
		2778
		2779	sub cf::client::ext_reply($$@) {
		2780	my ($self, $id, @msg) = @_;
		2781
		2782	if ($self->extcmd == 2) {
		2783	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2784	} elsif ($self->extcmd == 1) {
		2785	#TODO: version 1, remove
		2786	unshift @msg, msgtype => "reply", msgid => $id;
		2787	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2788	}
2506	}	2789	}
2507		2790
2508	=item $success = $client->query ($flags, "text", \&cb)	2791	=item $success = $client->query ($flags, "text", \&cb)
2509		2792
2510	Queues a query to the client, calling the given callback with	2793	Queues a query to the client, calling the given callback with
…		…
2565	my ($ns, $buf) = @_;	2848	my ($ns, $buf) = @_;
2566		2849
2567	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2850	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568		2851
2569	if (ref $msg) {	2852	if (ref $msg) {
		2853	my ($type, $reply, @payload) =
		2854	"ARRAY" eq ref $msg
		2855	? @$msg
		2856	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2857
		2858	my @reply;
		2859
2570	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2860	if (my $cb = $EXTICMD{$type}) {
2571	if (my %reply = $cb->($ns, $msg)) {	2861	@reply = $cb->($ns, @payload);
2572	$reply{msgid} = $msg->{msgid};
2573	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574	}
2575	}	2862	}
		2863
		2864	$ns->ext_reply ($reply, @reply)
		2865	if $reply;
		2866
2576	} else {	2867	} else {
2577	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2868	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578	}	2869	}
2579		2870
2580	cf::override;	2871	cf::override;
…		…
2627	our $safe = new Safe "safe";	2918	our $safe = new Safe "safe";
2628	our $safe_hole = new Safe::Hole;	2919	our $safe_hole = new Safe::Hole;
2629		2920
2630	$SIG{FPE} = 'IGNORE';	2921	$SIG{FPE} = 'IGNORE';
2631		2922
2632	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2923	$safe->permit_only (Opcode::opset qw(
		2924	:base_core :base_mem :base_orig :base_math
		2925	grepstart grepwhile mapstart mapwhile
		2926	sort time
		2927	));
2633		2928
2634	# here we export the classes and methods available to script code	2929	# here we export the classes and methods available to script code
2635		2930
2636	=pod	2931	=pod
2637		2932
2638	The following functions and methods are available within a safe environment:	2933	The following functions and methods are available within a safe environment:
2639		2934
2640	cf::object	2935	cf::object
2641	contr pay_amount pay_player map x y force_find force_add	2936	contr pay_amount pay_player map x y force_find force_add destroy
2642	insert remove	2937	insert remove name archname title slaying race decrease_ob_nr
2643		2938
2644	cf::object::player	2939	cf::object::player
2645	player	2940	player
2646		2941
2647	cf::player	2942	cf::player
…		…
2652		2947
2653	=cut	2948	=cut
2654		2949
2655	for (	2950	for (
2656	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2951	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2952	insert remove inv name archname title slaying race
2657	insert remove)],	2953	decrease_ob_nr destroy)],
2658	["cf::object::player" => qw(player)],	2954	["cf::object::player" => qw(player)],
2659	["cf::player" => qw(peaceful)],	2955	["cf::player" => qw(peaceful)],
2660	["cf::map" => qw(trigger)],	2956	["cf::map" => qw(trigger)],
2661	) {	2957	) {
2662	no strict 'refs';	2958	no strict 'refs';
…		…
2738	# the server's init and main functions	3034	# the server's init and main functions
2739		3035
2740	sub load_facedata($) {	3036	sub load_facedata($) {
2741	my ($path) = @_;	3037	my ($path) = @_;
2742		3038
		3039	# HACK to clear player env face cache, we need some signal framework
		3040	# for this (global event?)
		3041	%ext::player_env::MUSIC_FACE_CACHE = ();
		3042
		3043	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3044
2743	warn "loading facedata from $path\n";	3045	warn "loading facedata from $path\n";
2744		3046
2745	my $facedata;	3047	my $facedata;
2746	0 < aio_load $path, $facedata	3048	0 < aio_load $path, $facedata
2747	or die "$path: $!";	3049	or die "$path: $!";
2748		3050
2749	$facedata = Coro::Storable::thaw $facedata;	3051	$facedata = Coro::Storable::thaw $facedata;
2750		3052
2751	$facedata->{version} == 2	3053	$facedata->{version} == 2
2752	or cf::cleanup "$path: version mismatch, cannot proceed.";	3054	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3055
		3056	# patch in the exptable
		3057	$facedata->{resource}{"res/exp_table"} = {
		3058	type => FT_RSRC,
		3059	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3060	};
		3061	cf::cede_to_tick;
2753		3062
2754	{	3063	{
2755	my $faces = $facedata->{faceinfo};	3064	my $faces = $facedata->{faceinfo};
2756		3065
2757	while (my ($face, $info) = each %$faces) {	3066	while (my ($face, $info) = each %$faces) {
2758	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3067	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2759	cf::face::set_visibility $idx, $info->{visibility};	3068	cf::face::set_visibility $idx, $info->{visibility};
2760	cf::face::set_magicmap $idx, $info->{magicmap};	3069	cf::face::set_magicmap $idx, $info->{magicmap};
2761	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3070	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3071	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763		3072
2764	cf::cede_to_tick;	3073	cf::cede_to_tick;
2765	}	3074	}
2766		3075
2767	while (my ($face, $info) = each %$faces) {	3076	while (my ($face, $info) = each %$faces) {
…		…
2792		3101
2793	{	3102	{
2794	# TODO: for gcfclient pleasure, we should give resources	3103	# TODO: for gcfclient pleasure, we should give resources
2795	# that gcfclient doesn't grok a >10000 face index.	3104	# that gcfclient doesn't grok a >10000 face index.
2796	my $res = $facedata->{resource};	3105	my $res = $facedata->{resource};
2797	my $enc = JSON::XS->new->utf8->canonical;	3106
		3107	my $soundconf = delete $res->{"res/sound.conf"};
2798		3108
2799	while (my ($name, $info) = each %$res) {	3109	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;	3110	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3111	my $data;
2807		3112
2808	if ($name =~ /\.jpg$/) {	3113	if ($info->{type} & 1) {
2809	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3114	# prepend meta info
2810	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3115
		3116	my $meta = $enc->encode ({
		3117	name => $name,
		3118	%{ $info->{meta} \|\| {} },
		3119	});
		3120
		3121	$data = pack "(w/a)", $meta, $info->{data};
2811	} else {	3122	} else {
2812	my $data = pack "(w/a)", $meta, $info->{data};	3123	$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	}	3124	}
2818		3125
		3126	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3127	cf::face::set_type $idx, $info->{type};
		3128
2819	cf::cede_to_tick;	3129	cf::cede_to_tick;
2820	}	3130	}
		3131
		3132	if ($soundconf) {
		3133	$soundconf = $enc->decode (delete $soundconf->{data});
		3134
		3135	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3136	my $sound = $soundconf->{compat}[$_]
		3137	or next;
		3138
		3139	my $face = cf::face::find "sound/$sound->[1]";
		3140	cf::sound::set $sound->[0] => $face;
		3141	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3142	}
		3143
		3144	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3145	my $face = cf::face::find "sound/$v";
		3146	cf::sound::set $k => $face;
		3147	}
		3148	}
2821	}	3149	}
2822		3150
2823	1	3151	1
2824	}	3152	}
2825		3153
		3154	register_exticmd fx_want => sub {
		3155	my ($ns, $want) = @_;
		3156
		3157	while (my ($k, $v) = each %$want) {
		3158	$ns->fx_want ($k, $v);
		3159	}
		3160	};
		3161
2826	sub reload_regions {	3162	sub reload_regions {
		3163	# HACK to clear player env face cache, we need some signal framework
		3164	# for this (global event?)
		3165	%ext::player_env::MUSIC_FACE_CACHE = ();
		3166
2827	load_resource_file "$MAPDIR/regions"	3167	load_resource_file "$MAPDIR/regions"
2828	or die "unable to load regions file\n";	3168	or die "unable to load regions file\n";
2829		3169
2830	for (cf::region::list) {	3170	for (cf::region::list) {
2831	$_->{match} = qr/$_->{match}/	3171	$_->{match} = qr/$_->{match}/
…		…
2867		3207
2868	sub init {	3208	sub init {
2869	reload_resources;	3209	reload_resources;
2870	}	3210	}
2871		3211
2872	sub cfg_load {	3212	sub reload_config {
2873	open my $fh, "<:utf8", "$CONFDIR/config"	3213	open my $fh, "<:utf8", "$CONFDIR/config"
2874	or return;	3214	or return;
2875		3215
2876	local $/;	3216	local $/;
2877	*CFG = YAML::Syck::Load <$fh>;	3217	*CFG = YAML::Syck::Load <$fh>;
…		…
2893	sub main {	3233	sub main {
2894	# we must not ever block the main coroutine	3234	# we must not ever block the main coroutine
2895	local $Coro::idle = sub {	3235	local $Coro::idle = sub {
2896	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3236	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897	(async {	3237	(async {
		3238	$Coro::current->{desc} = "IDLE BUG HANDLER";
2898	Event::one_event;	3239	Event::one_event;
2899	})->prio (Coro::PRIO_MAX);	3240	})->prio (Coro::PRIO_MAX);
2900	};	3241	};
2901		3242
2902	cfg_load;	3243	reload_config;
2903	db_init;	3244	db_init;
2904	load_extensions;	3245	load_extensions;
2905		3246
2906	$TICK_WATCHER->start;	3247	$TICK_WATCHER->start;
2907	Event::loop;	3248	Event::loop;
…		…
2974	# and maps saved/destroyed asynchronously.	3315	# and maps saved/destroyed asynchronously.
2975	warn "begin emergency player save\n";	3316	warn "begin emergency player save\n";
2976	for my $login (keys %cf::PLAYER) {	3317	for my $login (keys %cf::PLAYER) {
2977	my $pl = $cf::PLAYER{$login} or next;	3318	my $pl = $cf::PLAYER{$login} or next;
2978	$pl->valid or next;	3319	$pl->valid or next;
		3320	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979	$pl->save;	3321	$pl->save;
2980	}	3322	}
2981	warn "end emergency player save\n";	3323	warn "end emergency player save\n";
2982		3324
2983	warn "begin emergency map save\n";	3325	warn "begin emergency map save\n";
…		…
3031		3373
3032	warn "flushing outstanding aio requests";	3374	warn "flushing outstanding aio requests";
3033	for (;;) {	3375	for (;;) {
3034	BDB::flush;	3376	BDB::flush;
3035	IO::AIO::flush;	3377	IO::AIO::flush;
3036	Coro::cede;	3378	Coro::cede_notself;
3037	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3379	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3038	warn "iterate...";	3380	warn "iterate...";
3039	}	3381	}
3040		3382
3041	++$RELOAD;	3383	++$RELOAD;
…		…
3100	warn "reloading cf.pm";	3442	warn "reloading cf.pm";
3101	require cf;	3443	require cf;
3102	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3444	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103		3445
3104	warn "loading config and database again";	3446	warn "loading config and database again";
3105	cf::cfg_load;	3447	cf::reload_config;
3106		3448
3107	warn "loading extensions";	3449	warn "loading extensions";
3108	cf::load_extensions;	3450	cf::load_extensions;
3109		3451
3110	warn "reattaching attachments to objects/players";	3452	warn "reattaching attachments to objects/players";
…		…
3146	register_command "reload" => sub {	3488	register_command "reload" => sub {
3147	my ($who, $arg) = @_;	3489	my ($who, $arg) = @_;
3148		3490
3149	if ($who->flag (FLAG_WIZ)) {	3491	if ($who->flag (FLAG_WIZ)) {
3150	$who->message ("reloading server.");	3492	$who->message ("reloading server.");
		3493	async {
		3494	$Coro::current->{desc} = "perl_reload";
3151	async { reload_perl };	3495	reload_perl;
		3496	};
3152	}	3497	}
3153	};	3498	};
3154		3499
3155	unshift @INC, $LIBDIR;	3500	unshift @INC, $LIBDIR;
3156		3501
…		…
3175	my $signal = new Coro::Signal;	3520	my $signal = new Coro::Signal;
3176	push @WAIT_FOR_TICK_BEGIN, $signal;	3521	push @WAIT_FOR_TICK_BEGIN, $signal;
3177	$signal->wait;	3522	$signal->wait;
3178	}	3523	}
3179		3524
3180	my $min = 1e6;#d#
3181	my $avg = 10;
3182	$TICK_WATCHER = Event->timer (	3525	$TICK_WATCHER = Event->timer (
3183	reentrant => 0,	3526	reentrant => 0,
3184	parked => 1,	3527	parked => 1,
3185	prio => 0,	3528	prio => 0,
3186	at => $NEXT_TICK \|\| $TICK,	3529	at => $NEXT_TICK \|\| $TICK,
…		…
3194		3537
3195	$NOW = $tick_start = Event::time;	3538	$NOW = $tick_start = Event::time;
3196		3539
3197	cf::server_tick; # one server iteration	3540	cf::server_tick; # one server iteration
3198		3541
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;	3542	$RUNTIME += $TICK;
3223	$NEXT_TICK += $TICK;	3543	$NEXT_TICK += $TICK;
3224		3544
3225	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3545	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226	$NEXT_RUNTIME_WRITE = $NOW + 10;	3546	$NEXT_RUNTIME_WRITE = $NOW + 10;
3227	Coro::async_pool {	3547	Coro::async_pool {
		3548	$Coro::current->{desc} = "runtime saver";
3228	write_runtime	3549	write_runtime
3229	or warn "ERROR: unable to write runtime file: $!";	3550	or warn "ERROR: unable to write runtime file: $!";
3230	};	3551	};
3231	}	3552	}
3232		3553
3233	# my $AFTER = Event::time;
3234	# warn $AFTER - $NOW;#d#
3235
3236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3554	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237	$sig->send;	3555	$sig->send;
3238	}	3556	}
3239	while (my $sig = shift @WAIT_FOR_TICK) {	3557	while (my $sig = shift @WAIT_FOR_TICK) {
3240	$sig->send;	3558	$sig->send;
…		…
3250		3568
3251	$LOAD = ($NOW - $tick_start) / $TICK;	3569	$LOAD = ($NOW - $tick_start) / $TICK;
3252	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3570	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253		3571
3254	_post_tick;	3572	_post_tick;
3255
3256
3257	},	3573	},
3258	);	3574	);
3259		3575
3260	{	3576	{
		3577	BDB::min_parallel 8;
3261	BDB::max_poll_time $TICK * 0.1;	3578	BDB::max_poll_time $TICK * 0.1;
3262	$BDB_POLL_WATCHER = Event->io (	3579	$BDB_POLL_WATCHER = Event->io (
3263	reentrant => 0,	3580	reentrant => 0,
3264	fd => BDB::poll_fileno,	3581	fd => BDB::poll_fileno,
3265	poll => 'r',	3582	poll => 'r',
3266	prio => 0,	3583	prio => 0,
3267	data => WF_AUTOCANCEL,	3584	data => WF_AUTOCANCEL,
3268	cb => \&BDB::poll_cb,	3585	cb => \&BDB::poll_cb,
3269	);	3586	);
3270	BDB::min_parallel 8;
3271		3587
3272	BDB::set_sync_prepare {	3588	BDB::set_sync_prepare {
3273	my $status;	3589	my $status;
3274	my $current = $Coro::current;	3590	my $current = $Coro::current;
3275	(	3591	(
…		…
3284	)	3600	)
3285	};	3601	};
3286		3602
3287	unless ($DB_ENV) {	3603	unless ($DB_ENV) {
3288	$DB_ENV = BDB::db_env_create;	3604	$DB_ENV = BDB::db_env_create;
		3605	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3606	\| BDB::LOG_AUTOREMOVE, 1);
		3607	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3608	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289		3609
3290	cf::sync_job {	3610	cf::sync_job {
3291	eval {	3611	eval {
3292	BDB::db_env_open	3612	BDB::db_env_open
3293	$DB_ENV,	3613	$DB_ENV,
…		…
3295	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3615	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3296	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3616	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3297	0666;	3617	0666;
3298		3618
3299	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3619	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	};	3620	};
3304		3621
3305	cf::cleanup "db_env_open(db): $@" if $@;	3622	cf::cleanup "db_env_open(db): $@" if $@;
3306	};	3623	};
3307	}	3624	}
		3625
		3626	$BDB_DEADLOCK_WATCHER = Event->timer (
		3627	after => 3,
		3628	interval => 1,
		3629	hard => 1,
		3630	prio => 0,
		3631	data => WF_AUTOCANCEL,
		3632	cb => sub {
		3633	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3634	},
		3635	);
		3636	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3637	after => 11,
		3638	interval => 60,
		3639	hard => 1,
		3640	prio => 0,
		3641	data => WF_AUTOCANCEL,
		3642	cb => sub {
		3643	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3644	},
		3645	);
		3646	$BDB_TRICKLE_WATCHER = Event->timer (
		3647	after => 5,
		3648	interval => 10,
		3649	hard => 1,
		3650	prio => 0,
		3651	data => WF_AUTOCANCEL,
		3652	cb => sub {
		3653	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3654	},
		3655	);
3308	}	3656	}
3309		3657
3310	{	3658	{
3311	IO::AIO::min_parallel 8;	3659	IO::AIO::min_parallel 8;
3312		3660
…		…
3315	$AIO_POLL_WATCHER = Event->io (	3663	$AIO_POLL_WATCHER = Event->io (
3316	reentrant => 0,	3664	reentrant => 0,
3317	data => WF_AUTOCANCEL,	3665	data => WF_AUTOCANCEL,
3318	fd => IO::AIO::poll_fileno,	3666	fd => IO::AIO::poll_fileno,
3319	poll => 'r',	3667	poll => 'r',
3320	prio => 6,	3668	prio => 0,
3321	cb => \&IO::AIO::poll_cb,	3669	cb => \&IO::AIO::poll_cb,
3322	);	3670	);
3323	}	3671	}
3324		3672
3325	my $_log_backtrace;	3673	my $_log_backtrace;
…		…
3331		3679
3332	# limit the # of concurrent backtraces	3680	# limit the # of concurrent backtraces
3333	if ($_log_backtrace < 2) {	3681	if ($_log_backtrace < 2) {
3334	++$_log_backtrace;	3682	++$_log_backtrace;
3335	async {	3683	async {
		3684	$Coro::current->{desc} = "abt $msg";
		3685
3336	my @bt = fork_call {	3686	my @bt = fork_call {
3337	@addr = map { sprintf "%x", $_ } @addr;	3687	@addr = map { sprintf "%x", $_ } @addr;
3338	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3688	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3689	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3340	or die "addr2line: $!";	3690	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.312 by root, Sat Jul 21 18:01:26 2007 UTC vs. Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC