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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.314 by root, Mon Jul 23 16:53:15 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
327	=item cf::get_slot $time[, $priority]	341	=item cf::get_slot $time[, $priority[, $name]]
328		342
329	Allocate $time seconds of blocking CPU time at priority C<$priority>:	343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
330	This call blocks and returns only when you have at least C<$time> seconds	344	This call blocks and returns only when you have at least C<$time> seconds
331	of cpu time till the next tick. The slot is only valid till the next cede.	345	of cpu time till the next tick. The slot is only valid till the next cede.
332		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
333	Useful for short background jobs.	350	Useful for short background jobs.
334		351
335	=cut	352	=cut
336		353
337	our @SLOT_QUEUE;	354	our @SLOT_QUEUE;
338	our $SLOT_QUEUE;	355	our $SLOT_QUEUE;
339		356
340	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341	$SLOT_QUEUE = Coro::async {	358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
342	my $signal = new Coro::Signal;	361	my $signal = new Coro::Signal;
343		362
344	while () {	363	while () {
345	next_job:	364	next_job:
346	my $avail = cf::till_tick;	365	my $avail = cf::till_tick;
…		…
354	}	373	}
355	}	374	}
356	}	375	}
357		376
358	if (@SLOT_QUEUE) {	377	if (@SLOT_QUEUE) {
359	# we do not use wait_For_tick() as it returns immediately when tick is inactive	378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
360	push @cf::WAIT_FOR_TICK, $signal;	379	push @cf::WAIT_FOR_TICK, $signal;
361	$signal->wait;	380	$signal->wait;
362	} else {	381	} else {
363	Coro::schedule;	382	Coro::schedule;
364	}	383	}
365	}	384	}
366	};	385	};
367		386
368	sub get_slot($;$) {	387	sub get_slot($;$$) {
369	my ($time, $pri) = @_;	388	my ($time, $pri, $name) = @_;
370		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
371	push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal];	393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373	$SLOT_QUEUE->ready;	395	$SLOT_QUEUE->ready;
374	$sig->wait;	396	$sig->wait;
375	}	397	}
376		398
…		…
405	my $time = Event::time;	427	my $time = Event::time;
406		428
407	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
408	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
409		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
410	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
411	# (but this is cancel-safe)	435	# (but this is cancel-safe)
412	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
413		437
414	my $busy = 1;	438	my $busy = 1;
415	my @res;	439	my @res;
416		440
417	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
418	@res = eval { $job->() };	443	@res = eval { $job->() };
419	warn $@ if $@;	444	warn $@ if $@;
420	undef $busy;	445	undef $busy;
421	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
422		447
423	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
424	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
425	}	454	}
426		455
427	$time = Event::time - $time;	456	$time = Event::time - $time;
428		457
429	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	458	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
…		…
466	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
467	never block itself or use any form of Event handling.	496	never block itself or use any form of Event handling.
468		497
469	=cut	498	=cut
470		499
471	sub _store_scalar {
472	open my $fh, ">", \my $buf
473	or die "fork_call: cannot open fh-to-buf in child : $!";
474	Storable::store_fd $_[0], $fh;
475	close $fh;
476
477	$buf
478	}
479
480	sub fork_call(&@) {	500	sub fork_call(&@) {
481	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
482		502
483	# 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,
484	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
485	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
486	or die "pipe: $!";
487		506
488	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
489	close $fh2;
490
491	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492	warn "pst<$res>" unless $res =~ /^pst/;
493	$res = Coro::Storable::thaw $res;
494
495	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497	Carp::confess $$res unless "ARRAY" eq ref $res;
498
499	return wantarray ? @$res : $res->[-1];
500	} else {
501	reset_signals;	508	reset_signals;
502	local $SIG{__WARN__};	509	&$cb
503	local $SIG{__DIE__};	510	}, @args;
504	# just in case, this hack effectively disables event
505	# in the child. cleaner and slower would be canceling all watchers,
506	# but this works for the time being.
507	local $Coro::idle;
508	$Coro::current->prio (Coro::PRIO_MAX);
509		511
510	eval {	512	wantarray ? @res : $res[-1]
511	close $fh1;
512
513	my @res = eval { $cb->(@args) };
514
515	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516	close $fh2;
517	};
518
519	warn $@ if $@;
520	_exit 0;
521	}
522	}	513	}
523		514
524	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
525		516
526	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
528	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
529		520
530	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
531	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).
532		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
533	=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	}
534		547
535	our $DB;	548	our $DB;
536		549
537	sub db_init {	550	sub db_init {
538	unless ($DB) {
539	$DB = BDB::db_create $DB_ENV;
540
541	cf::sync_job {	551	cf::sync_job {
542	eval {	552	$DB \|\|= db_table "db";
543	$DB->set_flags (BDB::CHKSUM);
544
545	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
547	cf::cleanup "db_open(db): $!" if $!;
548	};
549	cf::cleanup "db_open(db): $@" if $@;
550	};
551	}	553	};
552	}	554	}
553		555
554	sub db_get($$) {	556	sub db_get($$) {
555	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
556		558
…		…
606	if (1) {	608	if (1) {
607	$md5 =	609	$md5 =
608	join "\x00",	610	join "\x00",
609	$processversion,	611	$processversion,
610	map {	612	map {
611	Coro::cede;	613	cf::cede_to_tick;
612	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
613	} 0.. $#$src;	615	} 0.. $#$src;
614		616
615		617
616	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
968		970
969	=cut	971	=cut
970		972
971	#############################################################################	973	#############################################################################
972	# object support	974	# object support
973	#
974		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#
975	sub _can_merge {	1009	sub _can_merge {
976	my ($ob1, $ob2) = @_;	1010	my ($ob1, $ob2) = @_;
977		1011
978	local $Storable::canonical = 1;	1012	++$SLOW_MERGES;#d#
979	my $fob1 = Storable::freeze $ob1;
980	my $fob2 = Storable::freeze $ob2;
981		1013
982	$fob1 eq $fob2	1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
983	}	1016	}
984		1017
985	sub reattach {	1018	sub reattach {
986	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
987	my ($obj) = @_;	1020	my ($obj) = @_;
…		…
1035	sub object_freezer_save {	1068	sub object_freezer_save {
1036	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
1037		1070
1038	sync_job {	1071	sync_job {
1039	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
1040	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
1041	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
1042		1076
1043	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1044	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
1045	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
1047	close $fh;	1081	close $fh;
1048		1082
1049	if (@$objs) {	1083	if (@$objs) {
1050	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) {
1051	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
1052	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
1054	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
1055	close $fh;	1089	close $fh;
1056	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
1057	}	1091	}
…		…
1065	}	1099	}
1066	} else {	1100	} else {
1067	aio_unlink $filename;	1101	aio_unlink $filename;
1068	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1069	}	1103	}
1070	}	1104	};
1071	}	1105	}
1072		1106
1073	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1074	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1075		1109
…		…
1087	or return;	1121	or return;
1088		1122
1089	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1090	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1091	or return;	1125	or return;
		1126
1092	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1093	}	1129	}
1094		1130
		1131	utf8::decode (my $decname = $filename);
1095	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1096	$filename, length $data, scalar @{$av \|\| []};	1133	$decname, length $data, scalar @{$av \|\| []};
		1134
1097	return ($data, $av);	1135	($data, $av)
1098	}	1136	}
1099		1137
1100	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1101		1139
1102	=over 4	1140	=over 4
…		…
1175	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1176		1214
1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178		1216
1179	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
1180	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1181	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1182	$pl->ext_reply ($msg->{msgid}, %reply);
1183	}
1184	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1185	} else {	1232	} else {
1186	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187	}	1234	}
1188		1235
1189	cf::override;	1236	cf::override;
…		…
1279		1326
1280	=head3 cf::player	1327	=head3 cf::player
1281		1328
1282	=over 4	1329	=over 4
1283		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
1284	=item cf::player::find $login	1345	=item cf::player::find $login
1285		1346
1286	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1287		1348
1288	=cut	1349	=cut
…		…
1323	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1327		1388
1328	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1329	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;
1330	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1331	}	1397	}
1332	}	1398	}
1333	}	1399	}
1334		1400
…		…
1344		1410
1345	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1346	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1347		1413
1348	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1349	Coro::cede;	1415	cf::cede_to_tick;
1350	}	1416	}
1351		1417
1352	sub new($) {	1418	sub new($) {
1353	my ($login) = @_;	1419	my ($login) = @_;
1354		1420
…		…
1358	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1359		1425
1360	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1361		1427
1362	$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 (@_);
1363	}	1439	}
1364		1440
1365	=item $pl->quit_character	1441	=item $pl->quit_character
1366		1442
1367	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
…		…
1422	or return [];	1498	or return [];
1423		1499
1424	my @logins;	1500	my @logins;
1425		1501
1426	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") {
1427	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1429	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1430		1511
1431	utf8::decode $login;	1512	utf8::decode $login;
1432	push @logins, $login;	1513	push @logins, $login;
1433	}	1514	}
1434		1515
…		…
1467		1548
1468	Expand crossfire pod fragments into protocol xml.	1549	Expand crossfire pod fragments into protocol xml.
1469		1550
1470	=cut	1551	=cut
1471		1552
		1553	use re 'eval';
		1554
		1555	my $group;
		1556	my $interior; $interior = qr{
		1557	(?:
		1558	\ (.*?)\ (?{ $group = $^N })
		1559	\| < (??{$interior}) >
		1560	)
		1561	}x;
		1562
1472	sub expand_cfpod {	1563	sub expand_cfpod {
1473	((my $self), (local $_)) = @_;	1564	my ($self, $pod) = @_;
1474		1565
1475	# escape & and <	1566	my $xml;
1476	s/&/&/g;
1477	s/(?<![BIUGH])</</g;
1478		1567
1479	# this is buggy, it needs to properly take care of nested <'s	1568	while () {
		1569	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?=[^<]) )+ )/xgcs) {
		1570	$group = $1;
1480		1571
1481	1 while	1572	$group =~ s/&/&/g;
1482	# replace B<>, I<>, U<> etc.	1573	$group =~ s/</</g;
1483	s/B<([^\>]*)>/<b>$1<\/b>/	1574
1484	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1575	$xml .= $group;
1485	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1576	} elsif ($pod =~ m%\G
1486	# replace G<male\|female> tags	1577	([BCGHITU])
1487	\|\| s{G<([^>\|])\\|([^>])>}{	1578	<
1488	$self->gender ? $2 : $1	1579	(?:
1489	}ge	1580	([^<>]*) (?{ $group = $^N })
1490	# replace H<hint text>	1581	\| < $interior >
1491	\|\| s{H<([^\>]*)>}	1582	)
		1583	>
		1584	%gcsx
1492	{	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") {
1493	("<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>",
1494	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1604	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495	"")	1605	"")
1496	[$self->{hintmode}]	1606	[$self->{hintmode}];
		1607	} else {
		1608	$xml .= "error processing '$code($data)' directive";
1497	}ge;	1609	}
		1610	} else {
		1611	if ($pod =~ /\G(.+)/) {
		1612	warn "parse error while expanding $pod (at $1)";
		1613	}
		1614	last;
		1615	}
		1616	}
1498		1617
		1618	for ($xml) {
1499	# create single paragraphs (very hackish)	1619	# create single paragraphs (very hackish)
1500	s/(?<=\S)\n(?=\w)/ /g;	1620	s/(?<=\S)\n(?=\w)/ /g;
1501		1621
1502	# compress some whitespace	1622	# compress some whitespace
1503	s/\s+\n/\n/g; # ws line-ends	1623	s/\s+\n/\n/g; # ws line-ends
1504	s/\n\n+/\n/g; # double lines	1624	s/\n\n+/\n/g; # double lines
1505	s/^\n+//; # beginning lines	1625	s/^\n+//; # beginning lines
1506	s/\n+$//; # ending lines	1626	s/\n+$//; # ending lines
		1627	}
1507		1628
1508	$_	1629	$xml
1509	}	1630	}
1510		1631
1511	sub hintmode {	1632	sub hintmode {
1512	$_[0]{hintmode} = $_[1] if @_ > 1;	1633	$_[0]{hintmode} = $_[1] if @_ > 1;
1513	$_[0]{hintmode}	1634	$_[0]{hintmode}
1514	}	1635	}
1515		1636
1516	=item $player->ext_reply ($msgid, %msg)	1637	=item $player->ext_reply ($msgid, @msg)
1517		1638
1518	Sends an ext reply to the player.	1639	Sends an ext reply to the player.
1519		1640
1520	=cut	1641	=cut
1521		1642
1522	sub ext_reply($$%) {	1643	sub ext_reply($$@) {
1523	my ($self, $id, %msg) = @_;	1644	my ($self, $id, @msg) = @_;
1524		1645
1525	$msg{msgid} = $id;	1646	$self->ns->ext_reply ($id, @msg)
1526	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527	}	1647	}
1528		1648
1529	=item $player->ext_event ($type, %msg)	1649	=item $player->ext_msg ($type, @msg)
1530		1650
1531	Sends an ext event to the client.	1651	Sends an ext event to the client.
1532		1652
1533	=cut	1653	=cut
1534		1654
1535	sub ext_event($$%) {	1655	sub ext_msg($$@) {
1536	my ($self, $type, %msg) = @_;	1656	my ($self, $type, @msg) = @_;
1537		1657
1538	$self->ns->ext_event ($type, %msg);	1658	$self->ns->ext_msg ($type, @msg);
1539	}	1659	}
1540		1660
1541	=head3 cf::region	1661	=head3 cf::region
1542		1662
1543	=over 4	1663	=over 4
…		…
1759		1879
1760	sub load_header_from($) {	1880	sub load_header_from($) {
1761	my ($self, $path) = @_;	1881	my ($self, $path) = @_;
1762		1882
1763	utf8::encode $path;	1883	utf8::encode $path;
1764	#aio_open $path, O_RDONLY, 0	1884	my $f = new_from_file cf::object::thawer $path
1765	# or return;
1766
1767	$self->_load_header ($path)
1768	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;
1769		1892
1770	$self->{load_path} = $path;	1893	$self->{load_path} = $path;
1771		1894
1772	1	1895	1
1773	}	1896	}
…		…
1827	sub find {	1950	sub find {
1828	my ($path, $origin) = @_;	1951	my ($path, $origin) = @_;
1829		1952
1830	$path = normalise $path, $origin && $origin->path;	1953	$path = normalise $path, $origin && $origin->path;
1831		1954
		1955	cf::lock_wait "map_data:$path";#d#remove
1832	cf::lock_wait "map_find:$path";	1956	cf::lock_wait "map_find:$path";
1833		1957
1834	$cf::MAP{$path} \|\| do {	1958	$cf::MAP{$path} \|\| do {
1835	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
1836	my $map = new_from_path cf::map $path	1962	my $map = new_from_path cf::map $path
1837	or return;	1963	or return;
1838		1964
1839	$map->{last_save} = $cf::RUNTIME;	1965	$map->{last_save} = $cf::RUNTIME;
1840		1966
…		…
1842	or return;	1968	or return;
1843		1969
1844	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1970	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845	# doing this can freeze the server in a sync job, obviously	1971	# doing this can freeze the server in a sync job, obviously
1846	#$cf::WAIT_FOR_TICK->wait;	1972	#$cf::WAIT_FOR_TICK->wait;
		1973	undef $guard1;
		1974	undef $guard2;
1847	$map->reset;	1975	$map->reset;
1848	undef $guard;
1849	return find $path;	1976	return find $path;
1850	}	1977	}
1851		1978
1852	$cf::MAP{$path} = $map	1979	$cf::MAP{$path} = $map
1853	}	1980	}
…		…
1862	local $self->{deny_reset} = 1; # loading can take a long time	1989	local $self->{deny_reset} = 1; # loading can take a long time
1863		1990
1864	my $path = $self->{path};	1991	my $path = $self->{path};
1865		1992
1866	{	1993	{
1867	my $guard = cf::lock_acquire "map_load:$path";	1994	my $guard = cf::lock_acquire "map_data:$path";
1868		1995
		1996	return unless $self->valid;
1869	return if $self->in_memory != cf::MAP_SWAPPED;	1997	return unless $self->in_memory == cf::MAP_SWAPPED;
1870		1998
1871	$self->in_memory (cf::MAP_LOADING);	1999	$self->in_memory (cf::MAP_LOADING);
1872		2000
1873	$self->alloc;	2001	$self->alloc;
1874		2002
1875	$self->pre_load;	2003	$self->pre_load;
1876	Coro::cede;	2004	cf::cede_to_tick;
1877		2005
		2006	my $f = new_from_file cf::object::thawer $self->{load_path};
		2007	$f->skip_block;
1878	$self->_load_objects ($self->{load_path}, 1)	2008	$self->_load_objects ($f)
1879	or return;	2009	or return;
1880		2010
1881	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2011	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882	if delete $self->{load_original};	2012	if delete $self->{load_original};
1883		2013
1884	if (my $uniq = $self->uniq_path) {	2014	if (my $uniq = $self->uniq_path) {
1885	utf8::encode $uniq;	2015	utf8::encode $uniq;
1886	if (aio_open $uniq, O_RDONLY, 0) {	2016	unless (aio_stat $uniq) {
		2017	if (my $f = new_from_file cf::object::thawer $uniq) {
1887	$self->clear_unique_items;	2018	$self->clear_unique_items;
1888	$self->_load_objects ($uniq, 0);	2019	$self->_load_objects ($f);
		2020	$f->resolve_delayed_derefs;
		2021	}
1889	}	2022	}
1890	}	2023	}
1891		2024
1892	Coro::cede;	2025	$f->resolve_delayed_derefs;
		2026
		2027	cf::cede_to_tick;
1893	# now do the right thing for maps	2028	# now do the right thing for maps
1894	$self->link_multipart_objects;	2029	$self->link_multipart_objects;
1895	$self->difficulty ($self->estimate_difficulty)	2030	$self->difficulty ($self->estimate_difficulty)
1896	unless $self->difficulty;	2031	unless $self->difficulty;
1897	Coro::cede;	2032	cf::cede_to_tick;
1898		2033
1899	unless ($self->{deny_activate}) {	2034	unless ($self->{deny_activate}) {
1900	$self->decay_objects;	2035	$self->decay_objects;
1901	$self->fix_auto_apply;	2036	$self->fix_auto_apply;
1902	$self->update_buttons;	2037	$self->update_buttons;
1903	Coro::cede;	2038	cf::cede_to_tick;
1904	$self->set_darkness_map;	2039	$self->set_darkness_map;
1905	Coro::cede;	2040	cf::cede_to_tick;
1906	$self->activate;	2041	$self->activate;
1907	}	2042	}
		2043
		2044	$self->{last_save} = $cf::RUNTIME;
		2045	$self->last_access ($cf::RUNTIME);
1908		2046
1909	$self->in_memory (cf::MAP_IN_MEMORY);	2047	$self->in_memory (cf::MAP_IN_MEMORY);
1910	}	2048	}
1911		2049
1912	$self->post_load;	2050	$self->post_load;
…		…
1923		2061
1924	$self	2062	$self
1925	}	2063	}
1926		2064
1927	# 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
1928	sub load_diag {	2066	sub load_neighbours {
1929	my ($map) = @_;	2067	my ($map) = @_;
1930		2068
1931	my @diag; # diagonal neighbours	2069	my @neigh; # diagonal neighbours
1932		2070
1933	for (0 .. 3) {	2071	for (0 .. 3) {
1934	my $neigh = $map->tile_path ($_)	2072	my $neigh = $map->tile_path ($_)
1935	or next;	2073	or next;
1936	$neigh = find $neigh, $map	2074	$neigh = find $neigh, $map
1937	or next;	2075	or next;
1938	$neigh->load;	2076	$neigh->load;
1939		2077
		2078	push @neigh,
1940	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2079	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1941	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2080	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1942	}	2081	}
1943		2082
1944	for (@diag) {	2083	for (grep defined $_->[0], @neigh) {
		2084	my ($path, $origin) = @$_;
1945	my $neigh = find @$_	2085	my $neigh = find $path, $origin
1946	or next;	2086	or next;
1947	$neigh->load;	2087	$neigh->load;
1948	}	2088	}
1949	}	2089	}
1950		2090
…		…
1955	}	2095	}
1956		2096
1957	sub do_load_sync {	2097	sub do_load_sync {
1958	my ($map) = @_;	2098	my ($map) = @_;
1959		2099
		2100	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2101	if $Coro::current == $Coro::main;
		2102
1960	cf::sync_job { $map->load };	2103	cf::sync_job { $map->load };
1961	}	2104	}
1962		2105
1963	our %MAP_PREFETCH;	2106	our %MAP_PREFETCH;
1964	our $MAP_PREFETCHER = undef;	2107	our $MAP_PREFETCHER = undef;
1965		2108
1966	sub find_async {	2109	sub find_async {
1967	my ($path, $origin) = @_;	2110	my ($path, $origin, $load) = @_;
1968		2111
1969	$path = normalise $path, $origin && $origin->{path};	2112	$path = normalise $path, $origin && $origin->{path};
1970		2113
1971	if (my $map = $cf::MAP{$path}) {	2114	if (my $map = $cf::MAP{$path}) {
1972	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2115	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1973	}	2116	}
1974		2117
1975	undef $MAP_PREFETCH{$path};	2118	$MAP_PREFETCH{$path} \|= $load;
		2119
1976	$MAP_PREFETCHER \|\|= cf::async {	2120	$MAP_PREFETCHER \|\|= cf::async {
		2121	$Coro::current->{desc} = "map prefetcher";
		2122
1977	while (%MAP_PREFETCH) {	2123	while (%MAP_PREFETCH) {
1978	for my $path (keys %MAP_PREFETCH) {	2124	while (my ($k, $v) = each %MAP_PREFETCH) {
1979	if (my $map = find $path) {	2125	if (my $map = find $k) {
1980	$map->load;	2126	$map->load if $v;
1981	}	2127	}
1982		2128
1983	delete $MAP_PREFETCH{$path};	2129	delete $MAP_PREFETCH{$k};
1984	}	2130	}
1985	}	2131	}
1986	undef $MAP_PREFETCHER;	2132	undef $MAP_PREFETCHER;
1987	};	2133	};
1988	$MAP_PREFETCHER->prio (6);	2134	$MAP_PREFETCHER->prio (6);
…		…
1991	}	2137	}
1992		2138
1993	sub save {	2139	sub save {
1994	my ($self) = @_;	2140	my ($self) = @_;
1995		2141
1996	my $lock = cf::lock_acquire "map_data:" . $self->path;	2142	my $lock = cf::lock_acquire "map_data:$self->{path}";
1997		2143
1998	$self->{last_save} = $cf::RUNTIME;	2144	$self->{last_save} = $cf::RUNTIME;
1999		2145
2000	return unless $self->dirty;	2146	return unless $self->dirty;
2001		2147
…		…
2007	return if $self->{deny_save};	2153	return if $self->{deny_save};
2008		2154
2009	local $self->{last_access} = $self->last_access;#d#	2155	local $self->{last_access} = $self->last_access;#d#
2010		2156
2011	cf::async {	2157	cf::async {
		2158	$Coro::current->{desc} = "map player save";
2012	$_->contr->save for $self->players;	2159	$_->contr->save for $self->players;
2013	};	2160	};
2014		2161
2015	if ($uniq) {	2162	if ($uniq) {
2016	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2163	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
2024	my ($self) = @_;	2171	my ($self) = @_;
2025		2172
2026	# save first because save cedes	2173	# save first because save cedes
2027	$self->save;	2174	$self->save;
2028		2175
2029	my $lock = cf::lock_acquire "map_data:" . $self->path;	2176	my $lock = cf::lock_acquire "map_data:$self->{path}";
2030		2177
2031	return if $self->players;	2178	return if $self->players;
2032	return if $self->in_memory != cf::MAP_IN_MEMORY;	2179	return if $self->in_memory != cf::MAP_IN_MEMORY;
2033	return if $self->{deny_save};	2180	return if $self->{deny_save};
2034		2181
		2182	$self->in_memory (cf::MAP_SWAPPED);
		2183
		2184	$self->deactivate;
		2185	$_->clear_links_to ($self) for values %cf::MAP;
2035	$self->clear;	2186	$self->clear;
2036	$self->in_memory (cf::MAP_SWAPPED);
2037	}	2187	}
2038		2188
2039	sub reset_at {	2189	sub reset_at {
2040	my ($self) = @_;	2190	my ($self) = @_;
2041		2191
…		…
2073	if $uniq;	2223	if $uniq;
2074	}	2224	}
2075		2225
2076	delete $cf::MAP{$self->path};	2226	delete $cf::MAP{$self->path};
2077		2227
		2228	$self->deactivate;
		2229	$_->clear_links_to ($self) for values %cf::MAP;
2078	$self->clear;	2230	$self->clear;
2079
2080	$_->clear_links_to ($self) for values %cf::MAP;
2081		2231
2082	$self->unlink_save;	2232	$self->unlink_save;
2083	$self->destroy;	2233	$self->destroy;
2084	}	2234	}
2085		2235
2086	my $nuke_counter = "aaaa";	2236	my $nuke_counter = "aaaa";
2087		2237
2088	sub nuke {	2238	sub nuke {
2089	my ($self) = @_;	2239	my ($self) = @_;
2090		2240
		2241	{
		2242	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2243
2091	delete $cf::MAP{$self->path};	2244	delete $cf::MAP{$self->path};
2092		2245
2093	$self->unlink_save;	2246	$self->unlink_save;
2094		2247
2095	bless $self, "cf::map";	2248	bless $self, "cf::map";
2096	delete $self->{deny_reset};	2249	delete $self->{deny_reset};
2097	$self->{deny_save} = 1;	2250	$self->{deny_save} = 1;
2098	$self->reset_timeout (1);	2251	$self->reset_timeout (1);
2099	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2252	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100		2253
2101	$cf::MAP{$self->path} = $self;	2254	$cf::MAP{$self->path} = $self;
		2255	}
2102		2256
2103	$self->reset; # polite request, might not happen	2257	$self->reset; # polite request, might not happen
2104	}	2258	}
2105		2259
2106	=item $maps = cf::map::tmp_maps	2260	=item $maps = cf::map::tmp_maps
…		…
2182		2336
2183	sub inv_recursive {	2337	sub inv_recursive {
2184	inv_recursive_ inv $_[0]	2338	inv_recursive_ inv $_[0]
2185	}	2339	}
2186		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
2187	package cf;	2369	package cf;
2188		2370
2189	=back	2371	=back
2190		2372
2191	=head3 cf::object::player	2373	=head3 cf::object::player
…		…
2213		2395
2214	} else {	2396	} else {
2215	my $pl = $self->contr;	2397	my $pl = $self->contr;
2216		2398
2217	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2399	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218	my $diag = $pl->{npc_dialog};	2400	my $dialog = $pl->{npc_dialog};
2219	$diag->{pl}->ext_reply (	2401	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220	$diag->{id},
2221	msgtype => "reply",
2222	msg => $diag->{pl}->expand_cfpod ($msg),
2223	add_topics => []
2224	);
2225		2402
2226	} else {	2403	} else {
2227	$msg = $npc->name . " says: $msg" if $npc;	2404	$msg = $npc->name . " says: $msg" if $npc;
2228	$self->message ($msg, $flags);	2405	$self->message ($msg, $flags);
2229	}	2406	}
2230	}	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 (@_);
2231	}	2418	}
2232		2419
2233	=item $player_object->may ("access")	2420	=item $player_object->may ("access")
2234		2421
2235	Returns wether the given player is authorized to access resource "access"	2422	Returns wether the given player is authorized to access resource "access"
…		…
2314	# use -1 or undef as default coordinates, not 0, 0	2501	# use -1 or undef as default coordinates, not 0, 0
2315	($x, $y) = ($map->enter_x, $map->enter_y)	2502	($x, $y) = ($map->enter_x, $map->enter_y)
2316	if $x <=0 && $y <= 0;	2503	if $x <=0 && $y <= 0;
2317		2504
2318	$map->load;	2505	$map->load;
2319	$map->load_diag;	2506	$map->load_neighbours;
2320		2507
2321	return unless $self->contr->active;	2508	return unless $self->contr->active;
2322	$self->activate_recursive;	2509	$self->activate_recursive;
2323		2510
2324	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2511	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2344	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2531	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345		2532
2346	$self->enter_link;	2533	$self->enter_link;
2347		2534
2348	(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
2349	my $map = eval {	2557	my $map = eval {
2350	my $map = cf::map::find $path;	2558	my $map = defined $path ? cf::map::find $path : undef;
2351		2559
2352	if ($map) {	2560	if ($map) {
2353	$map = $map->customise_for ($self);	2561	$map = $map->customise_for ($self);
2354	$map = $check->($map) if $check && $map;	2562	$map = $check->($map) if $check && $map;
2355	} else {	2563	} else {
2356	$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);
2357	}	2565	}
2358		2566
2359	$map	2567	$map
2360	};	2568	};
2361		2569
…		…
2451	# if exit is damned, update players death & WoR home-position	2659	# if exit is damned, update players death & WoR home-position
2452	$self->contr->savebed ($slaying, $hp, $sp)	2660	$self->contr->savebed ($slaying, $hp, $sp)
2453	if $exit->flag (FLAG_DAMNED);	2661	if $exit->flag (FLAG_DAMNED);
2454		2662
2455	(async {	2663	(async {
		2664	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2665
2456	$self->deactivate_recursive; # just to be sure	2666	$self->deactivate_recursive; # just to be sure
2457	unless (eval {	2667	unless (eval {
2458	$self->goto ($slaying, $hp, $sp);	2668	$self->goto ($slaying, $hp, $sp);
2459		2669
2460	1;	2670	1;
…		…
2495	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
2496	the message unless the client supports the msg packet.	2706	the message unless the client supports the msg packet.
2497		2707
2498	=cut	2708	=cut
2499		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
2500	sub cf::client::send_msg {	2762	sub cf::client::send_msg {
2501	my ($self, $channel, $msg, $color, @extra) = @_;	2763	my ($self, $channel, $msg, $color, @extra) = @_;
2502		2764
2503	$msg = $self->pl->expand_cfpod ($msg);	2765	$msg = $self->pl->expand_cfpod ($msg);
2504		2766
2505	$color &= ~cf::NDI_UNIQUE; # just in case...	2767	$color &= cf::NDI_CLIENT_MASK; # just in case...
2506		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
2507	if (ref $channel) {	2778	} elsif (ref $channel) {
2508	# send meta info to client, if not yet sent	2779	# send meta info to client, if not yet sent
2509	unless (exists $self->{channel}{$channel->{id}}) {	2780	unless (exists $self->{channel}{$channel->{id}}) {
2510	$self->{channel}{$channel->{id}} = $channel;	2781	$self->{channel}{$channel->{id}} = $channel;
2511	$self->ext_event (channel_info => %$channel);	2782	$self->ext_msg (channel_info => $channel)
		2783	if $self->can_msg;
2512	}	2784	}
2513		2785
2514	$channel = $channel->{id};	2786	$channel = $channel->{id};
2515	}	2787	}
2516		2788
2517	return unless @extra \|\| length $msg;	2789	return unless @extra \|\| length $msg;
2518		2790
2519	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
2520	$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]));
2521	} else {	2798	} else {
2522	# replace some tags by gcfclient-compatible ones
2523	for ($msg) {
2524	1 while
2525	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530	}
2531
2532	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
2533	if (0 && $msg =~ /\[/) {	2814	if (0 && $msg =~ /\[/) {
		2815	# COMMAND/INFO
2534	$self->send_packet ("drawextinfo $color 4 0 $msg")	2816	$self->send_packet ("drawextinfo $color 10 8 $msg")
2535	} else {	2817	} else {
2536	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2818	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2537	$self->send_packet ("drawinfo $color $msg")	2819	$self->send_packet ("drawinfo $color $msg")
2538	}	2820	}
2539	}	2821	}
2540	}	2822	}
2541	}	2823	}
2542		2824
2543	=item $client->ext_event ($type, %msg)	2825	=item $client->ext_msg ($type, @msg)
2544		2826
2545	Sends an ext event to the client.	2827	Sends an ext event to the client.
2546		2828
2547	=cut	2829	=cut
2548		2830
2549	sub cf::client::ext_event($$%) {	2831	sub cf::client::ext_msg($$@) {
2550	my ($self, $type, %msg) = @_;	2832	my ($self, $type, @msg) = @_;
2551		2833
2552	return unless $self->extcmd;	2834	if ($self->extcmd == 2) {
2553		2835	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2836	} elsif ($self->extcmd == 1) { # TODO: remove
2554	$msg{msgtype} = "event_$type";	2837	push @msg, msgtype => "event_$type";
2555	$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	}
2556	}	2858	}
2557		2859
2558	=item $success = $client->query ($flags, "text", \&cb)	2860	=item $success = $client->query ($flags, "text", \&cb)
2559		2861
2560	Queues a query to the client, calling the given callback with	2862	Queues a query to the client, calling the given callback with
…		…
2615	my ($ns, $buf) = @_;	2917	my ($ns, $buf) = @_;
2616		2918
2617	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2919	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618		2920
2619	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
2620	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2929	if (my $cb = $EXTICMD{$type}) {
2621	if (my %reply = $cb->($ns, $msg)) {	2930	@reply = $cb->($ns, @payload);
2622	$reply{msgid} = $msg->{msgid};
2623	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624	}
2625	}	2931	}
		2932
		2933	$ns->ext_reply ($reply, @reply)
		2934	if $reply;
		2935
2626	} else {	2936	} else {
2627	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";
2628	}	2938	}
2629		2939
2630	cf::override;	2940	cf::override;
…		…
2677	our $safe = new Safe "safe";	2987	our $safe = new Safe "safe";
2678	our $safe_hole = new Safe::Hole;	2988	our $safe_hole = new Safe::Hole;
2679		2989
2680	$SIG{FPE} = 'IGNORE';	2990	$SIG{FPE} = 'IGNORE';
2681		2991
2682	$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	));
2683		2997
2684	# here we export the classes and methods available to script code	2998	# here we export the classes and methods available to script code
2685		2999
2686	=pod	3000	=pod
2687		3001
2688	The following functions and methods are available within a safe environment:	3002	The following functions and methods are available within a safe environment:
2689		3003
2690	cf::object	3004	cf::object
2691	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
2692	insert remove	3006	insert remove name archname title slaying race decrease_ob_nr
2693		3007
2694	cf::object::player	3008	cf::object::player
2695	player	3009	player
2696		3010
2697	cf::player	3011	cf::player
…		…
2702		3016
2703	=cut	3017	=cut
2704		3018
2705	for (	3019	for (
2706	["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
2707	insert remove)],	3022	decrease_ob_nr destroy)],
2708	["cf::object::player" => qw(player)],	3023	["cf::object::player" => qw(player)],
2709	["cf::player" => qw(peaceful)],	3024	["cf::player" => qw(peaceful)],
2710	["cf::map" => qw(trigger)],	3025	["cf::map" => qw(trigger)],
2711	) {	3026	) {
2712	no strict 'refs';	3027	no strict 'refs';
…		…
2788	# the server's init and main functions	3103	# the server's init and main functions
2789		3104
2790	sub load_facedata($) {	3105	sub load_facedata($) {
2791	my ($path) = @_;	3106	my ($path) = @_;
2792		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
2793	warn "loading facedata from $path\n";	3114	warn "loading facedata from $path\n";
2794		3115
2795	my $facedata;	3116	my $facedata;
2796	0 < aio_load $path, $facedata	3117	0 < aio_load $path, $facedata
2797	or die "$path: $!";	3118	or die "$path: $!";
2798		3119
2799	$facedata = Coro::Storable::thaw $facedata;	3120	$facedata = Coro::Storable::thaw $facedata;
2800		3121
2801	$facedata->{version} == 2	3122	$facedata->{version} == 2
2802	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;
2803		3131
2804	{	3132	{
2805	my $faces = $facedata->{faceinfo};	3133	my $faces = $facedata->{faceinfo};
2806		3134
2807	while (my ($face, $info) = each %$faces) {	3135	while (my ($face, $info) = each %$faces) {
2808	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3136	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2809	cf::face::set_visibility $idx, $info->{visibility};	3137	cf::face::set_visibility $idx, $info->{visibility};
2810	cf::face::set_magicmap $idx, $info->{magicmap};	3138	cf::face::set_magicmap $idx, $info->{magicmap};
2811	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3139	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3140	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813		3141
2814	cf::cede_to_tick;	3142	cf::cede_to_tick;
2815	}	3143	}
2816		3144
2817	while (my ($face, $info) = each %$faces) {	3145	while (my ($face, $info) = each %$faces) {
…		…
2842		3170
2843	{	3171	{
2844	# TODO: for gcfclient pleasure, we should give resources	3172	# TODO: for gcfclient pleasure, we should give resources
2845	# that gcfclient doesn't grok a >10000 face index.	3173	# that gcfclient doesn't grok a >10000 face index.
2846	my $res = $facedata->{resource};	3174	my $res = $facedata->{resource};
2847	my $enc = JSON::XS->new->utf8->canonical;	3175
		3176	my $soundconf = delete $res->{"res/sound.conf"};
2848		3177
2849	while (my ($name, $info) = each %$res) {	3178	while (my ($name, $info) = each %$res) {
2850	my $meta = $enc->encode ({
2851	name => $name,
2852	type => $info->{type},
2853	copyright => $info->{copyright}, #TODO#
2854	});
2855
2856	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3179	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3180	my $data;
2857		3181
2858	if ($name =~ /\.jpg$/) {	3182	if ($info->{type} & 1) {
2859	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3183	# prepend meta info
2860	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};
2861	} else {	3191	} else {
2862	my $data = pack "(w/a)", $meta, $info->{data};	3192	$data = $info->{data};
2863	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865	cf::face::set_type $idx, 1;
2866	cf::face::set_data $idx, 0, $data, $chk;
2867	}	3193	}
2868		3194
		3195	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3196	cf::face::set_type $idx, $info->{type};
		3197
2869	cf::cede_to_tick;	3198	cf::cede_to_tick;
2870	}	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	}
2871	}	3218	}
2872		3219
2873	1	3220	1
2874	}	3221	}
2875		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
2876	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
2877	load_resource_file "$MAPDIR/regions"	3236	load_resource_file "$MAPDIR/regions"
2878	or die "unable to load regions file\n";	3237	or die "unable to load regions file\n";
2879		3238
2880	for (cf::region::list) {	3239	for (cf::region::list) {
2881	$_->{match} = qr/$_->{match}/	3240	$_->{match} = qr/$_->{match}/
…		…
2917		3276
2918	sub init {	3277	sub init {
2919	reload_resources;	3278	reload_resources;
2920	}	3279	}
2921		3280
2922	sub cfg_load {	3281	sub reload_config {
2923	open my $fh, "<:utf8", "$CONFDIR/config"	3282	open my $fh, "<:utf8", "$CONFDIR/config"
2924	or return;	3283	or return;
2925		3284
2926	local $/;	3285	local $/;
2927	*CFG = YAML::Syck::Load <$fh>;	3286	*CFG = YAML::Syck::Load <$fh>;
…		…
2943	sub main {	3302	sub main {
2944	# we must not ever block the main coroutine	3303	# we must not ever block the main coroutine
2945	local $Coro::idle = sub {	3304	local $Coro::idle = sub {
2946	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#
2947	(async {	3306	(async {
		3307	$Coro::current->{desc} = "IDLE BUG HANDLER";
2948	Event::one_event;	3308	Event::one_event;
2949	})->prio (Coro::PRIO_MAX);	3309	})->prio (Coro::PRIO_MAX);
2950	};	3310	};
2951		3311
2952	cfg_load;	3312	reload_config;
2953	db_init;	3313	db_init;
2954	load_extensions;	3314	load_extensions;
2955		3315
2956	$TICK_WATCHER->start;	3316	$TICK_WATCHER->start;
2957	Event::loop;	3317	Event::loop;
…		…
3024	# and maps saved/destroyed asynchronously.	3384	# and maps saved/destroyed asynchronously.
3025	warn "begin emergency player save\n";	3385	warn "begin emergency player save\n";
3026	for my $login (keys %cf::PLAYER) {	3386	for my $login (keys %cf::PLAYER) {
3027	my $pl = $cf::PLAYER{$login} or next;	3387	my $pl = $cf::PLAYER{$login} or next;
3028	$pl->valid or next;	3388	$pl->valid or next;
		3389	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029	$pl->save;	3390	$pl->save;
3030	}	3391	}
3031	warn "end emergency player save\n";	3392	warn "end emergency player save\n";
3032		3393
3033	warn "begin emergency map save\n";	3394	warn "begin emergency map save\n";
…		…
3081		3442
3082	warn "flushing outstanding aio requests";	3443	warn "flushing outstanding aio requests";
3083	for (;;) {	3444	for (;;) {
3084	BDB::flush;	3445	BDB::flush;
3085	IO::AIO::flush;	3446	IO::AIO::flush;
3086	Coro::cede;	3447	Coro::cede_notself;
3087	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3448	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3088	warn "iterate...";	3449	warn "iterate...";
3089	}	3450	}
3090		3451
3091	++$RELOAD;	3452	++$RELOAD;
…		…
3150	warn "reloading cf.pm";	3511	warn "reloading cf.pm";
3151	require cf;	3512	require cf;
3152	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3513	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153		3514
3154	warn "loading config and database again";	3515	warn "loading config and database again";
3155	cf::cfg_load;	3516	cf::reload_config;
3156		3517
3157	warn "loading extensions";	3518	warn "loading extensions";
3158	cf::load_extensions;	3519	cf::load_extensions;
3159		3520
3160	warn "reattaching attachments to objects/players";	3521	warn "reattaching attachments to objects/players";
…		…
3196	register_command "reload" => sub {	3557	register_command "reload" => sub {
3197	my ($who, $arg) = @_;	3558	my ($who, $arg) = @_;
3198		3559
3199	if ($who->flag (FLAG_WIZ)) {	3560	if ($who->flag (FLAG_WIZ)) {
3200	$who->message ("reloading server.");	3561	$who->message ("reloading server.");
		3562	async {
		3563	$Coro::current->{desc} = "perl_reload";
3201	async { reload_perl };	3564	reload_perl;
		3565	};
3202	}	3566	}
3203	};	3567	};
3204		3568
3205	unshift @INC, $LIBDIR;	3569	unshift @INC, $LIBDIR;
3206		3570
…		…
3225	my $signal = new Coro::Signal;	3589	my $signal = new Coro::Signal;
3226	push @WAIT_FOR_TICK_BEGIN, $signal;	3590	push @WAIT_FOR_TICK_BEGIN, $signal;
3227	$signal->wait;	3591	$signal->wait;
3228	}	3592	}
3229		3593
3230	my $min = 1e6;#d#
3231	my $avg = 10;
3232	$TICK_WATCHER = Event->timer (	3594	$TICK_WATCHER = Event->timer (
3233	reentrant => 0,	3595	reentrant => 0,
3234	parked => 1,	3596	parked => 1,
3235	prio => 0,	3597	prio => 0,
3236	at => $NEXT_TICK \|\| $TICK,	3598	at => $NEXT_TICK \|\| $TICK,
…		…
3244		3606
3245	$NOW = $tick_start = Event::time;	3607	$NOW = $tick_start = Event::time;
3246		3608
3247	cf::server_tick; # one server iteration	3609	cf::server_tick; # one server iteration
3248		3610
3249	0 && sync_job {#d#
3250	for(1..10) {
3251	my $t = Event::time;
3252	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253	or die;
3254
3255	$map->width (50);
3256	$map->height (50);
3257	$map->alloc;
3258	$map->_load_objects ("/tmp/x.map", 1);
3259	my $t = Event::time - $t;
3260
3261	#next unless $t < 0.0013;#d#
3262	if ($t < $min) {
3263	$min = $t;
3264	}
3265	$avg = $avg * 0.99 + $t * 0.01;
3266	}
3267	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268	exit 0;
3269	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270	};
3271
3272	$RUNTIME += $TICK;	3611	$RUNTIME += $TICK;
3273	$NEXT_TICK += $TICK;	3612	$NEXT_TICK += $TICK;
3274		3613
3275	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3614	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276	$NEXT_RUNTIME_WRITE = $NOW + 10;	3615	$NEXT_RUNTIME_WRITE = $NOW + 10;
3277	Coro::async_pool {	3616	Coro::async_pool {
		3617	$Coro::current->{desc} = "runtime saver";
3278	write_runtime	3618	write_runtime
3279	or warn "ERROR: unable to write runtime file: $!";	3619	or warn "ERROR: unable to write runtime file: $!";
3280	};	3620	};
3281	}	3621	}
3282		3622
3283	# my $AFTER = Event::time;
3284	# warn $AFTER - $NOW;#d#
3285
3286	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3623	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287	$sig->send;	3624	$sig->send;
3288	}	3625	}
3289	while (my $sig = shift @WAIT_FOR_TICK) {	3626	while (my $sig = shift @WAIT_FOR_TICK) {
3290	$sig->send;	3627	$sig->send;
…		…
3300		3637
3301	$LOAD = ($NOW - $tick_start) / $TICK;	3638	$LOAD = ($NOW - $tick_start) / $TICK;
3302	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3639	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303		3640
3304	_post_tick;	3641	_post_tick;
3305
3306
3307	},	3642	},
3308	);	3643	);
3309		3644
3310	{	3645	{
		3646	BDB::min_parallel 8;
3311	BDB::max_poll_time $TICK * 0.1;	3647	BDB::max_poll_time $TICK * 0.1;
3312	$BDB_POLL_WATCHER = Event->io (	3648	$BDB_POLL_WATCHER = Event->io (
3313	reentrant => 0,	3649	reentrant => 0,
3314	fd => BDB::poll_fileno,	3650	fd => BDB::poll_fileno,
3315	poll => 'r',	3651	poll => 'r',
3316	prio => 0,	3652	prio => 0,
3317	data => WF_AUTOCANCEL,	3653	data => WF_AUTOCANCEL,
3318	cb => \&BDB::poll_cb,	3654	cb => \&BDB::poll_cb,
3319	);	3655	);
3320	BDB::min_parallel 8;
3321		3656
3322	BDB::set_sync_prepare {	3657	BDB::set_sync_prepare {
3323	my $status;	3658	my $status;
3324	my $current = $Coro::current;	3659	my $current = $Coro::current;
3325	(	3660	(
…		…
3334	)	3669	)
3335	};	3670	};
3336		3671
3337	unless ($DB_ENV) {	3672	unless ($DB_ENV) {
3338	$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);
3339		3678
3340	cf::sync_job {	3679	cf::sync_job {
3341	eval {	3680	eval {
3342	BDB::db_env_open	3681	BDB::db_env_open
3343	$DB_ENV,	3682	$DB_ENV,
…		…
3345	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
3346	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3685	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3347	0666;	3686	0666;
3348		3687
3349	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3688	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3352	$DB_ENV->set_lk_detect;
3353	};	3689	};
3354		3690
3355	cf::cleanup "db_env_open(db): $@" if $@;	3691	cf::cleanup "db_env_open(db): $@" if $@;
3356	};	3692	};
3357	}	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	);
3358	}	3725	}
3359		3726
3360	{	3727	{
3361	IO::AIO::min_parallel 8;	3728	IO::AIO::min_parallel 8;
3362		3729
…		…
3365	$AIO_POLL_WATCHER = Event->io (	3732	$AIO_POLL_WATCHER = Event->io (
3366	reentrant => 0,	3733	reentrant => 0,
3367	data => WF_AUTOCANCEL,	3734	data => WF_AUTOCANCEL,
3368	fd => IO::AIO::poll_fileno,	3735	fd => IO::AIO::poll_fileno,
3369	poll => 'r',	3736	poll => 'r',
3370	prio => 6,	3737	prio => 0,
3371	cb => \&IO::AIO::poll_cb,	3738	cb => \&IO::AIO::poll_cb,
3372	);	3739	);
3373	}	3740	}
3374		3741
3375	my $_log_backtrace;	3742	my $_log_backtrace;
…		…
3381		3748
3382	# limit the # of concurrent backtraces	3749	# limit the # of concurrent backtraces
3383	if ($_log_backtrace < 2) {	3750	if ($_log_backtrace < 2) {
3384	++$_log_backtrace;	3751	++$_log_backtrace;
3385	async {	3752	async {
		3753	$Coro::current->{desc} = "abt $msg";
		3754
3386	my @bt = fork_call {	3755	my @bt = fork_call {
3387	@addr = map { sprintf "%x", $_ } @addr;	3756	@addr = map { sprintf "%x", $_ } @addr;
3388	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3757	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389	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 \|"
3390	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.314 by root, Mon Jul 23 16:53:15 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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 2007 UTC